From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml | 79 ++++++++++++++++++++++++++++++++-------
1 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
index 4b19a1c..85237a3 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml
@@ -1,20 +1,71 @@
<?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">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsOrderUserMapper">
-
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderUser">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
- <result property="userId" column="user_id" jdbcType="INTEGER"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <id column="id" property="id"/>
+ <result column="ins_order_state_id" property="insOrderStateId"/>
+ <result column="submit_user" property="submitUser"/>
+ <result column="submit_time" property="submitTime"/>
+ <result column="num" property="num"/>
+ <result column="note" property="note"/>
+ <result column="term" property="term"/>
+ <result column="tell" property="tell"/>
</resultMap>
- <sql id="Base_Column_List">
- id,ins_order_id,user_id,
- state,create_user,create_time
- </sql>
+ <select id="getInsOrderUserList" resultType="com.yuanchu.mom.pojo.InsOrderUser">
+ select iou.*, name submitUserName
+ from ins_order_user iou
+ left join user on submit_user = user.id
+ where ins_order_state_id = #{insOrderStateId}
+ </select>
+ <select id="selectInsOrderUserDto" resultType="com.yuanchu.mom.dto.InsOrderUserDto">
+ select iou.num,
+ ios.laboratory sonLaboratory,
+ sample_code,
+ sample sampleName,
+ IFNULL(TIMESTAMPDIFF(MINUTE, iou.ins_time, submit_time), 0) AS hours
+ from ins_order_user iou
+ left join ins_order_state ios on iou.ins_order_state_id = ios.id
+ left join ins_sample isa on ios.ins_sample_id = isa.id
+ where ios.laboratory = #{sonLaboratory}
+ and ios.create_time BETWEEN #{start} AND #{end}
+ </select>
+ <select id="selectInsOrderUserDto2" resultType="com.yuanchu.mom.dto.InsOrderUserDto">
+ select iou.num,
+ ios.laboratory sonLaboratory,
+ sample_code,
+ sample sampleName,
+ IFNULL(TIMESTAMPDIFF(HOUR, iou.ins_time, submit_time), 0) AS hours
+ from ins_order_user iou
+ left join ins_order_state ios on iou.ins_order_state_id = ios.id
+ left join ins_sample isa on ios.ins_sample_id = isa.id
+ where 1=1
+ and ios.id in
+ <foreach collection="ids" open="(" close=")" item="id" separator=",">
+ #{id}
+ </foreach>
+ </select>
+
+
+ <resultMap id="InsReportDto1Map" type="com.yuanchu.mom.dto.InsReportDto1">
+ <id property="sampleId" column="sampleId" jdbcType="INTEGER"/>
+ <collection property="insReportDto2s" resultMap="insReportDto2s"/>
+ </resultMap>
+ <resultMap id="insReportDto2s" type="com.yuanchu.mom.dto.InsReportDto2">
+ <result column="laboratory" property="laboratory"/>
+ <result column="num" property="num"/>
+ <result column="insOrderUsersId" property="insOrderUsersId"/>
+ </resultMap>
+ <select id="selectInsReportDto1" resultMap="InsReportDto1Map">
+ select isa.id sampleId,
+ ios.laboratory ,
+ iou.num,
+ iou.id insOrderUsersId
+ from ins_sample isa
+ left join ins_order_state ios on isa.id = ios.ins_sample_id
+ left join ins_order_user iou on ios.id = iou.ins_order_state_id
+ where isa.ins_order_id=#{id}
+ order by isa.id,ios.laboratory
+ </select>
</mapper>
--
Gitblit v1.9.3