From 9f87ca56f82c2352adbb7201a190ac944e6deeeb Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 08 九月 2023 17:55:54 +0800
Subject: [PATCH] MOM系统-9-08
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 85 ++++++++++++++++++------------------------
1 files changed, 37 insertions(+), 48 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index cfb2fcf..7a3d9b8 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -3,33 +3,7 @@
<mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
- <select id="selectUnRawInspectsList" resultType="java.util.Map">
- select ru.id,
- DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
- reason,
- code,
- name,
- specifications,
- unit,
- number,
- DATE_FORMAT(ri.create_time, '%Y-%m-%d') '鎶ユ鏃ユ湡',
- user_name,
- DATE_FORMAT(ins_time, '%Y-%m-%d') '妫�楠屾棩鏈�',
- deal_state,
- deal_reasult,
- DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
- from mom_ocean.raw_inspect ri inner join mom_ocean.inspect_unaccepted ru on ri.id = ru.raw_inspect_id
- <where>
- <if test="dealState!=null and dealState!=''">
- and deal_state=#{dealState}
- </if>
- <if test="formTime!=null and formTime!=''">
- and form_time=#{formTime}
- </if>
- and ru.state=1
- </where>
- order by ru.id desc
- </select>
+ <!--涓嶅悎鏍肩鐞�-->
<select id="selectInsList" resultType="java.util.Map">
SELECT ru.id,
DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
@@ -44,16 +18,16 @@
u.name,
deal_state,
deal_reasult,
- DATE_FORMAT(deal_time, '%Y-%m-%d') processingDate
- FROM (mom_ocean.inspect_unaccepted ru,
- mom_ocean.`user` u)
- LEFT JOIN mom_ocean.finished_inspect fi ON fi.`id` = ru.`raw_inspect_id`
+ 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
AND ru.state=1
AND fi.`user_id` = u.`id`
- <if test="dealState!=null and dealState!=''">
- and deal_state=#{dealState}
+ <if test="dealState!=null">
+ and deal_state = #{dealState}
</if>
<if test="formTime!=null and formTime!=''">
and fi.create_time=#{formTime}
@@ -61,9 +35,10 @@
order by ru.id desc
</select>
+ <!--鍘熸潗鏂欎笉鍚堟牸-->
<select id="selectUnqualifiedRawMaterials" resultType="map">
SELECT i.id,
- DATE_FORMAT(r.create_time, '%Y-%m-%d') dateArrival,
+ DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
i.`reason`,
r.`code`,
r.`name`,
@@ -81,7 +56,7 @@
WHERE i.`state` = 1
AND i.`type` = 0
<if test="formTime != null and formTime != ''">
- AND r.create_time = #{formTime}
+ AND r.form_time = #{formTime}
</if>
<if test="productName != null and productName != ''">
AND r.name LIKE CONCAT('%', #{productName}, '%')
@@ -95,22 +70,26 @@
ORDER BY i.`id` DESC
</select>
+ <!--涓嶅悎鏍煎缃�-->
<select id="selectDisposal" resultType="map">
SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, s.number, i.`tell` description,
- o.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
- FROM (inspect_unaccepted i,
- (
- SELECT 2 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`, 0 AS classify
+ i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
+ FROM inspect_unaccepted i
+ LEFT JOIN
+ (
+ -- 鍘熸潗鏂�
+ SELECT 0 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`
FROM raw_inspect r
WHERE r.state = 1
- <if test="specificationModel != null and specificationModel != ''">
- AND r.`specifications` LIKE CONCAT('%', #{specificationModel}, '%')
+ <if test="specificationModel != null and specificationModel != ''">AND r.`specifications` LIKE CONCAT('%',
+ #{specificationModel}, '%')
</if>
- <if test="productName != null and productName != ''">
- AND r.`name` LIKE CONCAT('%', #{productName}, '%')
+ <if test="
+ productName != null and productName != ''">AND r.`name` LIKE CONCAT('%', #{productName}, '%')
</if>
UNION ALL
- SELECT f.`type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` number, f.`id`, u.name user_name, 1 AS classify
+ -- 鎴愬搧
+ 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
WHERE f.`state` = 1
AND u.id = f.user_id
@@ -120,16 +99,26 @@
<if test="productName != null and productName != ''">
AND f.`project_name` LIKE CONCAT('%', #{productName}, '%')
</if>
- ) AS s)
- LEFT JOIN opinion o ON i.`id` = o.`raw_unaccepted_id`
+ 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
+ WHERE p.state = 1
+ AND u.id = p.user_id
+ <if test="specificationModel != null and specificationModel != ''">
+ AND p.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
+ </if>
+ <if test="productName != null and productName != ''">
+ AND p.`material` LIKE CONCAT('%', #{productName}, '%')
+ </if>
+ )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
WHERE i.`state` = 1
- AND i.`type` = s.`classify`
- AND s.`id` = i.`raw_inspect_id`
<if test="state != null">
AND i.`deal_state` = #{state}
</if>
<if test="productCategories != null">
AND s.`type` = #{productCategories}
</if>
+ ORDER BY i.id DESC
</select>
</mapper>
--
Gitblit v1.9.3