Browse Source

时间处理

wangming 1 year ago
parent
commit
b5f971b459

+ 2 - 2
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxInsideInspectionServiceImpl.java

@@ -704,8 +704,8 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
             //派单
             //派单
             ZhcxInsideInspectionDispatchDo dispatch = new ZhcxInsideInspectionDispatchDo();
             ZhcxInsideInspectionDispatchDo dispatch = new ZhcxInsideInspectionDispatchDo();
             dispatch.setId(inOper.getDispatch().getId());
             dispatch.setId(inOper.getDispatch().getId());
-            dispatch.setCheckstarttime(req.getStartDate());
-            dispatch.setCheckendtime(req.getEndDate());
+            dispatch.setCheckstarttime(DateUtil.parse(req.getStartDate(), "yyyy-MM-dd HH:mm:ss"));
+            dispatch.setCheckendtime(DateUtil.parse(req.getEndDate(), "yyyy-MM-dd HH:mm:ss"));
 
 
             //报验完成,只能修改时间
             //报验完成,只能修改时间
             if("30".equals(inOper.getInspection().getInspectionstatus())) {
             if("30".equals(inOper.getInspection().getInspectionstatus())) {

+ 6 - 6
business-entity/src/main/java/com/rongwei/bsentity/dto/inside/InsideInspectionExecuteRequest.java

@@ -44,18 +44,18 @@ public class InsideInspectionExecuteRequest extends InsideInspectionOperBaseDto
     /**
     /**
      * 开始时间
      * 开始时间
      * */
      * */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("检验开始时间")
     @ApiModelProperty("检验开始时间")
-    private Date startDate;
+    private String startDate;
 
 
     /**
     /**
      * 结束时间
      * 结束时间
      */
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("检验结束时间")
     @ApiModelProperty("检验结束时间")
-    private Date endDate;
+    private String endDate;
 
 
     /**
     /**
      * 附件
      * 附件

+ 0 - 7
business-server/src/main/resources/bootstrap.yml

@@ -13,13 +13,6 @@ spring:
       max-request-size: 1000MB
       max-request-size: 1000MB
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-  http:
-    encoding:
-      charset: UTF-8
-      enabled: true
 
 
 server:
 server:
   port: 9689
   port: 9689