From a5b1bad21ba279ade3954852a5e281e9086042f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 15:22:52 +0800
Subject: [PATCH] 前端联调修改2.0
---
inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
index 2530442..42a523e 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
@@ -4,33 +4,36 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsOrderStateMapper">
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderState">
- <id property="id" column="id" jdbcType="INTEGER"/>
+ <id property="id" column="idd" jdbcType="INTEGER"/>
<result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
+ <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="insState" column="ins_state" jdbcType="INTEGER"/>
<result property="sort" column="sort" jdbcType="INTEGER"/>
+ <result property="version" column="version" 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"/>
<result property="sortTime" column="sort_time" jdbcType="TIMESTAMP"/>
+ <collection property="insOrderUserList" resultMap="insOrderUsers"/>
</resultMap>
-
- <sql id="Base_Column_List">
- id,ins_order_id,laboratory,
- ins_state,create_user,create_time,
- update_user,update_time,sort,sort_time
- </sql>
- <select id="getInsOrderStateCount" resultType="com.yuanchu.mom.pojo.InsOrderState">
- select distinct ios.*,userName
+ <resultMap id="insOrderUsers" type="com.yuanchu.mom.pojo.InsOrderUser">
+ <id column="id" property="id"/>
+ <result column="submit_user" property="submitUser"/>
+ <result column="submitUserName" property="submitUserName"/>
+ <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>
+ <select id="getInsOrderStateCount" resultMap="BaseResultMap">
+ select ios.id idd, laboratory, version, iou.*, name submitUserName
from ins_order_state ios
- LEFT JOIN (
- SELECT ins_sample_id,GROUP_CONCAT( DISTINCT uu.name SEPARATOR ',') AS userName
- FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
- WHERE u.state=0
- GROUP BY ins_sample_id
- ORDER BY ins_sample_id
- ) isu ON isu.ins_sample_id = ios.ins_order_id
+ left join ins_order_user iou on ios.id = iou.ins_order_state_id
+ left join user on submit_user = user.id
where ios.ins_order_id = #{id}
+ and ios.ins_sample_id = #{sampleId}
</select>
</mapper>
--
Gitblit v1.9.3