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 | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 27 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 6cd8f94..1e74cb7 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
+ select ru.id,
DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
reason,
code,
@@ -18,46 +33,78 @@
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 deal_state=#{dealState}
- </if>
- <if test="formTime!=null">
- and form_time=#{formTime}
- </if>
- <if test="type!=null">
- 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 DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
+ SELECT ru.id,
+ DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
reason,
material_code,
- name,
+ project_name,
+ u.`name`,
specifications_model,
unit,
quantity,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鎶ユ鏃ユ湡',
+ DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,
u.name,
- DATE_FORMAT(fi.update_time, '%Y-%m-%d') '妫�楠屾棩鏈�',
deal_state,
deal_reasult,
- DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
- from mom_ocean.inspect_unaccepted ru,
- mom_ocean.finished_inspect fi ,
- mom_ocean.user u
+ 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`
where fi.id = ru.raw_inspect_id
- and fi.user_id=u.id
- <if test="dealState!=null">
+ AND ru.type = 1
+ AND ru.state=1
+ AND fi.`user_id` = u.`id`
+ <if test="dealState!=null and dealState!=''">
and deal_state=#{dealState}
</if>
- <if test="formTime!=null">
+ <if test="formTime!=null and formTime!=''">
and fi.create_time=#{formTime}
</if>
- <if test="type!=null">
- and ru.type=#{type}
- </if>
- and ru.state=1
+ order by ru.id desc
</select>
-</mapper>
\ No newline at end of file
+
+ <select id="selectUnqualifiedRawMaterials" resultType="map">
+ SELECT i.id,
+ DATE_FORMAT(r.create_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.create_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>
+</mapper>
--
Gitblit v1.9.3