From 1bcc45b241b13da792a52fe1bb1d489a8aa7c14b Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 05 五月 2022 16:15:40 +0800
Subject: [PATCH] 邮箱转发 李向龙=>赵群
---
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index 87386f2..5f262f3 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -19,6 +19,8 @@
<result property="beforeApproveUserId" column="before_approve_user_id"></result>
<result property="memo" column="memo"></result>
<result property="applyUserName" column="applyUserName"></result>
+ <result property="applyUserProject" column="applyUserProject"></result>
+ <result property="applyUserDepartment" column="applyUserDepartment"></result>
<result property="approveUserName" column="approveUserName"></result>
<result property="startReagentCode" column="start_reagent_code"></result>
<result property="endReagentCode" column="end_reagent_code"></result>
@@ -144,6 +146,9 @@
sr.memo as reagentMemo, sr.valid_flag as reagentValidFlag, sr.create_time as reagentCreateTime, sr.update_time as reagentUpdateTime,sr.control_products as controlProducts,sr.product_sn as reagentProductSn,sr.product_home as productHome,
ss.name as supplierName,
su.name as applyUserName,
+ su.project as applyUserProject,
+ bm2.meta_value as applyUserDepartment,
+ fir.name as firName,
suApprove.name as approveUserName,
bm.meta_value as productHomeName,
ss.valid_flag as supplierFlag,
@@ -154,7 +159,9 @@
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 bm2 on bm2.id = su.department
where oa.id = #{id} and oa.valid_flag = 1
</select>
@@ -166,6 +173,8 @@
sr.dangerous_flag as reagentDangerousFlag,sr.control_products as controlProducts,sr.product_home as productHome,
ss.name as supplierName,
su.name as applyUserName,
+ su.project as applyUserProject,
+ bm2.meta_value as applyUserDepartment,
suApprove.name as approveUserName,
bm.meta_value as productHomeName,
fir.name as firName,
@@ -180,6 +189,7 @@
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
+ left join base_meta as bm2 on bm2.id = su.department
where oa.valid_flag = 1
<if test="isShow != null and isShow ==0">
and (ss.valid_flag = 1 or sr.type = 0)
@@ -389,7 +399,16 @@
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 (oa.status=4 or oa.status=6 or oa.status = 10)
+ where oa.valid_flag = 1 and (
+ <choose>
+ <when test="status != null and status == 10">
+ oa.status = 10
+ </when>
+ <otherwise>
+ oa.status=4 or oa.status=6
+ </otherwise>
+ </choose>
+ )
<include refid="getOpeApplyReserveList_queryWhereSql" />
<if test="isAllApply != null">
<choose>
@@ -455,7 +474,16 @@
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 (oa.status=4 or oa.status=6 or oa.status = 10)
+ where oa.valid_flag = 1 and (
+ <choose>
+ <when test="status != null and status == 10">
+ oa.status = 10
+ </when>
+ <otherwise>
+ oa.status=4 or oa.status=6
+ </otherwise>
+ </choose>
+ )
<if test="reagentName != null and reagentName != ''">
and sr.name like concat('%',#{reagentName},'%')
</if>
--
Gitblit v1.9.2