edit:一张图

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

@@ -6,8 +6,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.kms.system.domain.SysXzqh;
 import com.kms.system.service.SysXzqhService;
-import com.kms.yg.cz.service.AttStBaseService;
-import com.kms.yg.cz.service.AttStMpService;
 import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
 import com.kms.yg.df.service.BsSgcDfSafeJbxxService;
 import com.kms.yg.res.service.AttResBaseService;
@@ -354,24 +352,6 @@ public enum StaticIndexEnum {
         return map;
     }, "段", "0", "0"),
 
-    YZT_SSYX_SUM("水事影像监测监视点", sp -> {
-        Map<String,String> map =new HashMap<>();
-        return map;
-    }, "个", "125", "0"),
-    YZT_SWGCJCCZ_SUM("水文工程检测测站数量", sp -> {
-        Map<String,String> map =new HashMap<>();
-        AttStBaseService service = SpringUtils.getBean(AttStBaseService.class);
-        map.put("sum",String.valueOf(service.count()));
-        return map;
-    }, "个", "0", "0"),
-    YZT_SWGCJCCD_SUM("水文工程检测测点数量", sp -> {
-        Map<String,String> map =new HashMap<>();
-        AttStMpService service = SpringUtils.getBean(AttStMpService.class);
-        map.put("sum", String.valueOf(service.count()));
-        return map;
-    }, "个", "0", "0"),
-
-
     YZT_SZ_FXHZ_SUM("分泄洪闸", sp -> {
         Map<String, String> map = new HashMap<>();
         BsSgcSzSafeJbxxService service = SpringUtils.getBean(BsSgcSzSafeJbxxService.class);
@@ -508,7 +488,7 @@ public enum StaticIndexEnum {
         BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class);
         map.put("sum", String.valueOf(service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
                 .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
-                .le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime()))));
+                .le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime()))));
         return map;
     }, "个", "0", "0"),
 
@@ -519,14 +499,14 @@ public enum StaticIndexEnum {
                 // 待审核
                 .eq(BsSgcSzSzrw::getStatus, 1)
                 .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
-                .le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
+                .le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
         );
         // 待填报
         int countDsh = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
                 .eq(BsSgcSzSzrw::getStatus, 0)
                 .eq(BsSgcSzSzrw::getStatus, 1)
                 .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
-                .le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
+                .le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
         );
         map.put("sum",String.valueOf(countDtb+countDsh));
         return map;
@@ -538,7 +518,7 @@ public enum StaticIndexEnum {
         int count = service.count(new LambdaQueryWrapper<BsSgcSzSzrw>()
                 .eq(BsSgcSzSzrw::getStatus, 2)
                 .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
-                .le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime())
+                .le(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime())
         );
         map.put("sum",String.valueOf(count));
         return map;