From 0f59a1c03ff849beb96e642493537abd3f7e23d2 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 28 Nov 2025 15:35:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BD=8E=E9=A3=8E=E9=99=A9=E3=80=81?= =?UTF-8?q?=E4=B8=80=E8=88=AC=E9=A3=8E=E9=99=A9=E3=80=81=E8=BE=83=E5=A4=A7?= =?UTF-8?q?=E9=A3=8E=E9=99=A9=E3=80=81=E9=87=8D=E5=A4=A7=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/xmgl/enums/ParamEnum.java | 18 +++++++++++------- .../service/impl/WorkerInfoServiceImpl.java | 2 +- ...XzSecurityQualityInspectionRecordMapper.xml | 16 ++++++++-------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java index 85f7b33f3..494bef06c 100644 --- a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java +++ b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java @@ -785,22 +785,26 @@ public class ParamEnum { } /** - * 紧急程度,1一般,2严重,3紧要 + * */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QualityInspectionRecordUrgentLevelEnum implements BaseEnum { /** - * 一般 + * 低风险 */ - GENERAL(1, "一般"), + YB(4, "低风险"), /** - * 严重 + * 一般风险 */ - SERIOUS(2, "严重"), + JD(3, "一般风险"), /** - * 紧要 + * 较大风险 */ - CRITICAL(3, "紧要"), + ZD(2, "较大风险"), + /** + * 重大风险 + */ + TBZD(1, "重大风险"), ; private Integer value; diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index 4eb58fced..984651e0c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -348,7 +348,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl - and t.level = #{param.enumType} + and t.priority_name_dic = #{param.enumType} and (t.status = 2 AND now() > t.change_limit_time) @@ -179,10 +179,10 @@ IFNULL(SUM((CASE WHEN t.urgent_level = 2 THEN 1 ELSE 0 END)), 0) yzUrgentLevelNum, IFNULL(SUM((CASE WHEN t.urgent_level = 3 THEN 1 ELSE 0 END)), 0) jyUrgentLevelNum, IFNULL(SUM((CASE WHEN t.record_type = 1 THEN 1 ELSE 0 END)), 0) dangerNum, - IFNULL(SUM((CASE WHEN t.level = 1 THEN 1 ELSE 0 END)), 0) greatFaultLevelNum, - IFNULL(SUM((CASE WHEN t.level = 2 THEN 1 ELSE 0 END)), 0) largerRiskNum, - IFNULL(SUM((CASE WHEN t.level = 3 THEN 1 ELSE 0 END)), 0) generalRiskNum, - IFNULL(SUM((CASE WHEN t.level = 4 THEN 1 ELSE 0 END)), 0) lowRiskNum, + IFNULL(SUM((CASE WHEN t.priority_name_dic = 1 THEN 1 ELSE 0 END)), 0) greatFaultLevelNum, + IFNULL(SUM((CASE WHEN t.priority_name_dic = 2 THEN 1 ELSE 0 END)), 0) largerRiskNum, + IFNULL(SUM((CASE WHEN t.priority_name_dic = 3 THEN 1 ELSE 0 END)), 0) generalRiskNum, + IFNULL(SUM((CASE WHEN t.priority_name_dic = 4 THEN 1 ELSE 0 END)), 0) lowRiskNum, if(FLOOR((DAYOFMONTH(t.inspect_time) - 1) / 7) > 3, 3, FLOOR((DAYOFMONTH(t.inspect_time) - 1) / 7)) as whichWeekOfMonth, date_format(t.inspect_time, '%Y-%m') as yearMonth, @@ -635,7 +635,7 @@