From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Wed, 18 Aug 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index 97031a9..0ef0a7f 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -116,12 +116,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 != ''">
@@ -177,7 +174,9 @@
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
+ <if test="isShow != null and isShow ==0">
+ and (ss.valid_flag = 1 or sr.type = 0)
+ </if>
<include refid="queryWhereSql"/>
order by oa.create_time desc
<if test="first != null and pageSize != null">
@@ -195,7 +194,10 @@
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
+ where oa.valid_flag = 1
+ <if test="isShow != null and isShow ==0">
+ and (ss.valid_flag = 1 or sr.type = 0)
+ </if>
<include refid="queryWhereSql"/>
</select>
@@ -205,7 +207,13 @@
</insert>
<insert id="insertOpeApplyList" parameterType="java.util.List">
-
+ insert into ope_apply
+ (id, apply_code, reagent_id, num, deadline, apply_user_id, objective, status, approve_user_id, memo, valid_flag, create_time, update_time,apply_goal,apply_price,first_user)
+ values
+ <foreach collection="list" item="opeApply" separator=",">
+ (#{opeApply.id}, #{opeApply.applyCode}, #{opeApply.reagent.id}, #{opeApply.num}, #{opeApply.deadline},
+ #{opeApply.applyUserId}, #{opeApply.objective}, #{opeApply.status}, #{opeApply.approveUserId}, #{opeApply.memo}, 1, now(), now(),#{opeApply.applyGoal},#{opeApply.reagent.price},#{opeApply.approveUserId})
+ </foreach>
</insert>
<insert id="insertList">
insert into ope_apply
--
Gitblit v1.9.2