From cfeeefcf48d654d86191bcfe9b4dd1476ba9ec5f Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期日, 02 十月 2022 14:57:48 +0800
Subject: [PATCH] 修改审核接口
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 90 +++++++++++++++++++++++++++++++++------------
1 files changed, 66 insertions(+), 24 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 1758bfd..f884485 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
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.bo.AdminUserDetails;
import com.ycl.bo.casePool.CasePoolIllegalBuildingDO;
import com.ycl.bo.casePool.CasePoolViolationDO;
+import com.ycl.common.util.DateUtil;
import com.ycl.dto.casePool.IllegalBuildingParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.*;
@@ -24,12 +26,12 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.time.Instant;
+import java.time.Duration;
import java.time.LocalDateTime;
-import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -82,6 +84,8 @@
InvestigationMapper investigationMapper;
@Resource
WritMapper writMapper;
+ @Resource
+ DisposeRecordMapper disposeRecordMapper;
@Resource
WorkflowConfigStepMapper workflowConfigStepMapper;
@@ -89,8 +93,6 @@
WorkflowConfigMapper workflowConfigMapper;
@Resource
ImageResourcesMapper imageResourcesMapper;
-
-
@Override
@@ -140,27 +142,29 @@
@Override
public Page listViolationsPage(Page page, Integer state, Integer resource) {
Integer type = 01;
+ Integer hours = 60;
Page<CasePoolViolationDO> violationsPage = baseCaseMapper.listViolationsPage(page, state, type, resource);
- List<CasePoolViolationVO> violationVOList = violationsPage.getRecords().stream().map(item -> {
- CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
- BeanUtils.copyProperties(item, casePoolViolationVO);
- if (item.getCloseTime() == null) {
- long nowTime = System.currentTimeMillis();
- long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8));
- LocalDateTime continueTimes = Instant.ofEpochMilli(nowTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
- String continueTime = continueTimes.getHour() + "鏃�" + continueTimes.getSecond() + "鍒嗛挓";
- casePoolViolationVO.setContinueTime(continueTime);
- } else {
- long closeTime = item.getCloseTime().toEpochSecond(ZoneOffset.ofHours(8));
- long alarmTime = item.getAlarmTime().toEpochSecond(ZoneOffset.ofHours(8));
- LocalDateTime continueTimes = Instant.ofEpochMilli(closeTime - alarmTime).atZone(ZoneOffset.ofHours(8)).toLocalDateTime();
- String continueTime = continueTimes.getHour() + "鏃�" + continueTimes.getSecond() + "鍒嗛挓";
- casePoolViolationVO.setContinueTime(continueTime);
- }
- casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
- casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
- return casePoolViolationVO;
- }).collect(Collectors.toList());
+ List<CasePoolViolationVO> violationVOList = violationsPage
+ .getRecords()
+ .stream()
+ .map(item -> {
+ CasePoolViolationVO casePoolViolationVO = new CasePoolViolationVO();
+ BeanUtils.copyProperties(item, casePoolViolationVO);
+ if (item.getCloseTime() == null) {
+ Duration duration = Duration.between(item.getAlarmTime(), LocalDateTime.now());
+ long minutes = duration.toMinutes() - (duration.toHours() * hours);
+ String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ casePoolViolationVO.setContinueTime(continueTime);
+ } else {
+ Duration duration = Duration.between(item.getAlarmTime(), item.getCloseTime());
+ long minutes = duration.toMinutes() - (duration.toHours() * hours);
+ String continueTime = duration.toHours() + "鏃�" + minutes + "鍒嗛挓";
+ casePoolViolationVO.setContinueTime(continueTime);
+ }
+ casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
+ casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
+ return casePoolViolationVO;
+ }).collect(Collectors.toList());
Page<CasePoolViolationVO> casePoolViolationVOPage = new Page<>();
BeanUtils.copyProperties(violationsPage, casePoolViolationVOPage);
casePoolViolationVOPage.setRecords(violationVOList);
@@ -231,6 +235,22 @@
}
//2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(ddlcId);
+ //澶勭悊鐢ㄧ幆鑺傛椂闂�
+ for (WorkflowConfigStep step : listWcs) {
+ DisposeRecord record = step.getDisposeRecord();
+ System.out.println(baseCase.getAlarmTime());
+ System.out.println(record.getCreateTime());
+ System.out.println(DateUtil.fromLocalDateTime(baseCase.getAlarmTime()));
+ System.out.println(DateUtil.fromLocalDateTime(record.getCreateTime()));
+ System.out.println( DateUtil.getDistanceDateTime(
+ DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+ DateUtil.fromLocalDateTime(record.getCreateTime())));
+ record.setLinkTime(
+ DateUtil.getDistanceDateTime(
+ DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+ DateUtil.fromLocalDateTime(record.getCreateTime())));
+ step.setDisposeRecord(record);
+ }
//2.3璁剧疆璋冨害娴佺▼
handlePassVo.setWorkflowConfigSteps(listWcs);
bcd.setHandlePassVo(handlePassVo);
@@ -287,4 +307,26 @@
}
return caseImages;
}
+
+ @Override
+ public void endCase(Integer caseId, String result) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ Integer endCaseState = 6;
+ Integer state = 2;
+ String endCaseName = "缁撴";
+ BaseCase baseCase = new BaseCase();
+ baseCase.setState(endCaseState);
+ baseCase.setId(caseId);
+ baseCaseMapper.updateById(baseCase);
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(caseId);
+ disposeRecord.setWorkflowConfigStepId(workflowConfigStepMapper
+ .selectOne(new LambdaQueryWrapper<WorkflowConfigStep>().eq(WorkflowConfigStep::getName, endCaseName))
+ .getWorkflowConfigId());
+ disposeRecord.setCreateUser(user.getUserId().intValue());
+ disposeRecord.setResult(result);
+ disposeRecord.setState(state);
+ disposeRecord.setCreateTime(LocalDateTime.now());
+ disposeRecordMapper.insert(disposeRecord);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0