From 24dca40330bbaf928dd911fc9c1a960b0f4b1b28 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: Fri, 12 Nov 2021 13:15:12 +0800
Subject: [PATCH] 订单领取修改过期查询
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 94 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 82 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index e3787bf..87386f2 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -355,7 +355,7 @@
<if test="userId != null and userId != ''">
and oa.apply_user_id =#{userId}
</if>
- <if test="status != null and status != ''">
+ <if test="status != null ">
and oa.status =#{status}
</if>
<if test="productSn != null and productSn != ''">
@@ -455,16 +455,7 @@
LEFT JOIN base_meta AS bm1 ON sr.product_home = bm1.id
LEFT JOIN sys_project as project on project.project = su.project
LEFT JOIN sys_user as su1 on su1.id = project.sys_user_id
- where oa.valid_flag = 1 and (
- <choose>
- <when test="status == @com.nanometer.smartlab.entity.enumtype.ApplyStatus@EXPIRED">
- oa.status = 10
- </when>
- <otherwise>
- oa.status=4 or oa.status=6
- </otherwise>
- </choose>
- )
+ where oa.valid_flag = 1 and (oa.status=4 or oa.status=6 or oa.status = 10)
<if test="reagentName != null and reagentName != ''">
and sr.name like concat('%',#{reagentName},'%')
</if>
@@ -474,7 +465,7 @@
<if test="userId != null and userId != ''">
and oa.apply_user_id =#{userId}
</if>
- <if test="status != null and status != ''">
+ <if test="status != null ">
and oa.status =#{status}
</if>
<if test="productSn != null and productSn != ''">
@@ -611,6 +602,85 @@
)
</select>
+ <select id="getOpeApplySupplerRequireMngTotalCount" resultType="java.lang.Integer">
+ select count(1)
+ 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 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
+ <if test="isShow != null and isShow ==0">
+ and (ss.valid_flag = 1 or sr.type = 0)
+ </if>
+ <if test="reagentName != null and reagentName != ''">
+ and sr.name like concat("%",#{reagentName},"%")
+ </if>
+ <if test="startDeadline != null">
+ and oa.deadline >= #{startDeadline}
+ </if>
+ <if test="endDeadline != null">
+ and #{endDeadline} >= oa.deadline
+ </if>
+ <if test="status != null">
+ and oa.status = #{status}
+ </if>
+ <if test="company != null and company != ''">
+ and ss.name = #{company}
+ </if>
+
+ </select>
+ <select id="getOpeApplySupplerRequireMngList" parameterType="java.util.Map" resultMap="OpeApply">
+
+ select oa.*,sys.name as secondUserName,
+ sr.name as reagentName,sr.price as reagentPrice ,sr.cas as reagentCas, sr.reagent_type as reagentType, sr.reagent_character as reagentCharacter, sr.supplier_id as reagentSupplierId,
+ sr.reagent_format as reagentFormat, sr.main_metering as reagentMainMetering, sr.reagent_unit as reagentUnit, sr.per_box as reagentPerBox,
+ sr.memo as reagentMemo, sr.valid_flag as reagentValidFlag, sr.create_time as reagentCreateTime, sr.update_time as reagentUpdateTime, sr.product_sn as reagentProductSn,
+ sr.dangerous_flag as reagentDangerousFlag,sr.control_products as controlProducts,sr.product_home as productHome,
+ ss.name as supplierName,
+ su.name as applyUserName,
+ suApprove.name as approveUserName,
+ bm.meta_value as productHomeName,
+ 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 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
+ <if test="isShow != null and isShow ==0">
+ and (ss.valid_flag = 1 or sr.type = 0)
+ </if>
+ <if test="company != null and company != ''">
+ and ss.name = #{company}
+ </if>
+ <if test="reagentName != null and reagentName != ''">
+ and sr.name like concat("%",#{reagentName},"%")
+ </if>
+ <if test="startDeadline != null">
+ and oa.deadline >= #{startDeadline}
+ </if>
+ <if test="endDeadline != null">
+ and #{endDeadline} >= oa.deadline
+ </if>
+ <if test="status != null">
+ and oa.status = #{status}
+ </if>
+ order by oa.create_time desc
+ <if test="first != null and pageSize != null">
+ limit #{first}, #{pageSize}
+ </if>
+ </select>
<update id="updateByReId" parameterType="java.util.Map">
--
Gitblit v1.9.2