From 3fe2d018ee29675c724feedf1fed2c8c5f5e38b2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 17 七月 2024 12:51:44 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index fe6282e..6633131 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -78,11 +78,13 @@
ifnull((rw.reviewed_state),1) as reviewed_state -- 涓嬪伐搴忓鏍哥姸鎬�
from sd.order as o
left join flow_card as fc on fc.order_id = o.order_id
- left join (select if(count(reviewed_state)>0 and process_id=null,1,0) as reviewed_state ,
- process_id
- from reporting_work
- where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr}) as rw
+ left join (select reviewed_state as reviewed_state ,
+ process_id,a.reporting_work_id
+ from reporting_work as a
+ left join reporting_work_detail as b on a.reporting_work_id = b.reporting_work_id
+ where this_process=#{previousProcess} and reviewed_state=0 and process_id=#{processIdStr} and b.technology_number=#{technologyStr}) as rw
on rw.process_id = fc.process_id
+ left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id and rwd.technology_number=fc.technology_number
where fc.process_id = #{processIdStr}
and fc.technology_number = #{technologyStr}
GROUP BY fc.process_id
@@ -153,6 +155,7 @@
from patch_log as a
where a.process_id=#{processIdStr}
and a.technology_number = #{technologyStr}
+ and a.patch_processes = #{process}
and a.review_status = 1
group by a.process_id,a.order_sort,a.technology_number
) as patch
@@ -271,24 +274,24 @@
SELECT
bdp.id,
bdp.basic_type,
- bdp.basic_name,
+ rw.teams as basic_name,
bd.basic_name,bd.id AS basic_category,
rw.process
FROM
sd.basic_data AS bd
- LEFT JOIN `basic_data_produce` AS bdp
- ON bd.id = bdp.basic_category
- right join (
- select distinct process from
- ( select distinct rw.this_process as process
- from reporting_work as rw where rw.process_id=#{processIdStr}
- UNION
- select #{process}
- ) as t
- ) as rw
- on rw.process=bd.basic_name
+ LEFT JOIN `basic_data_produce` AS bdp
+ ON bd.id = bdp.basic_category
+ right join (
+ select distinct process,teams from
+ ( select distinct rw.this_process as process,rw.teams_groups_name as teams
+ from reporting_work as rw where rw.process_id=#{processIdStr}
+
+ ) as t
+ ) as rw
+ on rw.process=bd.basic_name
WHERE
- bdp.basic_type = 'teamsgroups'
+ bdp.basic_type = 'teamsgroups'
+ GROUP BY rw.process,rw.teams
</select>
<select id="SelectHistoryProcessMp">
@@ -528,6 +531,12 @@
<if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
and rw.this_process regexp #{reportingWork.thisProcess}
</if>
+ <if test="reportingWork.deviceName != null and reportingWork.deviceName != ''">
+ and rw.device_name regexp #{reportingWork.deviceName}
+ </if>
+ <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
+ and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
+ </if>
GROUP BY rw.reporting_work_id
ORDER BY rw.reporting_work_id desc
limit #{offset},#{pageSize};
@@ -562,6 +571,12 @@
</if>
<if test="reportingWork.thisProcess != null and reportingWork.thisProcess != ''">
and rw.this_process regexp #{reportingWork.thisProcess}
+ </if>
+ <if test="reportingWork.deviceName != null and reportingWork.deviceName != ''">
+ and rw.device_name regexp #{reportingWork.deviceName}
+ </if>
+ <if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
+ and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
</if>
ORDER BY rw.reporting_work_id desc
limit #{offset},#{pageSize};
@@ -761,4 +776,12 @@
select REPLACE(GROUP_CONCAT(DISTINCT rwd.technology_number),',','') from reporting_work_detail as rwd
where rwd.reporting_work_id=#{reportingWorkId}
</select>
+
+ <update id="ReviewReportingWorkMp">
+ update reporting_work as rw
+ left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
+ set rw.reviewed_state = 1
+ where rw.process_id = #{substring} and rw.this_process=#{process}
+ and rwd.technology_number = #{result} and reviewed_state=0
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0