From 0dfab938c5116c8fa0191cadf36a47f5bb4f2936 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 16 九月 2021 15:50:52 +0800
Subject: [PATCH] 申购：管制品 搜索
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 76 +++++++++++++++++++++++++++++++-------
1 files changed, 62 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index 0d3224f..e3787bf 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -16,7 +16,7 @@
<result property="updateTime" column="update_time"></result>
<result property="validFlag" column="valid_flag" typeHandler="com.nanometer.smartlab.entity.handler.ValidFlagHandler"></result>
<result property="approveUserId" column="approve_user_id"></result>
- <result property="beforeApproveUserId" column="before_approve_user_id"></result>
+ <result property="beforeApproveUserId" column="before_approve_user_id"></result>
<result property="memo" column="memo"></result>
<result property="applyUserName" column="applyUserName"></result>
<result property="approveUserName" column="approveUserName"></result>
@@ -50,8 +50,10 @@
<result property="productSn" column="reagentProductSn"></result>
<result property="controlProducts" column="controlProducts"></result>
<result property="dangerousFlag" column="reagentDangerousFlag" typeHandler="com.nanometer.smartlab.entity.handler.DangerousFlagHandler"></result>
- <result property="productHome" column="productHome"></result>
- <result property="productHomeName" column="productHomeName"></result>
+ <result property="productHome" column="productHome"></result>
+ <result property="productHomeName" column="productHomeName"></result>
+ <result property="type" column="type"></result>
+ <result property="supplierFlag" column="supplierFlag"></result>
</association>
</resultMap>
@@ -116,12 +118,9 @@
and (oa.approve_user_id = #{searchApproval} or oa.before_approve_user_id = #{searchApproval})
</if>
- <if test="applyUserName != null and applyUserName != ''">
- and su.name like #{applyUserName}
- </if>
-
<if test="approvaUserName != null and approvaUserName != ''">
- and (suApprove.name like #{approvaUserName} or sys.name like #{approvaUserName})
+ and (suApprove.name like concat('%',#{approvaUserName},'%')
+ or sys.name like concat('%',#{approvaUserName},'%') )
</if>
<if test="editId != null and editId != ''">
@@ -146,7 +145,9 @@
ss.name as supplierName,
su.name as applyUserName,
suApprove.name as approveUserName,
- bm.meta_value as productHomeName
+ bm.meta_value as productHomeName,
+ ss.valid_flag as supplierFlag,
+ sr.type as type
from ope_apply as oa
left join sys_reagent sr on oa.reagent_id = sr.id
left join sys_supplier as ss on sr.supplier_id = ss.id
@@ -167,17 +168,25 @@
su.name as applyUserName,
suApprove.name as approveUserName,
bm.meta_value as productHomeName,
- fir.name as firName
+ fir.name as firName,
+ ss.valid_flag as supplierFlag,
+ sr.type as type
from ope_apply as oa
left join sys_reagent sr on oa.reagent_id = sr.id
left join sys_supplier as ss on sr.supplier_id = ss.id
left join sys_user as su on oa.apply_user_id = su.id
left join sys_user as suApprove on oa.approve_user_id = suApprove.id
- left join sys_user as sys on sys.id=oa.before_approve_user_id
- left join sys_user as fir on fir.id=oa.first_user
+ left join sys_user as sys on sys.id=oa.before_approve_user_id
+ left join sys_user as fir on fir.id=oa.first_user
left join base_meta as bm on sr.product_home = bm.id
+ left join base_meta as bm1 on bm1.id = sr.control_products
where oa.valid_flag = 1
- and sr.valid_flag = 1
+ <if test="isShow != null and isShow ==0">
+ and (ss.valid_flag = 1 or sr.type = 0)
+ </if>
+ <if test="controlProduct != null and controlProduct != ''">
+ and bm1.meta_value like concat("%",#{controlProduct},"%")
+ </if>
<include refid="queryWhereSql"/>
order by oa.create_time desc
<if test="first != null and pageSize != null">
@@ -195,7 +204,14 @@
left join sys_user as sys on sys.id=oa.before_approve_user_id
left join sys_user as fir on fir.id=oa.first_user
left join base_meta as bm on sr.product_home = bm.id
- where oa.valid_flag = 1 and sr.valid_flag = 1
+ left join base_meta as bm1 on bm1.id = sr.control_products
+ where oa.valid_flag = 1
+ <if test="isShow != null and isShow ==0">
+ and (ss.valid_flag = 1 or sr.type = 0)
+ </if>
+ <if test="controlProduct != null and controlProduct != ''">
+ and bm1.meta_value like concat("%",#{controlProduct},"%")
+ </if>
<include refid="queryWhereSql"/>
</select>
@@ -563,6 +579,38 @@
</select>
+ <select id="getApplyControlInfo" resultType="java.util.Map">
+ (SELECT sum(oa.num) sum,"易制毒" name from ope_apply oa
+ LEFT JOIN sys_reagent sr on oa.reagent_id = sr.id
+ LEFT JOIN base_meta bm on bm.id = sr.control_products
+ where
+ oa.valid_flag = 1
+ and sr.valid_flag = 1
+ and YEAR(oa.create_time)=YEAR(NOW())
+ and oa.status in(2,3,4,6)
+ and
+ meta_value like "%易制毒%") UNION ALL(
+
+ SELECT sum(oa.num) sum,"易制爆" name from ope_apply oa
+ LEFT JOIN sys_reagent sr on oa.reagent_id = sr.id
+ LEFT JOIN base_meta bm on bm.id = sr.control_products
+ where
+ oa.valid_flag = 1
+ and sr.valid_flag = 1
+ and YEAR(oa.create_time)=YEAR(NOW())
+ and oa.status in(2,3,4,6)
+ and meta_value like "%易制爆%")UNION ALL(
+
+ SELECT sum(oa.num) sum,"总数" name from ope_apply oa
+ LEFT JOIN sys_reagent sr on oa.reagent_id = sr.id
+ where
+ oa.valid_flag = 1
+ and sr.valid_flag = 1
+ and YEAR(oa.create_time)=YEAR(NOW())
+ and oa.status in(2,3,4,6)
+ )
+
+ </select>
<update id="updateByReId" parameterType="java.util.Map">
--
Gitblit v1.9.2