From 208bb2f289ce8a7b59f587a9f57e24c0fc8a0ba6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:48:40 +0800
Subject: [PATCH] MOM系统-9-24 加班
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 83fe31d..c6202b9 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -88,7 +88,7 @@
<!--涓嶅悎鏍煎缃�-->
<select id="selectDisposal" resultType="map">
SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, s.number, i.`tell` description,
- i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
+ i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`, i.way, i.faulty_materials, i.opinion_tell
FROM mom_ocean.inspect_unaccepted i
LEFT JOIN
(
@@ -103,7 +103,7 @@
productName != null and productName != ''">AND r.`name` LIKE CONCAT('%', #{productName}, '%')
</if>
UNION ALL
- -- 鎴愬搧
+ -- 鍗婃垚鍝�
SELECT 1 AS `type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` `number`, f.`id`, u.name user_name
FROM mom_ocean.finished_inspect f, mom_ocean.`user` u
WHERE f.`state` = 1
@@ -115,7 +115,7 @@
AND f.`project_name` LIKE CONCAT('%', #{productName}, '%')
</if>
UNION ALL
- -- 鍗婃垚鍝�
+ -- 鍦ㄥ埗鍝�
SELECT 2 AS `type`, p.`material` `name`, p.`specifications_model` specifications, p.`quantity` `number`, p.`id`, u.name user_name
FROM mom_ocean.process_inspect p, mom_ocean.`user` u
WHERE p.state = 1
@@ -137,4 +137,32 @@
</if>
ORDER BY i.`update_time` DESC
</select>
+
+ <resultMap id="editDisposalOpinionConfirmationMap" type="com.yuanchu.mom.pojo.vo.RawInspectVo">
+ <id property="code" column="code"/>
+ <result property="unit" column="unit"/>
+ <result property="name" column="name"/>
+ <result property="specifications" column="specifications"/>
+ <result property="formTime" column="form_time"/>
+ <result property="number" column="number"/>
+ <result property="supplier" column="supplier"/>
+ <result property="userName" column="user_name"/>
+ <collection property="rawInsProducts" ofType="com.yuanchu.mom.pojo.vo.RawInsProductVo">
+ <result property="name" column="pNmae"/>
+ <result property="unit" column="pUnit"/>
+ <result property="required" column="required"/>
+ <result property="deviceId" column="device_id"/>
+ <result property="internal" column="internal"/>
+ <result property="testValue" column="test_value"/>
+ </collection>
+ </resultMap>
+
+ <select id="editDisposalOpinionConfirmation" resultMap="editDisposalOpinionConfirmationMap">
+ select r.`form_time`, r.`specifications`, r.`code`, r.`name`, r.`unit`, r.`number`, r.`supplier`, r.`user_name`, p.`name` pNmae, p.`unit` pUnit,
+ p.`required`,p.`internal`, p.`test_value`, p.`device_id`
+ from (mom_ocean.inspect_unaccepted i, mom_ocean.raw_inspect r)
+ left join mom_ocean.raw_ins_product p on r.`id` = p.`raw_inspect_id`
+ where i.`id` = #{rawUnacceptedId}
+ and i.`raw_inspect_id` = r.`id`
+ </select>
</mapper>
--
Gitblit v1.9.3