From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 fdfa35d..e57bb9c 100644
--- a/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
+++ b/server/src/main/java/doumeemes/dao/ext/dto/QueryWorkorderExtDTO.java
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -91,17 +93,17 @@
private Integer proGroupId;
@ApiModelProperty(value = "鍚堟牸鏁伴噺", example = "1")
- private Integer qualifiedNum;
+ private BigDecimal qualifiedNum;
@ApiModelProperty(value = "涓嶅悎鏍兼暟閲�", example = "1")
- private Integer unqualifiedNum;
+ private BigDecimal unqualifiedNum;
@ApiModelProperty(value = "妫�楠屼汉鍛樼紪鐮�", example = "1")
private Integer checkUserId;
- @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑�", example = "1")
+ @ApiModelProperty(value = "宸ュ崟鐘舵�� 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓�", example = "1")
private Integer status;
- @ApiModelProperty(value = "宸ュ崟鐘舵�侀泦鍚堬紙寰呯敓浜э細[0,1]锛岀敓浜т腑[2,3]锛屽凡瀹屾垚[4,5,6]" )
+ @ApiModelProperty(value = "宸ュ崟鐘舵�侀泦鍚堬紙寰呯敓浜э細[0,1]锛岀敓浜т腑[2,3锛�7]锛屽凡瀹屾垚[4,5,6]" )
private List<Integer> statusList;
@ApiModelProperty(value = "鏈�杩戠姸鎬佹洿鏂版椂闂�")
@@ -541,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;
}
--
Gitblit v1.9.3