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 | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 4822821..1a40c56 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,11 +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="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
+ 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
(
@@ -56,33 +56,5 @@
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