From b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 19:33:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/WOutboundExtMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/src/main/resources/mappers/WOutboundExtMapper.xml b/server/src/main/resources/mappers/WOutboundExtMapper.xml
index 8abffc5..f7b115d 100644
--- a/server/src/main/resources/mappers/WOutboundExtMapper.xml
+++ b/server/src/main/resources/mappers/WOutboundExtMapper.xml
@@ -561,6 +561,12 @@
<if test="endDate != null and endDate != '' ">
AND CONCAT(#{endDate},' 23:59:59') >= `w`.`VALID_DATE`
</if>
+ <if test="rootDepartId != null">
+ AND `w`.`ROOT_DEPART_ID` = #{rootDepartId}
+ </if>
+ <if test="departId != null">
+ AND `w`.`DEPART_ID` = #{departId}
+ </if>
</where>
group by SUBSTR(w.VALID_DATE,1,10) , m.`CODE` ,m.`NAME` , wd.BATCH , p.`NAME` , wd.QUALITY_TYPE , wh.`NAME` , w.`CODE` ,u.`NAME` ,w.CREATE_TIME , w.ORIGIN_TYPE,w.ORIGIN_CODE, w.type , w.BILL_TYPE
order by w.VALID_DATE desc, w.CREATE_TIME desc
--
Gitblit v1.9.3