From c3ce93719730b885be0f9452a46090c0d3979f9f Mon Sep 17 00:00:00 2001
From: gaoaoy <1042166043@qq.com>
Date: 星期三, 13 三月 2024 14:04:00 +0800
Subject: [PATCH] 检验下单 功能调整
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 130 +++++++++++++++++++++++++++++++++----------
1 files changed, 100 insertions(+), 30 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 9b12881..66b992d 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -5,37 +5,40 @@
<mapper namespace="com.yuanchu.mom.mapper.InsOrderMapper">
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrder">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
- <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
- <result property="custom" column="custom" jdbcType="VARCHAR"/>
- <result property="company" column="company" jdbcType="VARCHAR"/>
- <result property="type" column="type" jdbcType="INTEGER"/>
- <result property="appointedTime" column="appointed_time" jdbcType="TIMESTAMP"/>
- <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
- <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
- <result property="model" column="model" jdbcType="VARCHAR"/>
- <result property="sample" column="sample" jdbcType="VARCHAR"/>
- <result property="sampleNum" column="sample_num" jdbcType="INTEGER"/>
- <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
- <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
- <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
- <result property="insResult" column="ins_result" jdbcType="VARCHAR"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="entrustCode" column="entrust_code" jdbcType="VARCHAR"/>
+ <result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="custom" column="custom" jdbcType="VARCHAR"/>
+ <result property="company" column="company" jdbcType="VARCHAR"/>
+ <result property="code" column="code" jdbcType="VARCHAR"/>
+ <result property="type" column="type" jdbcType="INTEGER"/>
+ <result property="appointedTime" column="appointed_time" jdbcType="TIMESTAMP"/>
+ <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+ <result property="smapleType" column="smaple_type" jdbcType="VARCHAR"/>
+ <result property="model" column="model" jdbcType="VARCHAR"/>
+ <result property="sample" column="sample" jdbcType="VARCHAR"/>
+ <result property="sampleNum" column="sample_num" jdbcType="DOUBLE"/>
+ <result property="isLeave" column="is_leave" jdbcType="INTEGER"/>
+ <result property="leaveNum" column="leave_num" jdbcType="INTEGER"/>
+ <result property="insProgress" column="ins_progress" jdbcType="VARCHAR"/>
+ <result property="state" column="state" jdbcType="INTEGER"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="otcCode" column="otc_code" jdbcType="VARCHAR"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
id,entrust_code,sample_code,
- custom,company,type,
- appointed_time,laboratory,smaple_type,
- model,sample,sample_num,
- is_leave,leave_num,ins_progress,
- ins_result,state,create_user,
- create_time,update_user,update_time
+ custom,company,code,
+ type,appointed_time,laboratory,
+ smaple_type,model,sample,
+ sample_num,is_leave,leave_num,
+ ins_progress,state,remark,
+ otc_code,create_user,create_time,
+ update_user,update_time
</sql>
<resultMap id="OrderThingDto" type="com.yuanchu.mom.dto.OrderThingDto">
@@ -69,8 +72,75 @@
</resultMap>
<select id="getOrderThing" resultMap="OrderThingDto">
- select * from ins_order io
- left join ins_product ip on ip.ins_order_id = io.id
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
+ select *
+ from ins_order io
+ left join ins_product ip on ip.ins_order_id = io.id
+ left join ins_product_result ipr on ip.id = ipr.ins_product_id
</select>
+
+ <select id="selectInsOrderParameter" resultType="com.yuanchu.mom.pojo.InsOrder">
+ select *
+ from (
+ select
+ id,
+ entrust_code,
+ sample_code,
+ custom,
+ company,
+ code,
+ type,
+ appointed_time,
+ laboratory,
+ smaple_type,
+ model,
+ sample,
+ sample_num,
+ is_leave,
+ leave_num,
+ ins_progress,
+ state,
+ remark,
+ otc_code,
+ create_user,
+ create_time,
+ update_user,
+ update_time
+ from ins_order
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
+ <update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
+ UPDATE ins_order
+ <set>
+ <if test="entrustCode!=null and entrustCode!='' ">entrust_code=#{entrustCode},</if>
+ <if test="sample_Code!=null ">sample_code=#{sampleCode},</if>
+ <if test="custom!=null ">custom=#{custom},</if>
+ <if test="company!=null ">company=#{company}</if>
+ <if test="code!=null ">code=#{code}</if>
+ <if test="type!=null ">type=#{type}</if>
+ <if test="appointedTime!=null ">appointed_time=#{appointedTime}</if>
+ <if test="laboratory!=null ">laboratory=#{laboratory}</if>
+ <if test="smapleType!=null ">smaple_type=#{smapleType}</if>
+ <if test="model!=null ">model=#{model}</if>
+ <if test="sample!=null ">sample=#{sample}</if>
+ <if test="sampleNum!=null ">sample_num=#{sampleNum}</if>
+ <if test="isLeave!=null ">is_leave=#{isLeave}</if>
+ <if test="leaveNum!=null ">leave_num=#{leaveNum}</if>
+ <if test="insProgress!=null ">ins_progress=#{insProgress}</if>
+ <if test="state!=null ">state=#{state}</if>
+ <if test="remark!=null ">remark=#{remark}</if>
+ <if test="otcCode!=null ">otc_code=#{otcCode}</if>
+ <if test="createUser!=null ">create_user=#{createUser}</if>
+ <if test="createTime!=null ">create_time=#{createTime}</if>
+ <if test="updateUser!=null ">update_user=#{updateUser}</if>
+ <if test="updateTime!=null ">update_time=#{updateTime}</if>
+ </set>
+ <where>
+ id=#{id}
+ </where>
+ </update>
+
</mapper>
--
Gitblit v1.9.3