From b92caa380bb6242ae11a3606ea908c7029aaeeb6 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 06 一月 2025 09:57:53 +0800
Subject: [PATCH] Handler
---
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index b1a7326..908518c 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -304,7 +304,7 @@
where user_id = #{userId,jdbcType=BIGINT}
and station_id = #{stationId,jdbcType=BIGINT}
<choose>
- <when test="planId != null and planId !=''">
+ <when test="planId != null">
and plan_id = #{planId,jdbcType=BIGINT}
</when>
<otherwise>
@@ -320,7 +320,7 @@
</otherwise>
</choose>
<choose>
- <when test="nodeId != null and nodeId !=''">
+ <when test="nodeId != null">
and node_id = #{nodeId,jdbcType=BIGINT}
</when>
<otherwise>
@@ -332,6 +332,34 @@
and id != #{id,jdbcType=BIGINT}
</if>
</select>
+ <select id="queryWorkList" resultType="cn.hutool.json.JSONObject">
+ WITH a as ( SELECT pap.id as plan_id,pap.`name` as plan_name,
+ ppp.id as process_id,ppp.`name` as process_name,
+ ppn.id as node_id, ppn.content as node_name,
+ pp.`code` as pro_code , pp.`name` as pro_name,
+ pbn.batch_number as batch_number, ppn.sort as sort
+ from pr_assembly_plan pap, pr_production_process ppp,pr_production_node ppn,
+ plt_product pp,pr_batch_number pbn
+ WHERE pap.process_id = ppp.id and ppp.id = ppn.process_id
+ and pap.pro_id = pp.id and pap.batch_id = pbn.id
+ order by plan_id,process_id,sort)
+ SELECT ps.station_name,ppl.line_name,sawl.user_name,sawl.assistants_name,sawl.plan_name ,sawl.process_name,sawl.node_name,sawl.dt,sawl.work_type FROM
+ (SELECT id,`name` AS station_name, line_id FROM plt_station WHERE deleted = 0 AND disabled = 0) ps
+ LEFT JOIN (SELECT id,`name` AS line_name FROM plt_production_line) ppl ON ps.line_id = ppl.id
+ LEFT JOIN (select w.station_id,b.`name` as user_name ,GROUP_CONCAT(us.name) as assistants_name, a.plan_name, a.process_name, a.node_name,w.dt,
+ CASE w.work_type
+ WHEN '1' THEN '缁勮'
+ WHEN '2' THEN '娴嬭瘯'
+ WHEN '3' THEN '鍝佹'
+ WHEN '4' THEN '缁翠慨'
+ ELSE w.work_type END AS work_type
+ from sta_assembly_work_last w
+ LEFT JOIN ba_user b ON w.user_id = b.id
+ LEFT JOIN a ON w.plan_id = a.plan_id AND w.node_id = a.node_id
+ LEFT JOIN ba_user us ON FIND_IN_SET(us.id,w.assistants) GROUP BY w.id
+ ) sawl ON ps.id = sawl.station_id
+ </select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete
from sta_assembly_work_last
--
Gitblit v1.8.0