From a3f47b5e065878e5f41699ac1c597fd9ac9c4a21 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 14:56:24 +0800
Subject: [PATCH] 修改3.0 9.25
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 86 +------------------------------------------
1 files changed, 2 insertions(+), 84 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 18683bc..1a40c56 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,92 +1,11 @@
<?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="selectInsList" resultType="java.util.Map">
- 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 ru.deal_state = #{dealState}
- </if>
- <if test="formTime!=null and formTime!=''">
- and fi.dateArrival=#{formTime}
- </if>
- <if test="productCategories != null">
- and ru.`type` = #{productCategories}
- </if>
- order by ru.id desc
- </select>
-
- <!--鍘熸潗鏂欎笉鍚堟牸鍝�-->
- <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.`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,faulty_materials,reason
FROM mom_ocean.inspect_unaccepted i
LEFT JOIN
(
@@ -130,7 +49,6 @@
</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>
--
Gitblit v1.9.3