From 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index 9ebd258..5ff0a6b 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -121,7 +121,7 @@
FROM `work_plans` `a`
LEFT JOIN `department` `dmodel` ON a.DEPART_ID=dmodel.ID
LEFT JOIN `material_distribute` `mdmodel` ON a.MATERIAL_ID=mdmodel.ID
- LEFT JOIN `material` `mmodel` ON mdmodel.MATERIAL_ID=mmodel.ID
+ LEFT JOIN `material` `mmodel` ON mdmodel.MATERIAL_ID=mmodel.ID
LEFT JOIN `department` `fmodel` ON a.FACTORY_ID=fmodel.ID
LEFT JOIN `unit` `umodel` ON a.UNIT_ID=umodel.ID
LEFT JOIN `system_user` `usermodel` ON a.USER_ID=usermodel.ID
@@ -152,6 +152,15 @@
<if test="batch != null and batch != ''">
AND `a`.`batch` like concat('%',#{batch},'%')
</if>
+ <if test="salesorder != null and salesorder != ''">
+ AND `a`.`SALESORDER` like concat('%',#{salesorder},'%')
+ </if>
+ <if test="startDateStart != null and startDateStart != ''">
+ AND `a`.`START_DATE` >= concat(#{planDateStart},' 00:00:00')
+ </if>
+ <if test="startDateEnd != null and startDateEnd != ''">
+ AND concat(#{planDateEnd},' 23:59:59') >= `a`.`START_DATE`
+ </if>
<if test="planDateStart != null and planDateStart != ''">
AND `a`.`PLAN_DATE` >= concat(#{planDateStart},' 00:00:00')
</if>
--
Gitblit v1.9.3