From afbc1b29cd2ce92484f1be1e533ee075dbe08ff2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 10 十月 2022 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 0532b04..fc5aa94 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
@@ -196,7 +196,7 @@
}
@Override
- public Boolean saveViolationCase(ViolationParam violationParam, Integer id) {
+ public Boolean saveViolationCase(ViolationParam violationParam, Long id) {
Violations violations = new Violations();
BeanUtils.copyProperties(violationParam, violations);
violations.setId(id);
@@ -205,7 +205,7 @@
}
@Override
- public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Integer id) {
+ public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
IllegalBuilding illegalBuilding = new IllegalBuilding();
BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
illegalBuilding.setBaseCaseId(id);
@@ -242,7 +242,7 @@
//2.2鏌ヨ澶勭疆娴佺▼鐜妭閰嶇疆
Map mapWcs = new HashMap();
mapWcs.put("workflowConfigId", ddlcId);
- mapWcs.put("baseCaseId", ddlcId);
+ mapWcs.put("baseCaseId", baseCase.getId());
List<WorkflowConfigStep> listWcs = workflowConfigStepMapper.selectRecordByWorkflowConfigStepId(mapWcs);
//澶勭悊鐢ㄧ幆鑺傛椂闂�
for (WorkflowConfigStep step : listWcs) {
@@ -251,10 +251,12 @@
continue;
}
for (DisposeRecord record : records) {
- record.setLinkTime(
- DateUtil.getDistanceDateTime(
- DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
- DateUtil.fromLocalDateTime(record.getCreateTime())));
+ if (record != null&&record.getCreateTime()!=null) {
+ record.setLinkTime(
+ DateUtil.getDistanceDateTime(
+ DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
+ DateUtil.fromLocalDateTime(record.getCreateTime())));
+ }
}
step.setDisposeRecords(records);
}
@@ -318,7 +320,7 @@
}
@Override
- public void endCase(Integer caseId, String result) {
+ public void endCase(Long caseId, String result) {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
Integer state = 1;
String endCaseName = "缁撴";
@@ -331,7 +333,7 @@
disposeRecord.setWorkflowConfigStepId(workflowConfigStepMapper
.selectOne(new LambdaQueryWrapper<WorkflowConfigStep>().eq(WorkflowConfigStep::getName, endCaseName))
.getWorkflowConfigId());
- disposeRecord.setCreateUser(user.getUserId().intValue());
+ disposeRecord.setCreateUser(user.getUserId().longValue());
disposeRecord.setResult(result);
disposeRecord.setState(state);
disposeRecord.setCreateTime(LocalDateTime.now());
--
Gitblit v1.8.0