From 4ad61e4c257621124625a89853eaa8334a11b0be Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 11:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index 327ba05..eae9690 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -3,12 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.RawInspectMapper">
- <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鎵归噺鍒犻櫎-->
- <update id="delAllRawIns">
- update mom_ocean.raw_inspect
- set state=0
- where id in (${ids})
- </update>
<select id="selCountRaw" resultType="java.lang.Integer">
select count(id)
from mom_ocean.raw_inspect
@@ -68,6 +62,7 @@
<resultMap id="oneMap" type="map">
<id property="rcode" column="rcode"/>
<result property="formTime" column="formTime"/>
+ <result property="creatTime" column="creatTime"/>
<result property="rname" column="rname"/>
<result property="specifications" column="specifications"/>
<result property="runit" column="runit"/>
@@ -90,24 +85,25 @@
</resultMap>
<select id="selectRawInspectsListById" resultMap="oneMap">
- select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
- r.code rcode,
- r.name rname,
+ select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
+ r.code rcode,
+ r.name rname,
specifications,
- r.unit runit,
+ r.unit runit,
number,
+ DATE_FORMAT(r.create_time, '%Y-%m-%d') creatTime,
supplier,
judge_state,
user_name,
- rp.id rpId,
- rp.name rpName,
- rp.unit rpUnit,
+ rp.id rpId,
+ rp.name rpName,
+ rp.unit rpUnit,
required,
internal,
test_value,
test_state,
- device.name devName,
- user.name uName
+ device.name devName,
+ user.name uName
from mom_ocean.raw_ins_product rp
left join mom_ocean.raw_inspect r on rp.raw_inspect_id = r.id
left join mom_ocean.device
--
Gitblit v1.9.3