shengyang000 лет назад: 3
Родитель
Сommit
d4820c1935

+ 13 - 10
src/main/java/com/unissoft/model/ProcessAudit.java

@@ -1,14 +1,15 @@
1 1
 package com.unissoft.model;
2 2
 
3
+import com.baomidou.mybatisplus.annotation.TableName;
4
+import com.fasterxml.jackson.annotation.JsonFormat;
3 5
 import com.baomidou.mybatisplus.annotation.IdType;
4
-import com.baomidou.mybatisplus.annotation.TableField;
6
+import java.util.Date;
5 7
 import com.baomidou.mybatisplus.annotation.TableId;
6
-import com.baomidou.mybatisplus.annotation.TableName;
8
+import com.baomidou.mybatisplus.annotation.TableField;
9
+import java.io.Serializable;
7 10
 import io.swagger.annotations.ApiModel;
8 11
 import io.swagger.annotations.ApiModelProperty;
9 12
 
10
-import java.io.Serializable;
11
-
12 13
 /**
13 14
  * <p>
14 15
  * 
@@ -143,12 +144,14 @@ public class ProcessAudit implements Serializable {
143 144
     private String workName;
144 145
 
145 146
     @ApiModelProperty(value = "办理开始时间")
147
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
146 148
     @TableField("start_date")
147
-    private String startDate;
149
+    private Date startDate;
148 150
 
149 151
     @ApiModelProperty(value = "办理结束时间")
152
+    @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm",timezone="GMT+8")
150 153
     @TableField("end_date")
151
-    private String endDate;
154
+    private Date endDate;
152 155
 
153 156
     @ApiModelProperty(value = "办理页面url")
154 157
     @TableField("to_page")
@@ -280,18 +283,18 @@ public class ProcessAudit implements Serializable {
280 283
     public void setWorkName(String workName) {
281 284
         this.workName = workName;
282 285
     }
283
-    public String getStartDate() {
286
+    public Date getStartDate() {
284 287
         return startDate;
285 288
     }
286 289
 
287
-    public void setStartDate(String startDate) {
290
+    public void setStartDate(Date startDate) {
288 291
         this.startDate = startDate;
289 292
     }
290
-    public String getEndDate() {
293
+    public Date getEndDate() {
291 294
         return endDate;
292 295
     }
293 296
 
294
-    public void setEndDate(String endDate) {
297
+    public void setEndDate(Date endDate) {
295 298
         this.endDate = endDate;
296 299
     }
297 300
     public String getToPage() {

+ 2 - 2
src/main/java/com/unissoft/ventilation/service/impl/ProcessAuditServiceImpl.java

@@ -1028,10 +1028,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1028 1028
                 processAudit.setWorkName(processToBeDone.getTitle());
1029 1029
             }
1030 1030
             if (null != processToBeDone.getStartDate()) {//办理开始时间
1031
-                processAudit.setStartDate(sf.format(processToBeDone.getStartDate()));
1031
+                processAudit.setStartDate(processToBeDone.getStartDate());
1032 1032
             }
1033 1033
             if (null != processToBeDone.getEndDate()) {//办理结束时间
1034
-                processAudit.setEndDate(sf.format(processToBeDone.getEndDate()));
1034
+                processAudit.setEndDate(processToBeDone.getEndDate());
1035 1035
             }
1036 1036
             if (null != processToBeDone.getToPage()) {//办理页面url
1037 1037
                 processAudit.setToPage(processToBeDone.getToPage());