From 9299e747e05d1bc733ce146825d15a48b8c86182 Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期四, 20 十月 2022 17:23:06 +0800 Subject: [PATCH] 环节用时bug修改。 --- ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java | 4 ++-- ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java | 2 ++ ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java | 1 - ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java | 7 +++++++ ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java | 1 + ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 13 ++++++++++--- ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java | 4 ++-- 7 files changed, 24 insertions(+), 8 deletions(-) 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 f7d613f..f642980 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 @@ -72,4 +72,6 @@ @ApiModelProperty(value = "娲鹃仯鎰忚") private Long createUser; + + } diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java index a4112cf..1a8db59 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java +++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DispatchInfo.java @@ -77,10 +77,10 @@ @ApiModelProperty(value = "璺濈") private Integer distance; /** - * 澶勭疆闄愭椂 + * 璋冨害闄愭椂 */ @TableField("dispose_date") - @ApiModelProperty(value = "澶勭疆闄愭椂") + @ApiModelProperty(value = "璋冨害闄愭椂") private Date disposeDate; /** * 娲鹃仯鎰忚 diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java index 5066cda..d31e831 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java +++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/IllegalBuilding.java @@ -115,5 +115,12 @@ @ApiModelProperty(value = "杩濆缓鏉愭枡") private String materials; + /** + * 杩濆缓绫诲埆鏂囨湰 + */ + @TableField(value = "category_text",exist = false) + @ApiModelProperty(value = "杩濆缓绫诲埆鏂囨湰") + private String categoryText; + } diff --git a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java index 456f047..cab3fa0 100644 --- a/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java +++ b/ycl-platform/src/main/java/com/ycl/entity/message/SmsAudit.java @@ -57,13 +57,13 @@ */ @TableField("audit_result") @ApiModelProperty(value = "瀹℃牳缁撴灉") - private Integer auditResult; + private String auditResult; /** * 瀹℃牳鎰忚 */ @TableField("audit_opinion") @ApiModelProperty(value = "瀹℃牳鎰忚") - private Integer auditOpinion; + private String auditOpinion; /** * 鍒涘缓浜� */ 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 560c2c5..2b4c8d0 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 @@ -17,6 +17,7 @@ import com.ycl.dto.casePool.ViolationParam; import com.ycl.entity.caseHandler.*; import com.ycl.entity.common.ImageResources; +import com.ycl.entity.dict.DataDictionary; import com.ycl.entity.video.VideoAlarmReport; import com.ycl.exception.ApiException; import com.ycl.mapper.caseHandler.*; @@ -236,7 +237,7 @@ disposeRecord.setCreateUser(userDetails.getUserId()); disposeRecord.setStartTime(LocalDateTime.now()); disposeRecord.setStepName(stepName); - if(!StringUtils.isEmpty(limitTime)) { + if (!StringUtils.isEmpty(limitTime)) { disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); } disposeRecordMapper.insert(disposeRecord); @@ -270,6 +271,12 @@ baseCase.setViolations(violations); } else { IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId()); + LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>(); + dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId()); + DataDictionary dictionary = dataDictionaryMapper.selectOne(dict); + if (dictionary != null) { + illegalBuilding.setCategoryText(dictionary.getName()); + } baseCase.setIllegalBuilding(illegalBuilding); } //鑾峰彇璋冨害淇℃伅 @@ -298,10 +305,10 @@ continue; } for (DisposeRecord record : records) { - if (record != null && record.getEndTime() != null) { + if (record != null && record.getEndTime() != null && record.getStartTime() != null) { record.setLinkTime( DateUtil.getDistanceDateTime( - DateUtil.fromLocalDateTime(baseCase.getAlarmTime()), + DateUtil.fromLocalDateTime(record.getStartTime()), DateUtil.fromLocalDateTime(record.getEndTime()))); } } diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java index 1a4d0c4..cab7f5f 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java @@ -98,6 +98,7 @@ disposeRecord.setHandlerId(chechParam.getCurrentUser()); //鏍告煡宸茬粨鏉� disposeRecord.setState(1); + disposeRecord.setResult(chechParam.getResult()); disposeRecord.setEndTime(LocalDateTime.now()); disposeRecordMapper.update(disposeRecord, updateWrapper); 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 8cd86b9..cdc1dbd 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 @@ -22,7 +22,6 @@ import javax.annotation.Resource; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.Date; /** -- Gitblit v1.8.0