From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 7f46410..1e74cb7 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,7 +1,48 @@
<?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,
+ 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,
--
Gitblit v1.9.3