From eee82fc63bf8b0b48bda5d6c89a491974a20bc97 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 八月 2023 09:52:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index 5ff0a6b..82f864a 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -156,10 +156,10 @@
AND `a`.`SALESORDER` like concat('%',#{salesorder},'%')
</if>
<if test="startDateStart != null and startDateStart != ''">
- AND `a`.`START_DATE` >= concat(#{planDateStart},' 00:00:00')
+ AND `a`.`START_DATE` >= concat(#{startDateStart},' 00:00:00')
</if>
<if test="startDateEnd != null and startDateEnd != ''">
- AND concat(#{planDateEnd},' 23:59:59') >= `a`.`START_DATE`
+ AND concat(#{startDateEnd},' 23:59:59') >= `a`.`START_DATE`
</if>
<if test="planDateStart != null and planDateStart != ''">
AND `a`.`PLAN_DATE` >= concat(#{planDateStart},' 00:00:00')
@@ -168,7 +168,7 @@
AND concat(#{planDateEnd},' 23:59:59') >= `a`.`PLAN_DATE`
</if>
</where>
- order by a.PLAN_DATE desc, a.CREATE_TIME desc
+ order by a.START_DATE desc, a.CREATE_TIME desc
</select>
--
Gitblit v1.9.3