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/OpeApplyDao.xml | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
index b55d128..b8fd00d 100644
--- a/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml
@@ -63,6 +63,7 @@
<result property="arrivalNum" column="arrival_num"></result>
<result property="status" column="status" typeHandler="com.nanometer.smartlab.entity.handler.ApplyStatusHandler"></result>
<result property="applyUserId" column="apply_user_id"></result>
+ <result property="applyUser" column="apply_user"></result>
<result property="arrivalTime" column="arrival_time"></result>
<result property="articleNumber" column="articleNumber"></result>
<result property="projectManage" column="projectManage"/>
@@ -360,6 +361,16 @@
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)
<include refid="getOpeApplyReserveList_queryWhereSql" />
+ <if test="isAllApply != null">
+ <choose>
+ <when test="isAllApply == 1">
+ and oa.used = oa.num
+ </when>
+ <otherwise>
+ and oa.used != oa.num
+ </otherwise>
+ </choose>
+ </if>
GROUP BY oa.id
)as oaa
</select>
@@ -398,7 +409,7 @@
bm1.meta_value productHome,
sr.dangerous_flag,
oa.num,
- oa.used,
+ oa.apply_user_id apply_user,
su.`name` apply_user_id,
su.project,
su1.`name` as projectManage,
@@ -415,6 +426,16 @@
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)
<include refid="getOpeApplyReserveList_queryWhereSql" />
+ <if test="isAllApply != null">
+ <choose>
+ <when test="isAllApply == 1">
+ and oa.used = oa.num
+ </when>
+ <otherwise>
+ and oa.used != oa.num
+ </otherwise>
+ </choose>
+ </if>
GROUP BY oa.id
order by oa.update_time desc
<if test="first != null and pageSize != null">
--
Gitblit v1.9.2