From 6db5272e2df8a27942f10c03d93183fc9b01e22a Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 18:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 126 ++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 36 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index a5b294b..327ba05 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -3,42 +3,12 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.RawInspectMapper">
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.RawInspect">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="code" column="code" jdbcType="VARCHAR"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="specifications" column="specifications" jdbcType="VARCHAR"/>
- <result property="unit" column="unit" jdbcType="VARCHAR"/>
- <result property="number" column="number" jdbcType="INTEGER"/>
- <result property="insState" column="ins_state" jdbcType="INTEGER"/>
- <result property="judgeState" column="judge_state" jdbcType="INTEGER"/>
- <result property="insTime" column="ins_time" jdbcType="DATE"/>
- <result property="userName" column="user_name" jdbcType="VARCHAR"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="DATE"/>
- <result property="updateTime" column="update_time" jdbcType="DATE"/>
- <result property="formTime" column="form_time" jdbcType="DATE"/>
- </resultMap>
- <select id="selectRawInspectsByLimit" resultType="com.yuanchu.mom.pojo.RawInspect">
- select id, code, name, specifications, unit, number, ins_state, judge_state, ins_time, user_name, create_time,
- form_time
- from mom_ocean.raw_inspect
- where state = 1
- <if test="formTime!=null and formTime!=''">
- and form_time = #{formTime}
- </if>
- <if test="createTime!=null and createTime!=''">
- and create_time = #{createTime}
- </if>
- <if test="insState!=2">
- and ins_state = #{insState}
- </if>
- <if test="judgeState!=2">
- and judge_state = #{judgeState}
- </if>
- order by id desc
- limit #{pageSize},#{countSize}
- </select>
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟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
@@ -63,4 +33,88 @@
and raw_inspect.create_time <= #{end}
</if>
</select>
+
+ <!--鍒嗛〉鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃-->
+ <select id="selectRawInspectsList" resultType="java.util.Map">
+ select id,
+ DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
+ code,
+ name,
+ specifications,
+ unit,
+ number,
+ DATE_FORMAT(create_time, '%Y-%m-%d') createTime,
+ user_name,
+ DATE_FORMAT(ins_time, '%Y-%m-%d') insTime,
+ ins_state,
+ judge_state
+ from mom_ocean.raw_inspect
+ where state=1
+ <if test="formTime!=null and formTime!=''">
+ and form_time=#{formTime}
+ </if>
+ <if test="code!=null and code!=''">
+ and code like concat('%',#{code},'%')
+ </if>
+ <if test="insState!=null">
+ and ins_state=#{insState}
+ </if>
+ <if test="name!=null and name!=''">
+ and name like concat('%',#{name},'%')
+ </if>
+ </select>
+
+ <!--鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ョ湅璇︽儏-->
+ <resultMap id="oneMap" type="map">
+ <id property="rcode" column="rcode"/>
+ <result property="formTime" column="formTime"/>
+ <result property="rname" column="rname"/>
+ <result property="specifications" column="specifications"/>
+ <result property="runit" column="runit"/>
+ <result property="number" column="number"/>
+ <result property="supplier" column="supplier"/>
+ <result property="judgeState" column="judge_state"/>
+ <result property="userName" column="user_name"/>
+ <collection property="children" resultMap="twoMap" javaType="List"/>
+ </resultMap>
+ <resultMap id="twoMap" type="map">
+ <id property="rpId" column="rpId"/>
+ <result property="rpName" column="rpName"/>
+ <result property="rpUnit" column="rpUnit"/>
+ <result property="required" column="required"/>
+ <result property="internal" column="internal"/>
+ <result property="testValue" column="test_value"/>
+ <result property="testState" column="test_state"/>
+ <result property="devName" column="devName"/>
+ <result property="uName" column="uName"/>
+ </resultMap>
+
+ <select id="selectRawInspectsListById" resultMap="oneMap">
+ select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
+ r.code rcode,
+ r.name rname,
+ specifications,
+ r.unit runit,
+ number,
+ supplier,
+ judge_state,
+ user_name,
+ rp.id rpId,
+ rp.name rpName,
+ rp.unit rpUnit,
+ required,
+ internal,
+ test_value,
+ test_state,
+ 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
+ on rp.device_id = device.id
+ left join mom_ocean.user on rp.user_id = user.id
+ where r.state = 1
+ and rp.state = 1
+ and r.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3