From 5fb14bb0d28210f69c07021441b2cdd76aa46fe5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 04 九月 2023 17:58:24 +0800
Subject: [PATCH] 原材料检验修改9-4 3.0
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 74e77d6..61deb85 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,8 +1,23 @@
<?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
+ select ru.id,
DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
code,
@@ -18,21 +33,18 @@
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>
- <if test="type!=null and type!=''">
- and ru.type=#{type}
- </if>
- and ru.state=1
+ <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
+ select ru.id,
DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
material_code,
@@ -56,9 +68,6 @@
</if>
<if test="formTime!=null and formTime!=''">
and fi.create_time=#{formTime}
- </if>
- <if test="type!=null and type!=''">
- and ru.type=#{type}
</if>
and ru.state=1
order by ru.id desc
--
Gitblit v1.9.3