From b6c8cfb873fdb34e2a78acf8ce189f77d50c4be9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 14 八月 2023 15:16:06 +0800
Subject: [PATCH] # 工资表配置表
---
server/src/main/resources/mappers/WorkPlansExtMapper.xml | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/server/src/main/resources/mappers/WorkPlansExtMapper.xml b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
index 2d7aac8..5ff0a6b 100644
--- a/server/src/main/resources/mappers/WorkPlansExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkPlansExtMapper.xml
@@ -26,6 +26,7 @@
`workPlans`.`ORIGIN`,
`workPlans`.`PLAN_CODE`,
`workPlans`.`PLAN_DATE`,
+ `workPlans`.`START_DATE`,
`workPlans`.`MATERIAL_ID`,
`workPlans`.`UNIT_ID`,
`workPlans`.`NUM`,
@@ -34,6 +35,7 @@
`workPlans`.`IMPORT_ID`,
`workPlans`.`PAUSED`,
`workPlans`.`USER_ID`,
+ `workPlans`.`SALESORDER`,
`workPlans`.`PUBLISH_DATE`
FROM `work_plans` `workPlans`
<where>
@@ -76,6 +78,9 @@
<if test="planDate != null">
AND `workPlans`.`PLAN_DATE` = #{planDate}
</if>
+ <if test="startDate != null">
+ AND `workPlans`.`START_DATE` = #{startDate}
+ </if>
<if test="materialId != null">
AND `workPlans`.`MATERIAL_ID` = #{materialId}
</if>
@@ -103,6 +108,9 @@
<if test="publishDate != null">
AND `workPlans`.`PUBLISH_DATE` = #{publishDate}
</if>
+ <if test="salesorder != null">
+ AND `workPlans`.`SALESORDER` = #{salesorder}
+ </if>
</where>
</select>
@@ -113,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
@@ -144,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