From ef90702eebdc4946fb5ae256af2624c45bf0b210 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 19 八月 2023 00:09:57 +0800
Subject: [PATCH] 111
---
server/src/main/resources/application.yml | 2 +-
server/src/main/resources/mappers/WorkorderExtMapper.xml | 4 ++--
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
index 07d3eb8..e57bb9c 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
@@ -543,10 +543,10 @@
private String mixParam;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String startDate;
@ApiModelProperty(value = "鎴鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private String endDate;
}
diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index dd0fac5..72fcf23 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
# application:
# name: doumeemes
profiles:
- active: standardPro
+ active: standard
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
diff --git a/server/src/main/resources/mappers/WorkorderExtMapper.xml b/server/src/main/resources/mappers/WorkorderExtMapper.xml
index 220473e..8ddc14a 100644
--- a/server/src/main/resources/mappers/WorkorderExtMapper.xml
+++ b/server/src/main/resources/mappers/WorkorderExtMapper.xml
@@ -957,10 +957,10 @@
</if>
</otherwise>
</choose>
- <if test="startDate != null">
+ <if test="startDate != null and startDate!=''">
AND `a`.`PLAN_DATE` >= #{startDate}
</if>
- <if test="endDate != null">
+ <if test="endDate != null and endDate!=''">
AND #{endDate} >= `a`.`PLAN_DATE`
</if>
<if test="mixParam != null and mixParam!=''">
--
Gitblit v1.9.3