From 513485caca0c56c713797bfd208c6f22c7ce7727 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 八月 2023 17:06:54 +0800
Subject: [PATCH] 初始化1.0.1
---
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index 56afe26..7200c4b 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -35,7 +35,6 @@
`workPlans`.`IMPORT_ID`,
`workPlans`.`PAUSED`,
`workPlans`.`USER_ID`,
- `workPlans`.`SALESORDER`,
`workPlans`.`PUBLISH_DATE`
FROM `work_plans` `workPlans`
<where>
@@ -108,9 +107,6 @@
<if test="publishDate != null">
AND `workPlans`.`PUBLISH_DATE` = #{publishDate}
</if>
- <if test="salesorder != null">
- AND `workPlans`.`SALESORDER` = #{salesorder}
- </if>
</where>
</select>
@@ -121,7 +117,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,15 +148,6 @@
<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>
@@ -168,7 +155,7 @@
AND concat(#{planDateEnd},' 23:59:59') >= `a`.`PLAN_DATE`
</if>
</where>
- order by a.START_DATE desc, a.CREATE_TIME desc
+ order by a.PLAN_DATE desc, a.CREATE_TIME desc
</select>
--
Gitblit v1.9.3