From 494344ed0614fec4799c28ea795fbc37b258a410 Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 20 十月 2022 14:53:22 +0800 Subject: [PATCH] bug修改 --- ycl-platform/src/main/java/com/ycl/dto/dispatch/UploadDisposingResultParam.java | 7 +++++++ ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java | 6 +++++- ycl-common/src/main/java/com/ycl/config/ExceptionConfiguration.java | 10 ++++++---- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java | 3 ++- ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml | 2 ++ ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 5 ++++- document/遂昌智慧执法平台问题和功能清单.xlsx | 0 7 files changed, 26 insertions(+), 7 deletions(-) diff --git "a/document/\351\201\202\346\230\214\346\231\272\346\205\247\346\211\247\346\263\225\345\271\263\345\217\260\351\227\256\351\242\230\345\222\214\345\212\237\350\203\275\346\270\205\345\215\225.xlsx" "b/document/\351\201\202\346\230\214\346\231\272\346\205\247\346\211\247\346\263\225\345\271\263\345\217\260\351\227\256\351\242\230\345\222\214\345\212\237\350\203\275\346\270\205\345\215\225.xlsx" new file mode 100644 index 0000000..2c046c4 --- /dev/null +++ "b/document/\351\201\202\346\230\214\346\231\272\346\205\247\346\211\247\346\263\225\345\271\263\345\217\260\351\227\256\351\242\230\345\222\214\345\212\237\350\203\275\346\270\205\345\215\225.xlsx" Binary files differ diff --git a/ycl-common/src/main/java/com/ycl/config/ExceptionConfiguration.java b/ycl-common/src/main/java/com/ycl/config/ExceptionConfiguration.java index dbd835d..4b040cb 100644 --- a/ycl-common/src/main/java/com/ycl/config/ExceptionConfiguration.java +++ b/ycl-common/src/main/java/com/ycl/config/ExceptionConfiguration.java @@ -19,10 +19,12 @@ // 鎹曡幏鑷畾涔夊紓甯告暟鎹� @ExceptionHandler(value = ApiException.class) public CommonResult HandlePubException(ApiException pubExceptions) { - System.out.println(String.format("閿欒锛�%d锛� %s", - pubExceptions.getErrorCode().getCode(), - pubExceptions.getErrorCode().getMessage())); - return CommonResult.failed(pubExceptions.getErrorCode()); + if (pubExceptions.getErrorCode() != null) { + System.out.println(String.format("閿欒锛�%d锛� %s", + pubExceptions.getErrorCode().getCode(), + pubExceptions.getErrorCode().getMessage())); + } + return CommonResult.failed(pubExceptions.getMessage()); } @ExceptionHandler(value = MethodArgumentNotValidException.class) diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java index fa0b0fe..f7d613f 100644 --- a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java +++ b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java @@ -1,8 +1,11 @@ package com.ycl.dto.caseHandler; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.time.LocalDateTime; /** * DispatchParam @@ -55,7 +58,8 @@ * 澶勭疆鏃ユ湡 */ @ApiModelProperty(value = "澶勭疆鏃ユ湡") - private String disposeDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime disposeDate; /** * 娲鹃仯鎰忚 */ 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 3226c81..5ee1079 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 @@ -1,5 +1,7 @@ package com.ycl.dto.dispatch; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,6 +30,7 @@ * 鏃堕棿 */ @ApiModelProperty(value = "鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime investigationTime; /** @@ -66,6 +69,7 @@ * 鍒拌揪鏃堕棿 */ @ApiModelProperty(value = "鍒拌揪鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime arrivalTime; /** @@ -115,12 +119,14 @@ * 鏂囦功鍙戞斁鏃堕棿 */ @ApiModelProperty(value = "鏂囦功鍙戞斁鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime sendTime; /** * 鏂囦功闄愬畾鏃堕棿 */ @ApiModelProperty(value = "鏂囦功闄愬畾鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime limitTime; /** @@ -133,6 +139,7 @@ * 瀹為檯鏁存敼鏃堕棿 */ @ApiModelProperty(value = "瀹為檯鏁存敼鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime rectifyTime; /** diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java index b23a37c..560c2c5 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java @@ -1,5 +1,6 @@ package com.ycl.service.caseHandler.impl; +import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -235,7 +236,9 @@ disposeRecord.setCreateUser(userDetails.getUserId()); disposeRecord.setStartTime(LocalDateTime.now()); disposeRecord.setStepName(stepName); - disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + if(!StringUtils.isEmpty(limitTime)) { + disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + } disposeRecordMapper.insert(disposeRecord); } diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java index d3ef954..8cd86b9 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java @@ -71,6 +71,7 @@ //淇敼璋冨害璁板綍 DisposeRecord disposeRecord = new DisposeRecord(); disposeRecord.setHandlerId(dispatchInfo.getCreateUser()); + disposeRecord.setResult(dispatchInfo.getDispatchOpinion()); //璋冨害宸茬粨鏉� disposeRecord.setState(1); disposeRecord.setEndTime(LocalDateTime.now()); @@ -87,7 +88,7 @@ stepNextRecord.setWorkflowConfigStepId(stepNext.getId()); stepNextRecord.setStepName(stepNext.getName()); stepNextRecord.setHandlerRoleId(stepNext.getRoleId()); - stepNextRecord.setLimitTime(LocalDateTime.parse(dispatchInfoParam.getDisposeDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss"))); + stepNextRecord.setLimitTime(dispatchInfoParam.getDisposeDate()); //涓婁紶澶勭疆鏈粨鏉� stepNextRecord.setState(0); stepNextRecord.setStartTime(LocalDateTime.now()); diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml index d90b378..665b558 100644 --- a/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml +++ b/ycl-platform/src/main/resources/mapper/caseHandler/WorkflowConfigStepMapper.xml @@ -29,6 +29,8 @@ <result column="create_user" property="createUser" /> <result column="create_time" property="createTime" /> <result column="handler_text" property="handlerText" /> + <result column="result" property="result" /> + <result column="limit_time" property="limitTime" /> </collection> </resultMap> -- Gitblit v1.8.0