From 7f11e541f239d8c816bcefb32aae6b9efa31e28e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:49:15 +0800
Subject: [PATCH] 生产线点检

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml |  110 +++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 83 insertions(+), 27 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index 7a2b9e7..0a1d0b9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -1,40 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.eam.mapper.EquipmentReportRepairMapper">
-
     <select id="getReportRepairList"  parameterType="Map" resultType="Map">
         SELECT
-        t1.id,
-        t1.num num,
-        t1.equipment_id equipmentId,
-        t1.fault_description faultDescription,
-        t1.photo photo,
-        t1.approval approval,
-        t1.fault_time faultTime,
-        t1.source source,
-        t1.source_id sourceId,
-        t1.urgency urgency,
-        t1.is_create_order isCreateOrder,
-        t1.use_depart_id useDepartId,
-        t1.remark remark,
-        t1.`status` status,
-        t1.create_by createBy,
-        t1.create_time createTime,
-        t1.update_by updateBy,
-        t1.update_time updateTime,
-        t2.num equipmentNum,
-        t2.name equipmentName,
-        t2.model equipmentModel,
-        t2.specification equipmentSpecification,
-        t3.depart_name departName,
-        t4.item_text urgencyName,
-        t5.item_text statusName
+            t1.id,
+            t1.err_uda1 errUda1,
+            t1.err_uda2 errUda2,
+            t1.num num,
+            t1.equipment_id equipmentId,
+            t1.fault_reason faultReason,
+            t1.fault_description faultDescription,
+            t1.photo photo,
+            t1.is_stop isStop,
+            t1.approval approval,
+            t1.fault_time faultTime,
+            t1.source source,
+            t1.source_id sourceId,
+            t1.urgency urgency,
+            t1.is_create_order isCreateOrder,
+            t1.use_depart_id useDepartId,
+            t1.remark remark,
+            t1.status status,
+            t1.create_by createBy,
+            t1.create_time createTime,
+            t1.update_by updateBy,
+            t1.update_time updateTime,
+            t2.num equipmentNum,
+            t2.name equipmentName,
+            t2.model equipmentModel,
+            t2.team_id teamId,
+            t2.specification equipmentSpecification,
+            t3.depart_name departName,
+            t4.item_text urgencyName,
+            t5.item_text statusName,
+            t6.item_text isStopName,
+            t7.item_text errUda1_dictText
         FROM
         mom_eam_equipment_report_repair t1
         left join mom_eam_equipment t2 on t1.equipment_id = t2.id
         left join sys_depart t3 on t1.use_depart_id = t3.id
         left join (select * from v_sys_dict where dict_code='urgency') t4 on t1.urgency = t4.item_value
         left join (select * from v_sys_dict where dict_code='equipment_report_repair_status') t5 on t1.status = t5.item_value
+        left join (select * from v_sys_dict where dict_code='is_stop') t6 on t1.is_stop = t6.item_value
+        left join (select * from v_sys_dict where dict_code='is_product') t7 on t1.err_uda1 = t7.item_value
         WHERE t1.del_flag = 0
         <if test="params.num != null and params.num != ''">
             and t1.num like concat('%',#{params.num},'%')
@@ -42,9 +50,57 @@
         <if test="params.equipmentId != null and params.equipmentId != ''">
             and t1.equipment_id = #{params.equipmentId}
         </if>
+        <if test="params.faultDescription != null and params.faultDescription != ''">
+            and t1.fault_description like concat('%',#{params.faultDescription},'%')
+        </if>
+        <if test="params.faultStartTime != null and params.faultStartTime != ''">
+            and t1.fault_time &gt;= #{params.faultStartTime}
+        </if>
+        <if test="params.faultEndTime != null and params.faultEndTime != ''">
+            and t1.fault_time &lt;= #{params.faultEndTime}
+        </if>
+        <if test="params.isStop != null and params.isStop != ''">
+            and t1.is_stop = #{params.isStop}
+        </if>
+        <if test="params.status != null and params.status != ''">
+            and t1.status = #{params.status}
+        </if>
+        <if test="params.errUda2 != null and params.errUda2 != ''">
+            and t1.err_uda2 like concat('%',#{params.errUda2},'%')
+        </if>
+        <if test="params.errUda1 != null and params.errUda1 != ''">
+            and t1.err_uda1 = #{params.errUda1}
+        </if>
+        <if test="params.isStop != null and params.isStop != ''">
+            and t1.is_stop  = #{params.isStop}
+        </if>
+        <if test="params.createBy!= null and params.createBy != ''">
+            and t1.create_by like concat('%',#{params.createBy},'%')
+        </if>
         <if test="params.equipmentNum != null and params.equipmentNum != ''">
             and t2.num like concat('%',#{params.equipmentNum},'%')
         </if>
+        <if test="params.equipmentName != null and params.equipmentName != ''">
+            and t2.name like concat('%',#{params.equipmentName},'%')
+        </if>
+        <if test="params.model != null and params.model != ''">
+            and t2.model like concat('%',#{params.model},'%')
+        </if>
+        <if test="params.specification != null and params.specification != ''">
+            and t2.specification like concat('%',#{params.specification},'%')
+        </if>
+        <if test="params.useId != null and params.useId != ''">
+            and t2.use_id  = #{params.useId}
+        </if>
+        <if test="params.teamId != null and params.teamId != ''">
+            and t2.team_id = #{params.teamId}
+        </if>
+        <if test="equipNums.size!=0">
+            and t2.num in
+            <foreach collection="equipNums" open="(" separator="," close=")" item="num">
+                #{num}
+            </foreach>
+        </if>
         ORDER BY t1.create_time desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3