From e2c14ffb0a6237bb5c397f5d0baaa4fa70cfe3b0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:20:01 +0800
Subject: [PATCH] MOM系统-9-11
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 065f169..b6471a3 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="selectInsList" resultType="java.util.Map">
@@ -48,7 +35,7 @@
order by ru.id desc
</select>
- <!--鍘熸潗鏂欎笉鍚堟牸-->
+ <!--鍘熸潗鏂欎笉鍚堟牸鍝�-->
<select id="selectUnqualifiedRawMaterials" resultType="map">
SELECT i.id,
DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
@@ -86,7 +73,7 @@
<!--涓嶅悎鏍煎缃�-->
<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`
+ i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
FROM inspect_unaccepted i
LEFT JOIN
(
@@ -125,8 +112,8 @@
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`
WHERE i.`state` = 1
+ AND i.`deal_reasult` = 0
<if test="state != null">
AND i.`deal_state` = #{state}
</if>
--
Gitblit v1.9.3