From 1cbd8aa0d42bf635eff9f2e97b8efa54cccc4eac Mon Sep 17 00:00:00 2001
From: lhb <1784490500@qq.com>
Date: Mon, 21 Apr 2025 11:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=9D=A3=E6=A3=80=E6=9F=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=BC=80=E5=8F=91,app=E7=9B=91=E7=9D=A3=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/dto/THazardWorkPlanCheckParam.java  |  3 ++
 .../model/vo/HazardWorkPlanCheckVO.java       |  2 +-
 .../impl/THazardWorkPlanCheckServiceImpl.java |  1 +
 .../mapper/hazard/THazardWorkPlanCheck.xml    | 37 ++++++++++++++++++-
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/dto/THazardWorkPlanCheckParam.java b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/dto/THazardWorkPlanCheckParam.java
index 496b1b5..876b6b8 100644
--- a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/dto/THazardWorkPlanCheckParam.java
+++ b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/dto/THazardWorkPlanCheckParam.java
@@ -33,6 +33,9 @@ public class THazardWorkPlanCheckParam extends THazardWorkPlanCheck {
 	@ApiModelProperty(value = "排序方式")
 	private String orderType;
 
+	@ApiModelProperty(value = "关键字")
+	private String keywords;
+
 	/**
 	 * 单位id集合
 	 */
diff --git a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/vo/HazardWorkPlanCheckVO.java b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/vo/HazardWorkPlanCheckVO.java
index 80e89a1..b913a45 100644
--- a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/vo/HazardWorkPlanCheckVO.java
+++ b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/model/vo/HazardWorkPlanCheckVO.java
@@ -24,7 +24,7 @@ public class HazardWorkPlanCheckVO {
     @ExcelProperty(value = "序号", index = 0)
     private Integer number;
 
-    @ExcelProperty(value = "隐患编号", index = 1)
+    @ExcelProperty(value = "作业编号", index = 1)
     private String code;
 
     @ExcelProperty(value = "基层单位", index = 2)
diff --git a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java
index a57905a..ed9c2ba 100644
--- a/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java
+++ b/zlmy-modules/zlmy-boot/src/main/java/com/testor/module/hazard/service/impl/THazardWorkPlanCheckServiceImpl.java
@@ -108,6 +108,7 @@ public class THazardWorkPlanCheckServiceImpl extends SuperServiceImpl<THazardWor
                 HazardWorkPlanCheckVO vo = new HazardWorkPlanCheckVO();
                 BeanUtils.copyProperties(entity, vo);  // 复制属性
                 vo.setNumber(i);
+                vo.setIsCompliant(vo.getIsCompliant().equals("1")?"是":"否");
                 i =i+1;
                 hazardWorkPlanCheckVOList.add(vo);
             }
diff --git a/zlmy-modules/zlmy-boot/src/main/resources/mapper/hazard/THazardWorkPlanCheck.xml b/zlmy-modules/zlmy-boot/src/main/resources/mapper/hazard/THazardWorkPlanCheck.xml
index 4d18402..c0dae6d 100644
--- a/zlmy-modules/zlmy-boot/src/main/resources/mapper/hazard/THazardWorkPlanCheck.xml
+++ b/zlmy-modules/zlmy-boot/src/main/resources/mapper/hazard/THazardWorkPlanCheck.xml
@@ -36,7 +36,42 @@
         select hwpc.*,hwp.code code,hwp.work_type workType,hwp.work_level workLevel,hwp.stakeholder_work stakeholderWork
         from t_hazard_work_plan_check hwpc
         left join t_hazard_work_plan hwp on hwpc.plan_id = hwp.id
-        where hwpc.status = '0' and hwpc.plan_id = #{param.planId} and hwpc.create_by=#{param.createBy}
+        left join
+        t_sys_dict_data dd on hwp.work_type = dd.dict_data_id
+        left join
+        t_sys_dict_data dd2 on hwp.work_level = dd2.dict_data_id
+        left join
+        t_sys_dict_data dd3 on hwpc.problem_type = dd3.dict_data_id
+        where hwpc.status = '0'  and hwpc.create_by=#{param.createBy}
+        <if test="param.planId!=null and param.planId!=''">
+            and hwpc.plan_id = #{param.planId}
+        </if>
+        <if test="param.workType!=null and param.workType!=''">
+            and hwp.work_type = #{param.workType}
+        </if>
+        <if test="param.keywords!=null and param.keywords!=''">
+            AND (
+            hwpc.basic_unit LIKE CONCAT('%', #{param.keywords}, '%')
+            OR dd.dict_value LIKE CONCAT('%', #{param.keywords}, '%')
+            OR dd2.dict_value LIKE CONCAT('%', #{param.keywords}, '%')
+            OR hwpc.check_description LIKE CONCAT('%', #{param.keywords}, '%')
+            OR (
+            CASE
+            WHEN hwpc.is_compliant = 1 THEN '是'
+            WHEN hwpc.is_compliant = 0 THEN '否'
+            ELSE ''
+            END
+            ) LIKE CONCAT('%', #{param.keywords}, '%')
+            OR dd3.dict_value LIKE CONCAT('%', #{param.keywords}, '%')
+            OR (
+            CASE
+            WHEN hwpc.check_status = 1 THEN 'æš‚å­˜'
+            WHEN hwpc.check_status = 2 THEN '已完成'
+            ELSE ''
+            END
+            ) LIKE CONCAT('%', #{param.keywords}, '%')
+            )
+        </if>
         order by hwpc.check_time desc
     </select>
 
-- 
2.18.1