From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 215 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 161 insertions(+), 54 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 6cd8f94..344c98d 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,63 +1,170 @@
<?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">
- <select id="selectUnRawInspectsList" resultType="java.util.Map">
- select
- 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 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
- </where>
- </select>
+ <!--涓嶅悎鏍肩鐞�-->
<select id="selectInsList" resultType="java.util.Map">
- select DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
- reason,
- material_code,
- name,
- specifications_model,
- unit,
- quantity,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鎶ユ鏃ユ湡',
- 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
- where fi.id = ru.raw_inspect_id
- and fi.user_id=u.id
+ SELECT ru.id,
+ ru.reason,
+ u.`name`,
+ ru.deal_state,
+ ru.deal_reasult,
+ DATE_FORMAT(fi.dateArrival, '%Y-%m-%d') dateArrival,
+ fi.material_code,
+ fi.project_name,
+ fi.specifications_model,
+ fi.unit,
+ number quantity,
+ DATE_FORMAT(fi.inspectionDate, '%Y-%m-%d') inspectionDate,
+ DATE_FORMAT(fi.processingDate, '%Y-%m-%d') processingDate
+ FROM mom_ocean.inspect_unaccepted ru, mom_ocean.`user` u, (
+ SELECT p.id, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') dateArrival, p.`material_code`, p.`material` project_name,
+ p.`specifications_model`,
+ p.`unit`, p.`quantity`,DATE_FORMAT(p.`create_time`, '%Y-%m-%d') inspectionDate, DATE_FORMAT(p.`update_time`,
+ '%Y-%m-%d') processingDate, p.`user_id`, 2 AS
+ classify
+ FROM mom_ocean.process_inspect p
+ WHERE p.`state` = 1
+ UNION ALL
+ SELECT fi.id, DATE_FORMAT(fi.create_time, '%Y-%m-%d')
+ dateArrival,material_code, material project_name,specifications_model,
+ unit,quantity,DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,DATE_FORMAT(fi.update_time, '%Y-%m-%d')
+ processingDate, fi.`user_id`, 1 AS classify
+ FROM mom_ocean.finished_inspect fi
+ WHERE fi.`state` = 1) fi
+ WHERE fi.id = ru.raw_inspect_id
+ AND ru.`type` = fi.`classify`
+ AND ru.type != 0
+ AND ru.state=1
+ AND fi.`user_id` = u.`id`
<if test="dealState!=null">
- and deal_state=#{dealState}
+ and ru.deal_state = #{dealState}
</if>
- <if test="formTime!=null">
- and fi.create_time=#{formTime}
+ <if test="formTime!=null and formTime!=''">
+ and fi.dateArrival=#{formTime}
</if>
- <if test="type!=null">
- and ru.type=#{type}
+ <if test="productCategories != null">
+ and ru.`type` = #{productCategories}
</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.form_time, '%Y-%m-%d') dateArrival,
+ i.`reason`,
+ r.`code`,
+ r.`name`,
+ r.`specifications`,
+ r.`unit`,
+ i.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 mom_ocean.inspect_unaccepted i
+ LEFT JOIN mom_ocean.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.form_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>
+
+ <!--涓嶅悎鏍煎缃�-->
+ <select id="selectDisposal" resultType="map">
+ SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, i.number, i.`tell` description,
+ i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`, i.way, i.faulty_materials, i.opinion_tell
+ FROM mom_ocean.inspect_unaccepted i
+ LEFT JOIN
+ (
+ -- 鍘熸潗鏂�
+ SELECT 0 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`
+ FROM mom_ocean.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 1 AS `type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` `number`,
+ f.`id`, u.name user_name
+ FROM mom_ocean.finished_inspect f, mom_ocean.`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>
+ UNION ALL
+ -- 鍗婃垚鍝�
+ SELECT 2 AS `type`, p.`material` `name`, p.`specifications_model` specifications, p.`quantity` `number`, p.`id`,
+ u.name user_name
+ FROM mom_ocean.process_inspect p, mom_ocean.`user` u
+ WHERE p.state = 1
+ AND u.id = p.user_id
+ <if test="specificationModel != null and specificationModel != ''">
+ AND p.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
+ </if>
+ <if test="productName != null and productName != ''">
+ AND p.`material` LIKE CONCAT('%', #{productName}, '%')
+ </if>
+ )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
+ WHERE i.`state` = 1
+ AND i.`deal_reasult` = 0
+ <if test="state != null">
+ AND i.`deal_state` = #{state}
+ </if>
+ <if test="productCategories != null">
+ AND s.`type` = #{productCategories}
+ </if>
+ ORDER BY i.`update_time` DESC
+ </select>
+
+ <resultMap id="editDisposalOpinionConfirmationMap" type="com.yuanchu.mom.pojo.vo.RawInspectVo">
+ <id property="code" column="code"/>
+ <result property="unit" column="unit"/>
+ <result property="name" column="name"/>
+ <result property="specifications" column="specifications"/>
+ <result property="formTime" column="form_time"/>
+ <result property="number" column="number"/>
+ <result property="supplier" column="supplier"/>
+ <result property="userName" column="user_name"/>
+ <collection property="rawInsProducts" ofType="com.yuanchu.mom.pojo.vo.RawInsProductVo">
+ <result property="name" column="pNmae"/>
+ <result property="unit" column="pUnit"/>
+ <result property="required" column="required"/>
+ <result property="deviceId" column="device_id"/>
+ <result property="internal" column="internal"/>
+ <result property="testValue" column="test_value"/>
+ </collection>
+ </resultMap>
+
+ <select id="editDisposalOpinionConfirmation" resultMap="editDisposalOpinionConfirmationMap">
+ select r.`form_time`, r.`specifications`, r.`code`, r.`name`, r.`unit`, r.`number`, r.`supplier`, r.`user_name`, p.`name` pNmae, p.`unit` pUnit,
+ p.`required`,p.`internal`, p.`test_value`, p.`device_id`
+ from (mom_ocean.inspect_unaccepted i, mom_ocean.raw_inspect r)
+ left join mom_ocean.raw_ins_product p on r.`id` = p.`raw_inspect_id`
+ where i.`id` = #{rawUnacceptedId}
+ and i.`raw_inspect_id` = r.`id`
+ </select>
+</mapper>
--
Gitblit v1.9.3