From a515c7ff2a4aff8167fa059a8b3740a0a7509b7a Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期一, 28 六月 2021 09:11:12 +0800
Subject: [PATCH] 恢复申购插入
---
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 5b5b10b..d490fe9 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -224,9 +224,6 @@
and su.name like concat("%",#{applyPerson},"%")
</if>
group by ouf.receipt_number) a
-
-
-
</select>
<select id="selectPersonalUseInfo" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
SELECT ouf.receipt_number receiptNumber,
@@ -331,15 +328,47 @@
and operatestate =#{operateState}
and valid_flag = 1
</select>
-
+ <select id="selectById" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
+ select *
+ from ope_use_flow
+ where id = #{id}
+ </select>
+ <select id="selectByReceiptNumber" resultType="com.nanometer.smartlab.entity.OpeUseFlow">
+ SELECT ouf.receipt_number receiptNumber,
+ count(ouf.reagent_code) applyNum,
+ su.name username,
+ su.project ,
+ su.phone,
+ bm1.meta_value department,
+ sl.name laboratoryName,
+ ouf.create_time createTime,
+ ouf.house_id houseId
+ FROM
+ ope_use_flow ouf
+ LEFT JOIN sys_user su on su.id = ouf.user_id
+ LEFT JOIN base_meta bm on bm.id = ouf.operatestate
+ LEFT JOIN ope_reagent_status ors on ors.reagent_code = ouf.reagent_code
+ LEFT JOIN sys_reagent sr on sr.id = ors.reagent_id
+ left join base_meta bm1 on bm1.id = su.department
+ left join sys_laboratory sl on sl.id = ouf.house_id
+ <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
+ and ouf.valid_flag = 1
+ and ouf.receipt_number = #{receiptNumber}
+ group by ouf.receipt_number
+ ORDER BY ouf.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="receipt_number != null">
+ <if test="receiptNumber != null">
,receipt_number
</if>
)
values (#{id}, #{reagentCode}, #{status}, #{houseId}, #{containerId}, #{userId}, #{remainder}, #{place}, #{storeType}, 1, #{createTime}, #{realstatus},#{operateState}
- <if test="receipt_number != null">
+ <if test="receiptNumber != null">
,#{receiptNumber}
</if>)
</insert>
--
Gitblit v1.9.2