From 920cf792a417df327b3875b571bc5923296c92db Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 16 八月 2023 18:15:42 +0800
Subject: [PATCH] # 工资表配置表 导出模板索字段添加
---
server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java | 4 ++--
server/src/main/resources/mappers/WorkorderRecordExtMapper.xml | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
index 049cf7d..7551472 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryUserSalaryListDTO.java
@@ -28,10 +28,10 @@
private Integer rootDepartId;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ private String startDate;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ private String endDate;
@ApiModelProperty(value = "鏁版嵁鏉冮檺閮ㄩ棬缂栫爜闆嗗悎" ,hidden = true)
private List<Integer> departIds;
diff --git a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
index f4c1edd..edb56c3 100644
--- a/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderRecordExtMapper.xml
@@ -453,11 +453,11 @@
<if test="materialName != null and materialName !=''">
AND (c.`name` like concat('%', #{materialName},'%') or c.`code` like concat('%', #{materialName},'%'))
</if>
- <if test="startDate != null">
- AND a.`CREATE_TIME` >= #{startDate}
+ <if test="startDate != null and startDate != ''">
+ AND a.`CREATE_TIME` >= concat(#{startDate},' 00:00:00')
</if>
- <if test="endDate != null">
- AND #{endDate} >= a.`CREATE_TIME`
+ <if test="endDate != null and endDate != ''">
+ AND concat(#{endDate},' 23:59:59') >= a.`CREATE_TIME`
</if>
<if test="userId != null">
AND a.`CREATE_USER` = #{userId}
--
Gitblit v1.9.3