From a3f47b5e065878e5f41699ac1c597fd9ac9c4a21 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 14:56:24 +0800
Subject: [PATCH] 修改3.0 9.25
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 166 ++++++++++++++----------------------------------------
1 files changed, 44 insertions(+), 122 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 065f169..1a40c56 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,131 +1,53 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
- <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�-->
- <update id="updaRawIns">
- update mom_ocean.inspect_unaccepted
- set state=0
- where raw_inspect_id = #{id}
- and type = 0
- </update>
- <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎鍘熸潗鏂欎笉鍚堟牸鍝�-->
- <update id="delAllRawIns">
- update mom_ocean.inspect_unaccepted
- set state=0
- where raw_inspect_id in (${ids})
- and type = 0
- </update>
-
- <!--涓嶅悎鏍肩鐞�-->
- <select id="selectInsList" resultType="java.util.Map">
- SELECT ru.id,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
- reason,
- material_code,
- project_name,
- 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
- AND ru.state=1
- AND fi.`user_id` = u.`id`
- <if test="dealState!=null">
- and deal_state = #{dealState}
- </if>
- <if test="formTime!=null and formTime!=''">
- and fi.create_time=#{formTime}
- </if>
- order by ru.id desc
- </select>
-
- <!--鍘熸潗鏂欎笉鍚堟牸-->
- <select id="selectUnqualifiedRawMaterials" resultType="map">
- SELECT i.id,
- DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
- i.`reason`,
- r.`code`,
- r.`name`,
- r.`specifications`,
- r.`unit`,
- r.`number`,
- DATE_FORMAT(r.`create_time`,'%Y-%m-%d') inspectionDate,
- r.`user_name`,
- DATE_FORMAT(r.`ins_time`,'%Y-%m-%d') processingDate,
- r.`supplier`,
- i.`deal_state`,
- i.`deal_reasult`
- FROM inspect_unaccepted i
- LEFT JOIN raw_inspect r ON i.`raw_inspect_id` = r.`id`
- WHERE i.`state` = 1
- AND i.`type` = 0
- <if test="formTime != null and formTime != ''">
- AND r.form_time = #{formTime}
- </if>
- <if test="productName != null and productName != ''">
- AND r.name LIKE CONCAT('%', #{productName}, '%')
- </if>
- <if test="supplier != null and supplier != ''">
- AND r.supplier LIKE CONCAT('%', #{supplier}, '%')
- </if>
- <if test="processingStatus != null">
- AND i.deal_state = #{processingStatus}
- </if>
- 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 i.`id`, s.`type`, s.name productName, s.`specifications`, i.number, i.`tell` description,
+ 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,faulty_materials,reason
+ 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
- WHERE r.state = 1
- <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>
- 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
- WHERE f.`state` = 1
- AND u.id = f.user_id
- <if test="specificationModel != null and specificationModel != ''">
- AND f.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
- </if>
- <if test="productName != null and productName != ''">
- 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
- 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
- LEFT JOIN opinion o ON i.`id` = o.`raw_unaccepted_id`
+ -- 鍘熸潗鏂�
+ SELECT 0 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`
+ FROM mom_ocean.raw_inspect r
+ WHERE r.state = 1
+ <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>
+ 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
+ AND u.id = f.user_id
+ <if test="specificationModel != null and specificationModel != ''">
+ AND f.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
+ </if>
+ <if test="productName != null and productName != ''">
+ 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
+ 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
<if test="state != null">
AND i.`deal_state` = #{state}
@@ -133,6 +55,6 @@
<if test="productCategories != null">
AND s.`type` = #{productCategories}
</if>
- ORDER BY i.id DESC
+ ORDER BY i.`update_time` DESC
</select>
</mapper>
--
Gitblit v1.9.3