From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index d490fe9..8aebaf1 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -52,6 +52,7 @@
<update id="updateReceiptNumber">
update ope_use_flow
set receipt_number = #{1}
+ , note = #{2}
where reagent_code = #{0}
</update>
<sql id="queryWhereSql">
@@ -84,6 +85,9 @@
</if>
<if test="endDate != null and endDate !=''">
and oa.create_time <= #{endDate}
+ </if>
+ <if test="operatestate != null and operatestate !=''">
+ and bm1.id = #{operatestate}
</if>
<if test="containerCode != null and containerCode !=''">
and wc.container_code = #{containerCode}
@@ -196,8 +200,10 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -227,6 +233,7 @@
</select>
<select id="selectPersonalUseInfo" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
SELECT ouf.receipt_number receiptNumber,
+ ouf.note,
count(ouf.reagent_code) applyNum,
su.name username,
su.project ,
@@ -246,8 +253,10 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
<if test="reagentCode !=null and reagentCode != ''">
and ouf.reagent_code like concat("%",#{reagentCode},"%")
@@ -297,7 +306,9 @@
LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
- WHERE ouf.operatestate = #{operatestate}
+ WHERE
+ (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -313,7 +324,8 @@
LEFT JOIN base_meta bm1 on bm1.id = sr.reagent_unit
LEFT JOIN base_meta bm2 on bm2.id = sr.product_home
LEFT JOIN base_meta bm3 on bm3.id = sr.control_products
- WHERE ouf.operatestate = #{operatestate}
+ WHERE (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate})
and ouf.receipt_number = #{receiptNumber}
and ouf.valid_flag = 1
</select>
@@ -335,6 +347,7 @@
</select>
<select id="selectByReceiptNumber" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
SELECT ouf.receipt_number receiptNumber,
+ ouf.note,
count(ouf.reagent_code) applyNum,
su.name username,
su.project ,
@@ -354,13 +367,38 @@
<if test="userId !=null and userId != ''">
LEFT JOIN sys_reagent sr2 on sr2.id = ouf.user_id
</if>
- WHERE ouf.operatestate = #{operatestate}
- and LENGTH(trim(ouf.receipt_number))>0
+ WHERE (ouf.operatestate = #{operatestate}
+ or ouf.operatestate = #{operatestate1})
+ and LENGTH(trim(ouf.receipt_number))>0
and ouf.valid_flag = 1
and ouf.receipt_number = #{receiptNumber}
group by ouf.receipt_number
ORDER BY ouf.create_time desc
</select>
+ <select id="selectAll" resultType="java.util.Map">
+ select
+ oa.reagent_code as reagentCode,
+ sr.`name` as reagentName,
+ CASE WHEN wc.container_code is NULL THEN lc.container_code ELSE wc.container_code END as laboratoryContainerCode,
+ bm1.meta_value as operatestateName,
+ CASE WHEN bm1.meta_value = '仓库入库' or bm1.meta_value='仓库领用' THEN NULL ELSE oa.remainder END as remainder,
+ CASE WHEN w.name is NULL THEN l.name ELSE w.name END as warehouseContainerName,
+ su.name as userName,
+ oa.create_time as createTime
+ from ope_use_flow as oa
+ left join ope_reagent_status ors on ors.reagent_code = oa.reagent_code
+ left join sys_reagent sr on ors.reagent_id = sr.id
+ left join sys_supplier as ss on sr.supplier_id = ss.id
+ left join sys_user as su on oa.user_id = su.id
+ left join sys_warehouse_container wc on wc.id = oa.container_id
+ left join sys_warehouse w on w.id = wc.warehouse_id
+ left join sys_laboratory_container lc on lc.id = oa.container_id
+ left join sys_laboratory l on l.id = lc.laboratory_id
+ left join base_meta bm1 on bm1.id = oa.operatestate
+ where oa.valid_flag = 1
+ <include refid="queryWhereSql"/>
+ order by oa.create_time desc
+ </select>
<insert id="insertOpeUseFlow" parameterType="com.nanometer.smartlab.entity.OpeUseFlow">
insert into ope_use_flow(id, reagent_code, status, house_id, container_id, user_id, remainder, place, store_type, valid_flag, create_time, realstatus, operatestate
<if test="receiptNumber != null">
--
Gitblit v1.9.2