From 26279d5b43efdd690542ef7a01d9d0cda77d394f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 15:00:23 +0800
Subject: [PATCH] 领用页面 订单申请人显示和默认申领人显示

---
 src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
index 96315bf..6e1b950 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml
@@ -85,6 +85,10 @@
     <if test="endDate != null and endDate !=''">
         and oa.create_time &lt;= #{endDate}
     </if>
+    <if test="containerCode != null and containerCode !=''">
+        and wc.container_code = #{containerCode}
+        or lc.container_code =#{containerCode}
+    </if>
   </sql>
 
     <sql id="queryColumns">
@@ -212,6 +216,12 @@
         <if test="receiptNumber !=null and receiptNumber != ''">
             and ouf.receipt_number like concat("%",#{receiptNumber},"%")
         </if>
+        <if test="reagentName !=null and reagentName != ''">
+            and sr.name like concat("%",#{reagentName},"%")
+        </if>
+        <if test="applyPerson !=null and applyPerson != ''">
+            and su.name like concat("%",#{applyPerson},"%")
+        </if>
         group by ouf.receipt_number) a
 
 
@@ -258,6 +268,12 @@
         <if test="receiptNumber !=null and receiptNumber != ''">
             and ouf.receipt_number like concat("%",#{receiptNumber},"%")
         </if>
+        <if test="reagentName !=null and reagentName != ''">
+            and sr.name like concat("%",#{reagentName},"%")
+        </if>
+        <if test="applyPerson !=null and applyPerson != ''">
+            and su.name like concat("%",#{applyPerson},"%")
+        </if>
         group by ouf.receipt_number
         ORDER BY ouf.create_time desc
         <if test="first != null and pageSize != null">
@@ -286,6 +302,21 @@
         and ouf.receipt_number = #{receiptNumber}
     </select>
 
+
+    <select id="getApplyInfoSize" resultType="java.lang.Integer">
+        SELECT
+        count(0)
+        from `ope_use_flow` ouf
+        LEFT JOIN ope_reagent_status ors ON ors.reagent_code = ouf.reagent_code
+        LEFT join sys_reagent sr ON ors.reagent_id = sr.id
+        LEFT JOIN base_meta bm ON bm.id = sr.reagent_format
+        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}
+        and ouf.receipt_number = #{receiptNumber}
+    </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)
     values (#{id}, #{reagentCode}, #{status}, #{houseId}, #{containerId}, #{userId}, #{remainder}, #{place}, #{storeType}, 1, #{createTime}, #{realstatus},#{operateState})

--
Gitblit v1.9.2