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 | 101 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 29 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index b6471a3..c6202b9 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -6,31 +6,46 @@
<!--涓嶅悎鏍肩鐞�-->
<select id="selectInsList" resultType="java.util.Map">
SELECT ru.id,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
- reason,
- material_code,
- project_name,
+ ru.reason,
u.`name`,
- specifications_model,
- unit,
- quantity,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,
- u.name,
- deal_state,
- deal_reasult,
- DATE_FORMAT(fi.update_time, '%Y-%m-%d') processingDate
- FROM (inspect_unaccepted ru,
- `user` u)
- LEFT JOIN finished_inspect fi ON fi.`id` = ru.`raw_inspect_id`
- where fi.id = ru.raw_inspect_id
- AND ru.type = 1
+ ru.deal_state,
+ ru.deal_reasult,
+ DATE_FORMAT(fi.dateArrival, '%Y-%m-%d') dateArrival,
+ fi.material_code,
+ fi.project_name,
+ fi.specifications_model,
+ fi.unit,
+ fi.quantity,
+ DATE_FORMAT(fi.inspectionDate, '%Y-%m-%d') inspectionDate,
+ DATE_FORMAT(fi.processingDate, '%Y-%m-%d') processingDate
+ FROM mom_ocean.inspect_unaccepted ru, mom_ocean.`user` u, (
+ SELECT p.id, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') dateArrival, p.`material_code`, p.`material` project_name,
+ p.`specifications_model`,
+ p.`unit`, p.`quantity`,DATE_FORMAT(p.`create_time`, '%Y-%m-%d') inspectionDate, DATE_FORMAT(p.`update_time`,
+ '%Y-%m-%d') processingDate, p.`user_id`, 2 AS
+ classify
+ FROM mom_ocean.process_inspect p
+ WHERE p.`state` = 1
+ UNION ALL
+ SELECT fi.id, DATE_FORMAT(fi.create_time, '%Y-%m-%d')
+ dateArrival,material_code, material project_name,specifications_model,
+ unit,quantity,DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,DATE_FORMAT(fi.update_time, '%Y-%m-%d')
+ processingDate, fi.`user_id`, 1 AS classify
+ FROM mom_ocean.finished_inspect fi
+ WHERE fi.`state` = 1) fi
+ WHERE fi.id = ru.raw_inspect_id
+ AND ru.`type` = fi.`classify`
+ AND ru.type != 0
AND ru.state=1
AND fi.`user_id` = u.`id`
<if test="dealState!=null">
- and deal_state = #{dealState}
+ and ru.deal_state = #{dealState}
</if>
<if test="formTime!=null and formTime!=''">
- and fi.create_time=#{formTime}
+ and fi.dateArrival=#{formTime}
+ </if>
+ <if test="productCategories != null">
+ and ru.`type` = #{productCategories}
</if>
order by ru.id desc
</select>
@@ -51,8 +66,8 @@
r.`supplier`,
i.`deal_state`,
i.`deal_reasult`
- FROM inspect_unaccepted i
- LEFT JOIN raw_inspect r ON i.`raw_inspect_id` = r.`id`
+ FROM mom_ocean.inspect_unaccepted i
+ LEFT JOIN mom_ocean.raw_inspect r ON i.`raw_inspect_id` = r.`id`
WHERE i.`state` = 1
AND i.`type` = 0
<if test="formTime != null and formTime != ''">
@@ -73,13 +88,13 @@
<!--涓嶅悎鏍煎缃�-->
<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`
- FROM inspect_unaccepted i
+ 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
(
-- 鍘熸潗鏂�
SELECT 0 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`
- FROM raw_inspect r
+ FROM mom_ocean.raw_inspect r
WHERE r.state = 1
<if test="specificationModel != null and specificationModel != ''">AND r.`specifications` LIKE CONCAT('%',
#{specificationModel}, '%')
@@ -88,9 +103,9 @@
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 finished_inspect f, `user` u
+ FROM mom_ocean.finished_inspect f, mom_ocean.`user` u
WHERE f.`state` = 1
AND u.id = f.user_id
<if test="specificationModel != null and specificationModel != ''">
@@ -100,9 +115,9 @@
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 process_inspect p, `user` u
+ FROM mom_ocean.process_inspect p, mom_ocean.`user` u
WHERE p.state = 1
AND u.id = p.user_id
<if test="specificationModel != null and specificationModel != ''">
@@ -120,6 +135,34 @@
<if test="productCategories != null">
AND s.`type` = #{productCategories}
</if>
- ORDER BY i.id DESC
+ 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