From fa0d4fc230b44c04b969b4f7c7bd0ea72a61572d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 06 九月 2023 18:02:41 +0800
Subject: [PATCH] 产品检验+过程检验(初步完成)
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 1e74cb7..cfb2fcf 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,20 +1,7 @@
<?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="selectUnRawInspectsList" resultType="java.util.Map">
select ru.id,
@@ -58,9 +45,9 @@
deal_state,
deal_reasult,
DATE_FORMAT(deal_time, '%Y-%m-%d') processingDate
- FROM (inspect_unaccepted ru,
- `user` u)
- LEFT JOIN finished_inspect fi ON fi.`id` = ru.`raw_inspect_id`
+ FROM (mom_ocean.inspect_unaccepted ru,
+ mom_ocean.`user` u)
+ LEFT JOIN mom_ocean.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
@@ -107,4 +94,42 @@
</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 2 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`, 0 AS classify
+ 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 f.`type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` number, f.`id`, u.name user_name, 1 AS classify
+ 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>
+ ) AS s)
+ LEFT JOIN opinion o ON i.`id` = o.`raw_unaccepted_id`
+ 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>
+ </select>
</mapper>
--
Gitblit v1.9.3