From 1195e51e67436cf2b9513678b5e9d3f27a043de4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 十二月 2025 08:29:40 +0800
Subject: [PATCH] 1、中空选中除膜改为多选 2、流程卡报工情况查询添加工程号条件，添加线路，备注显示
---
hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml
index 3638fd3..8ba3c39 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/DamageMapper.xml
@@ -58,28 +58,42 @@
t.height,
t.thickness,
t.filmsid,
- t1.working_procedure,
+ t2.process AS working_procedure,
t1.device_name,
- t1.type
- FROM glass_info t
- LEFT JOIN damage t1 ON t.glass_id = t1.glass_id
- WHERE
+ ifnull(t1.type,0) as type,
+ ifnull(t1.status,0) as status,
+ t1.line,
+ t1.remark
+ FROM (
+ SELECT '鍒囧壊' AS process FROM DUAL
+ UNION ALL
+ SELECT '纾ㄨ竟' AS process FROM DUAL
+ UNION ALL
+ SELECT '閽㈠寲' AS process FROM DUAL
+ ) t2
+ LEFT JOIN glass_info t ON
<!-- 鎶界澶氬瓧娈礗N鏉′欢锛氫娇鐢ㄥ弬鏁版浛鎹㈠浐瀹氬�� -->
- (t.flow_card_id, t.layer, t.glass_type) IN
+ (t.engineer_id, t.flow_card_id, t.layer, t.glass_type) IN
<foreach collection="conditionList" item="item" open="(" separator="," close=")">
- (#{item.flowCardId}, #{item.layer}, #{item.glassType})
+ (#{item.engineerId},#{item.flowCardId}, #{item.layer}, #{item.glassType})
</foreach>
- <!-- 鎶界t1.type鏉′欢 -->
- AND t1.type IN
- <foreach collection="typeList" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- AND t1.working_procedure IN
- <foreach collection="workingProcedureList" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+ <if test="workingProcedureList != null and workingProcedureList.size() > 0">
+ AND t2.process IN
+ <foreach collection="workingProcedureList" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
<if test="glassId != null and glassId != ''">
- AND t1.glass_id = #{glassId}
+ AND t.glass_id = #{glassId}
+ </if>
+ LEFT JOIN damage t1 ON t.glass_id = t1.glass_id AND t1.working_procedure = t2.process
+ where 1=1
+ <!-- 鎶界t1.type鏉′欢 -->
+ <if test="typeList != null and typeList.size() > 0">
+ AND t1.type IN
+ <foreach collection="typeList" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
</if>
</select>
<select id="queryFlowCardIdProgress" resultType="com.mes.damage.entity.vo.FlowCardDamageVO">
@@ -176,6 +190,11 @@
t.width,
t.height,
t.total_quantity
+ order by
+ t.engineer_id,
+ t.flow_card_id,
+ t.glass_type,
+ t.layer
)
select * from final_result;
</select>
--
Gitblit v1.8.0