fix:安全鉴定逻辑调整

shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.kms.system.domain.SysXzqh;
 import com.kms.system.service.SysXzqhService;
+import com.kms.yg.df.domain.BsSgcDfDfrw;
 import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
+import com.kms.yg.df.service.BsSgcDfDfrwService;
 import com.kms.yg.df.service.BsSgcDfSafeJbxxService;
 import com.kms.yg.sk.service.AttResBaseSkService;
 import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
@@ -26,7 +28,10 @@ import com.kms.yxgh.df.mapper.DfCheckingV2Mapper;
 import com.kms.yxgh.df.mapper.DfDangerousTaskItemRelMapper;
 import com.kms.yxgh.df.mapper.DfDangerousTaskMapper;
 import com.kms.yxgh.df.mapper.DfYhV2Mapper;
-import com.kms.yxgh.df.service.*;
+import com.kms.yxgh.df.service.DfCheckingProblemV2Service;
+import com.kms.yxgh.df.service.DfDangerousTaskItemRelService;
+import com.kms.yxgh.df.service.DfDangerousTaskService;
+import com.kms.yxgh.df.service.DfYhV2Service;
 import com.kms.yxgh.dw.mapper.DwCheckingProblemV2Mapper;
 import com.kms.yxgh.dw.mapper.DwCheckingRecordV2Mapper;
 import com.kms.yxgh.dw.mapper.DwCheckingV2Mapper;
@@ -476,30 +481,37 @@ public enum StaticIndexEnum {
 
     YZT_TOUR_CHECK_RWS_SUM("任务数", sp -> {
         Map<String,String> map =new HashMap<>();
-        BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
+        BsSgcSzSzrwService szService = SpringUtils.getBean(BsSgcSzSzrwService.class);
-        map.put("sum", String.valueOf(service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
+        int sz = szService.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
                 .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
-                .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime()))));
+                .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime()));
+        BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class);
+        int df = dfService.count(new LambdaQueryWrapper<BsSgcDfDfrw>()
+                .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime())
+                .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime()));
+        map.put("sum", String.valueOf(sz + df));
         return map;
     }, "个", "0", "0"),
 
     YZT_TOUR_CHECK_DJD_SUM("待鉴定", sp -> {
         Map<String,String> map =new HashMap<>();
         BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
-        int countDtb = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
+        int sz = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
-                // 待审核
+                // 待鉴定
-                .eq(BsSgcSzSzrw::getStatus, 1)
+                .ne(BsSgcSzSzrw::getStatus, 3)
                 .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
                 .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
         );
-        // 待填报
+
-        int countDsh = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
+
-                .eq(BsSgcSzSzrw::getStatus, 0)
+        BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class);
-                .eq(BsSgcSzSzrw::getStatus, 1)
+        int df = dfService.count(new LambdaQueryWrapper<BsSgcDfDfrw>()
-                .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
+                // 待鉴定
-                .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
+                .ne(BsSgcDfDfrw::getStatus, 3)
+                .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime())
+                .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime())
         );
-        map.put("sum",String.valueOf(countDtb+countDsh));
+        map.put("sum", String.valueOf(sz + df));
         return map;
     }, "个", "0", "0"),
 
@@ -507,11 +519,17 @@ public enum StaticIndexEnum {
         Map<String,String> map =new HashMap<>();
         BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
         int count = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
-                .eq(BsSgcSzSzrw::getStatus, 2)
+                .eq(BsSgcSzSzrw::getStatus, 3)
                 .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
                 .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
         );
-        map.put("sum",String.valueOf(count));
+        BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class);
+        int dfCount = dfService.count(new LambdaQueryWrapper<BsSgcDfDfrw>()
+                .eq(BsSgcDfDfrw::getStatus, 3)
+                .ge(!Objects.isNull(sp.getStartTime()), BsSgcDfDfrw::getCreateTime, sp.getStartTime())
+                .le(!Objects.isNull(sp.getEndTime()), BsSgcDfDfrw::getCreateTime, sp.getEndTime())
+        );
+        map.put("sum", String.valueOf(count + dfCount));
         return map;
     }, "个", "0", "0"),