From c94f32baaf2a2f873c32ecb8dd20f6d6eb11a3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Sun, 23 Mar 2025 17:10:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=89=E5=85=A8=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/common/enums/StaticIndexEnum.java | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index da6211ac..c5031780 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/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 map =new HashMap<>(); - BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class); - map.put("sum", String.valueOf(service.count(new LambdaQueryWrapper() + BsSgcSzSzrwService szService = SpringUtils.getBean(BsSgcSzSzrwService.class); + int sz = szService.count(new LambdaQueryWrapper() .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() + .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 map =new HashMap<>(); BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class); - int countDtb = service.count(new LambdaQueryWrapper() - // 待审核 - .eq(BsSgcSzSzrw::getStatus, 1) + int sz = service.count(new LambdaQueryWrapper() + // 待鉴定 + .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() - .eq(BsSgcSzSzrw::getStatus, 0) - .eq(BsSgcSzSzrw::getStatus, 1) - .ge(!Objects.isNull(sp.getStartTime()), BsSgcSzSzrw::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getEndTime()), BsSgcSzSzrw::getCreateTime, sp.getEndTime()) + + + BsSgcDfDfrwService dfService = SpringUtils.getBean(BsSgcDfDfrwService.class); + int df = dfService.count(new LambdaQueryWrapper() + // 待鉴定 + .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 map =new HashMap<>(); BsSgcSzSzrwService service = SpringUtils.getBean(BsSgcSzSzrwService.class); int count = service.count(new LambdaQueryWrapper() - .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() + .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"),