2 Commits b57cbc4658 ... bc03d43fc6

Author SHA1 Message Date
  shengyang000 bc03d43fc6 Merge branch 'master' of http://101.36.160.140:21044/csc/csc-szls-business 3 years ago
  shengyang000 577cf7b767 修改生成时间 3 years ago

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

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

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

@@ -1008,7 +1008,8 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1008
             processAudit.setAuditState(0);//提交待审批
1008
             processAudit.setAuditState(0);//提交待审批
1009
             // 获得SimpleDateFormat类
1009
             // 获得SimpleDateFormat类
1010
             SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
1010
             SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
1011
-            processAudit.setApplyTime(sf.format(processToBeDone.getStartDate()));//申请时间
1011
+//            processAudit.setApplyTime(sf.format(processToBeDone.getStartDate()));//申请时间
1012
+            processAudit.setApplyTime(sf.format(new Date()));//申请时间
1012
 
1013
 
1013
             if (null != processToBeDone.getHouseId()) {//仓id
1014
             if (null != processToBeDone.getHouseId()) {//仓id
1014
                 processAudit.setHouseId(processToBeDone.getHouseId());
1015
                 processAudit.setHouseId(processToBeDone.getHouseId());
@@ -1027,10 +1028,10 @@ public class ProcessAuditServiceImpl extends ServiceImpl<ProcessAuditMapper, Pro
1027
                 processAudit.setWorkName(processToBeDone.getTitle());
1028
                 processAudit.setWorkName(processToBeDone.getTitle());
1028
             }
1029
             }
1029
             if (null != processToBeDone.getStartDate()) {//办理开始时间
1030
             if (null != processToBeDone.getStartDate()) {//办理开始时间
1030
-                processAudit.setStartDate(processToBeDone.getStartDate());
1031
+                processAudit.setStartDate(sf.format(processToBeDone.getStartDate()));
1031
             }
1032
             }
1032
             if (null != processToBeDone.getEndDate()) {//办理结束时间
1033
             if (null != processToBeDone.getEndDate()) {//办理结束时间
1033
-                processAudit.setEndDate(processToBeDone.getEndDate());
1034
+                processAudit.setEndDate(sf.format(processToBeDone.getEndDate()));
1034
             }
1035
             }
1035
             if (null != processToBeDone.getToPage()) {//办理页面url
1036
             if (null != processToBeDone.getToPage()) {//办理页面url
1036
                 processAudit.setToPage(processToBeDone.getToPage());
1037
                 processAudit.setToPage(processToBeDone.getToPage());