From abd93f604df5251bf993ac483978e8fb084071db Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 17 八月 2023 09:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/PlansExtMapper.xml | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/server/src/main/resources/mappers/PlansExtMapper.xml b/server/src/main/resources/mappers/PlansExtMapper.xml
index 3ae57d4..3556f9a 100644
--- a/server/src/main/resources/mappers/PlansExtMapper.xml
+++ b/server/src/main/resources/mappers/PlansExtMapper.xml
@@ -370,7 +370,6 @@
w.START_DATE as workPlanStartDate , w.PLAN_DATE as workPlanEndDate,
w.`PLAN_DATE` as workPlanPlanDate,
ifnull((select sum(worder.PLAN_NUM) from workorder worder where worder.PLAN_ID = a.id and worder.STATUS not in (7,8) ),0) as produceNum
-
FROM `plans` `a`
LEFT JOIN `department` `dmodel` ON a.DEPART_ID=dmodel.ID
LEFT JOIN `material_distribute` `mdmodel` ON a.MATERIAL_ID=mdmodel.ID
@@ -423,6 +422,12 @@
</if>
<if test="planDate != null">
AND `a`.`PLAN_DATE` = #{planDate}
+ </if>
+ <if test="planDateStartDate != null and planDateStartDate != ''">
+ AND `a`.`PLAN_DATE` >= concat(#{planDateStartDate},' 00:00:00')
+ </if>
+ <if test="planDateEndDate != null and planDateEndDate != ''">
+ AND concat(#{planDateEndDate},' 23:59:59') >= `a`.`PLAN_DATE`
</if>
<if test="materialId != null">
AND `a`.`MATERIAL_ID` = #{materialId}
@@ -766,12 +771,12 @@
<if test="usermodelInvalidTime != null">
AND `usermodel`.`INVALID_TIME` = #{usermodelInvalidTime}
</if>
- <if test="startDate != null">
- AND `a`.`PLAN_DATE` >= #{startDate}
- </if>
- <if test="endDate != null">
- AND #{endDate} >= `a`.`PLAN_DATE`
- </if>
+<!-- <if test="startDate != null">-->
+<!-- AND `a`.`PLAN_DATE` >= #{startDate}-->
+<!-- </if>-->
+<!-- <if test="endDate != null">-->
+<!-- AND #{endDate} >= `a`.`PLAN_DATE`-->
+<!-- </if>-->
<if test="mixParam != null and mixParam!=''">
AND (mmodel.name like concat('%',#{mixParam},'%') or mmodel.code like concat('%',#{mixParam},'%') or pmodel.name like concat('%',#{mixParam},'%'))
</if>
--
Gitblit v1.9.3