From d1ea726be5628c46fb6be700a0197002d55d39f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 13:14:24 +0800
Subject: [PATCH] 修改2.0 9.25
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 131 +++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 56 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 7f46410..4822821 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -2,68 +2,87 @@
<!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="selectInsList" resultType="java.util.Map">
- SELECT ru.id,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
- reason,
- material_code,
- project_name,
- u.`name`,
- specifications_model,
- unit,
- quantity,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,
- u.name,
- deal_state,
- deal_reasult,
- 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 ru.type = 1
- AND ru.state=1
- AND fi.`user_id` = u.`id`
- <if test="dealState!=null and dealState!=''">
- and deal_state=#{dealState}
+ <!--涓嶅悎鏍煎缃�-->
+ <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="formTime!=null and formTime!=''">
- and fi.create_time=#{formTime}
+ <if test="
+ productName != null and productName != ''">
+ AND r.`name` LIKE CONCAT('%', #{productName}, '%')
</if>
- order by ru.id desc
- </select>
-
- <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}
+ 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 r.name LIKE CONCAT('%', #{productName}, '%')
+ AND f.`project_name` LIKE CONCAT('%', #{productName}, '%')
</if>
- <if test="supplier != null and supplier != ''">
- AND r.supplier LIKE CONCAT('%', #{supplier}, '%')
+ 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="processingStatus != null">
- AND i.deal_state = #{processingStatus}
+ <if test="productName != null and productName != ''">
+ AND p.`material` LIKE CONCAT('%', #{productName}, '%')
</if>
- ORDER BY i.`id` DESC
+ )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
+ WHERE i.`state` = 1
+ <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