From 58a5703167b793ba85931b6329e6e81c4d4244da Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Fri, 23 Aug 2024 14:25:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=BD=E4=BD=93=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/count/TdChecknumController.java | 10 ++++++---- .../ruoyi/system/domain/count/CheckResultCountDTO.java | 3 +++ .../resources/mapper/system/TdCheckReportMapper.xml | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java index 7a7d42d..edcc220 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/TdChecknumController.java @@ -55,7 +55,7 @@ public class TdChecknumController extends BaseController{ return AjaxResult.success(tdNotifyService.selectCountNotifyList()); } - private List checkResult = Arrays.asList("通过", "未通过","待检查"); + private List checkResult = Arrays.asList("通过", "未通过","待检查","已保存"); private List checkType = Arrays.asList("自行检查", "保密局检查"); @@ -75,8 +75,10 @@ public class TdChecknumController extends BaseController{ value.set(checkResultCountDTO.getTg()); }else if("未通过".equals(name)){ value.set(checkResultCountDTO.getWtg()); - }else{ + }else if("待检查".equals(name)){ value.set(checkResultCountDTO.getDjc()); + }else{ + value.set(checkResultCountDTO.getYbc()); } JSONObject jsonObject = new JSONObject(); jsonObject.put("value", value.get()); @@ -120,9 +122,9 @@ public class TdChecknumController extends BaseController{ *检查类型统计 * @return */ - @PostMapping("/countType") + @PostMapping("/countCheckType") @ResponseBody - public AjaxResult countType() { + public AjaxResult countCheckType() { SysDictData sysDictData = new SysDictData(); sysDictData.setDictType("sys_check_type"); List smType = dictDataService.selectDictDataList(sysDictData); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/CheckResultCountDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/CheckResultCountDTO.java index 34a6be1..a83f705 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/CheckResultCountDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/count/CheckResultCountDTO.java @@ -18,4 +18,7 @@ public class CheckResultCountDTO implements Serializable { @ApiModelProperty(value = "待检查") private Integer djc; + + @ApiModelProperty(value = "已保存") + private Integer ybc; } diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml index ec9f70c..73a8dba 100644 --- a/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml @@ -76,7 +76,8 @@ SELECT SUM (CASE WHEN check_state = 0 THEN 1 ELSE 0 END) AS tg, SUM (CASE WHEN check_state = 1 THEN 1 ELSE 0 END) AS wtg, - SUM (CASE WHEN check_state = 2 THEN 1 ELSE 0 END) AS djc + SUM (CASE WHEN check_state = 2 THEN 1 ELSE 0 END) AS djc, + SUM (CASE WHEN check_state = 3 THEN 1 ELSE 0 END) AS ybc from td_check_report