From 2f07282e652596340686927e1e10bf819f9fd9d5 Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期五, 28 十月 2022 18:07:53 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java | 10 +++++----- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java | 6 ++++++ ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java index 5ee1079..dd9e24b 100644 --- a/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java +++ b/ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java @@ -31,7 +31,7 @@ */ @ApiModelProperty(value = "鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime investigationTime; + private String investigationTime; /** * 鍦板潃 @@ -70,7 +70,7 @@ */ @ApiModelProperty(value = "鍒拌揪鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime arrivalTime; + private String arrivalTime; /** * 鍒拌揪鍦板潃 @@ -120,14 +120,14 @@ */ @ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime sendTime; + private String sendTime; /** * 鏂囦功闄愬畾鏃堕棿 */ @ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime limitTime; + private String limitTime; /** * 鏂囦功鍙戞斁鍐呭 @@ -140,7 +140,7 @@ */ @ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private LocalDateTime rectifyTime; + private String rectifyTime; /** * 鏁存敼鎯呭喌 diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java index 115b436..7b63f82 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java +++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/Investigation.java @@ -59,7 +59,7 @@ */ @TableField("investigation_time") @ApiModelProperty(value = "鏃堕棿") - private Date investigationTime; + private LocalDateTime investigationTime; /** * 鍦板潃 diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java index 56722c8..44490bd 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/DisposeRecordServiceImpl.java @@ -24,6 +24,7 @@ import javax.annotation.Resource; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; /** @@ -84,6 +85,7 @@ investigation.setCreateTime(LocalDateTime.now()); investigation.setCreateUser(user.getUserId()); investigation.setPartyId(partyInfo.getId()); + investigation.setInvestigationTime(LocalDateTime.parse(uploadDisposingResultParam.getInvestigationTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"))); iInvestigationService.save(investigation); //鍒拌揪 ArrivalSituation arrivalSituation = new ArrivalSituation(); @@ -91,6 +93,7 @@ arrivalSituation.setBaseCaseId(caseId); arrivalSituation.setCreateTime(LocalDateTime.now()); arrivalSituation.setCreateUser(user.getUserId()); + arrivalSituation.setArrivalTime(LocalDateTime.parse(uploadDisposingResultParam.getArrivalTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"))); iArrivalSituationService.save(arrivalSituation); //鏂囦功 Integer illegalBuildingType = 2; @@ -112,6 +115,9 @@ writ.setIllegalBuildingId(caseId); writ.setCreateTime(LocalDateTime.now()); writ.setCreateUser(user.getUserId()); + writ.setLimitTime(LocalDateTime.parse(uploadDisposingResultParam.getLimitTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"))); + writ.setRectifyTime(LocalDateTime.parse(uploadDisposingResultParam.getRectifyTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"))); + writ.setSendTime(LocalDateTime.parse(uploadDisposingResultParam.getSendTime(), DateTimeFormatter.ofPattern("YYYY-MM-dd HH:mm:ss"))); iWritService.save(writ); imageResources.setUrl(StringUtils .joinWith(",", uploadDisposingResultParam.getPic() -- Gitblit v1.8.0