From e1eb0def5100475473b374ca88d7d15b46882008 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 19 十月 2022 14:22:23 +0800
Subject: [PATCH] 更新违规案件continue时间
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
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 de3f0b1..b23a37c 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
@@ -36,6 +36,7 @@
import javax.annotation.Resource;
import java.time.Duration;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -153,6 +154,7 @@
public Page listViolationsPage(Page page, Integer state, Integer resource) {
Integer type = 01;
Integer hours = 60;
+ Integer day = 24;
Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
List<CasePoolViolationVO> violationVOList = violationsPage
.getRecords()
@@ -162,13 +164,15 @@
BeanUtils.copyProperties(item, casePoolViolationVO);
if (item.getCloseTime() == null) {
Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
+ long continueHours = duration.toHours() - (duration.toDays() * day);
long minutes = duration.toMinutes() - (duration.toHours() * hours);
- String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ String continueTime = duration.toDays() + "澶�" + continueHours + "鏃�" + minutes + "鍒嗛挓";
casePoolViolationVO.setContinueTime(continueTime);
} else {
Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
+ long continueHours = duration.toHours() - (duration.toDays() * day);
long minutes = duration.toMinutes() - (duration.toHours() * hours);
- String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ String continueTime = duration.toDays() + "澶�" + continueHours + "鏃�" + minutes + "鍒嗛挓";
casePoolViolationVO.setContinueTime(continueTime);
}
casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
@@ -210,11 +214,11 @@
BeanUtils.copyProperties(violationParam, violations);
Integer value = 1;
violations.setId(id);
- setDisposeRecord(id);
+ setDisposeRecord(id, violationParam.getLimitTime());
return violationsMapper.insert(violations) == value ? true : false;
}
- private void setDisposeRecord(Long id) {
+ private void setDisposeRecord(Long id, String limitTime) {
String stepName = StepName.DISPATCH.getName();
QueryWrapper<WorkflowConfigStep> stepQuery = new QueryWrapper<>();
stepQuery.eq("name", stepName);
@@ -231,6 +235,7 @@
disposeRecord.setCreateUser(userDetails.getUserId());
disposeRecord.setStartTime(LocalDateTime.now());
disposeRecord.setStepName(stepName);
+ disposeRecord.setLimitTime(LocalDateTime.parse(limitTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
disposeRecordMapper.insert(disposeRecord);
}
@@ -238,7 +243,7 @@
public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
IllegalBuilding illegalBuilding = new IllegalBuilding();
BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
- setDisposeRecord(id);
+ setDisposeRecord(id, illegalBuildingParam.getLimitTime());
Integer value = 1;
illegalBuilding.setBaseCaseId(id);
return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
@@ -266,7 +271,7 @@
}
//鑾峰彇璋冨害淇℃伅
Map mapD = new HashMap();
- mapD.put("baseCaseId",baseCase.getId());
+ mapD.put("baseCaseId", baseCase.getId());
DispatchInfo dispatchInfo = dispatchInfoMapper.selectCondMap(mapD);
baseCase.setDispatchInfo(dispatchInfo);
bcd.setBaseCase(baseCase);
@@ -367,7 +372,7 @@
}
@Override
- public void endCase(Long caseId, String result,String opinion) {
+ public void endCase(Long caseId, String result, String opinion) {
//鑾峰彇褰撳墠鐧婚檰鐢ㄦ埛淇℃伅
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
String endCaseName = StepName.CLOSING_REGISTER.getName();
@@ -384,7 +389,7 @@
throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
}
UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id",workflowConfigStep.getId());
+ updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id", workflowConfigStep.getId());
//淇敼缁撴璁板綍
DisposeRecord disposeRecord = new DisposeRecord();
--
Gitblit v1.8.0