From 2dbc49184bd74845c8da694c20d6fd03d7ac87e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 九月 2023 16:16:21 +0800
Subject: [PATCH] 修改 9.21
---
inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml b/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
index 9a96f0c..68aea86 100644
--- a/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
@@ -1,6 +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.ProcessInspectMapper">
+
+ <!--灏嗘楠岀姸鎬佷慨鏀逛负null-->
+ <update id="updById">
+ update mom_ocean.process_inspect set result=null where id=#{rawInspectId}
+ </update>
<!--鏂板杩囩▼妫�楠屽崟-鏍规嵁璁㈠崟鍙烽�夋嫨浜у搧淇℃伅鍜屽伐鑹�-->
<resultMap id="oneMap" type="map">
<id property="name" column="material"/>
@@ -14,7 +19,7 @@
<collection property="children" resultMap="threeMap" javaType="List"/>
</resultMap>
<resultMap id="threeMap" type="map">
- <id property="id" column="technologyId"/>
+ <id property="id" column="mtId"/>
<result property="name" column="techname"/>
</resultMap>
<select id="chooseMater" resultMap="oneMap">
@@ -22,7 +27,7 @@
code,
specifications,
unit,
- technology_id technologyId,
+ mt.id mtId,
techfather,
techname
from mom_ocean.manual_technology mt
@@ -41,6 +46,7 @@
<result property="specifications" column="specifications_model"/>
<result property="techfather" column="techfather"/>
<result property="techname" column="techname"/>
+ <result property="techId" column="tech_id"/>
<result property="punit" column="punit"/>
<result property="quantity" column="quantity"/>
<result property="presult" column="presult"/>
@@ -68,6 +74,7 @@
specifications_model,
techfather,
techname,
+ tech_id,
pi.unit punit,
quantity,
ii.id iid,
@@ -92,26 +99,26 @@
<!--鍒嗛〉鏌ヨ杩囩▼妫�楠屽崟鍒楄〃-->
<select id="selectProcessInspectsList" resultType="java.util.Map">
select process_inspect.id,
- order_number,
- material_code,
- material,
- specifications_model,
- techfather,
- techname,
- unit,
- quantity,
- DATE_FORMAT(process_inspect.create_time, '%Y-%m-%d') createTime,
- name,
- DATE_FORMAT(process_inspect.update_time, '%Y-%m-%d') updateTime,
- result
+ order_number,
+ material_code,
+ material,
+ specifications_model,
+ techfather,
+ techname,
+ unit,
+ quantity,
+ DATE_FORMAT(process_inspect.create_time, '%Y-%m-%d') createTime,
+ name,
+ DATE_FORMAT(process_inspect.update_time, '%Y-%m-%d') updateTime,
+ result
from mom_ocean.process_inspect
- left join mom_ocean.user on process_inspect.user_id = user.id
+ left join mom_ocean.user on process_inspect.user_id = user.id
where process_inspect.state = 1
<if test="techfather!=null and techfather!=''">
- and techfather like concat('%',#{techfather},'%')
+ and techfather like concat('%',#{techfather},'%')
</if>
<if test="name!=null and name!=''">
- and material like concat('%',#{name},'%')
+ and material like concat('%',#{name},'%')
</if>
<if test="result!=null ">
and result =#{result}
--
Gitblit v1.9.3