相关bug修改

module-common/src/main/java/com/gunshi/project/ss/common/model/page/JcskPageSo.java

@@ -1,6 +1,5 @@
 package com.gunshi.project.ss.common.model.page;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.gunshi.db.dto.PageSo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

src/main/java/com/gunshi/project/ss/controller/ImpactZoneInfoController.java

@@ -66,7 +66,7 @@ public class ImpactZoneInfoController{
     @Operation(summary = "列表")
     @PostMapping("/list")
     public R<List<ImpactZoneInfo>> list() {
-        return R.ok(service.lambdaQuery().list());
+        return R.ok(service.lambdaQuery().eq(ImpactZoneInfo::getStatus,0).list());
     }
 
     @Operation(summary = "分页")

src/main/java/com/gunshi/project/ss/service/DocCenterService.java

@@ -17,6 +17,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -213,17 +214,18 @@ public class DocCenterService  extends ServiceImpl<DocCenterMapper, DocCenter> {
                 .ge(DocCenter::getCreateTime, dateTimeRangeSo.getStart())
                 .le(DocCenter::getCreateTime, dateTimeRangeSo.getEnd()).list();
 
+        if(CollectionUtils.isEmpty(list)){
+            return res;
+        }
         //获取去重的所有资料分类ID
-        List<Long> categoryIds = list.stream().distinct().map(o -> {
+        List<Long> categoryIds = list.stream().distinct().map(DocCenter::getDocCategoryId).collect(Collectors.toList());
-            return o.getDocCategoryId();
-        }).collect(Collectors.toList());
 
         List<DocCategory> level3Category = docCategoryService.lambdaQuery().in(DocCategory::getId, categoryIds).list();
 
         for (DocCategory docCategory : level3Category) {
-            long count = list.stream().filter(o -> {
+            long count = list.stream().filter(o ->
-                return docCategory.getId().equals(o.getDocCategoryId());
+                 docCategory.getId().equals(o.getDocCategoryId())
-            }).count();
+            ).count();
             res.put(docCategory.getCategoryName(),count);
         }
         return res;

src/main/java/com/gunshi/project/ss/service/ProjectSafetyService.java

@@ -77,7 +77,7 @@ public class ProjectSafetyService extends ServiceImpl<ProjectSafetyMapper, Proje
         if (type == null) {
             return false;
         }
-        Long cnt = getBaseMapper().selectCount(new LambdaQueryWrapper<ProjectSafety>().eq(ProjectSafety::getType, type.getName()));
+        Long cnt = getBaseMapper().selectCount(new LambdaQueryWrapper<ProjectSafety>().eq(ProjectSafety::getType, id));
         if (cnt > 0) {
             throw new IllegalArgumentException("请先删除关联数据");
         }

src/main/java/com/gunshi/project/ss/service/WarningRuleInfoService.java

@@ -73,7 +73,7 @@ public class WarningRuleInfoService extends ServiceImpl<WarningRuleInfoMapper,Wa
         warningRuleInfo.setSecondAuditUserId(auditProcess.getSecondAuditUserId());
         warningRuleInfo.setSecondAuditUserName(auditProcess.getSecondAuditUserName());
         warningRuleInfo.setSecondAuditTime(null);
-        warningRuleInfo.setStatus(null);
+        warningRuleInfo.setSecondAuditStatus(null);
         this.updateById(warningRuleInfo);
         objService.remove(new QueryWrapper<WarningRecObj>().eq("warning_info_id",warningRuleInfo.getId()));
         objService.saveOrUpdateBatch(warningRuleInfo.getObjs());

src/main/resources/mapper/JcskMapper.xml

@@ -72,7 +72,7 @@
             <!-- 当type=3时，只查询位移表 -->
             <when test="dto.type == 3">
                 SELECT
-                cdnm as code,
+                cd_nm as code,
                 ch as dm,
                 lgtd,
                 lttd,