From cb8362c6be7f1489796ab88416013b723d6d1735 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 13 十月 2022 11:37:58 +0800
Subject: [PATCH] 返回字典字段
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 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 7938ed5..5d020e7 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
@@ -166,6 +166,7 @@
}
casePoolViolationVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
casePoolViolationVO.setType(dataDictionaryMapper.selectById(item.getTypeId()).getName());
+ casePoolViolationVO.setStreet(dataDictionaryMapper.selectById(item.getStreetId()).getName());
return casePoolViolationVO;
}).collect(Collectors.toList());
Page<CasePoolViolationVO> casePoolViolationVOPage = new Page<>();
@@ -186,6 +187,7 @@
CasePoolIllegalBuildingVO casePoolIllegalBuildingVO = new CasePoolIllegalBuildingVO();
BeanUtils.copyProperties(item, casePoolIllegalBuildingVO);
casePoolIllegalBuildingVO.setCategory(dataDictionaryMapper.selectById(item.getCategoryId()).getName());
+ casePoolIllegalBuildingVO.setCommunity(dataDictionaryMapper.selectById(item.getCommunityId()).getName());
return casePoolIllegalBuildingVO;
}
).collect(Collectors.toList());
@@ -217,13 +219,24 @@
public BaseCaseDetail baseCaseDetail(String code) {
BaseCaseDetail bcd = new BaseCaseDetail();
//1.鏌ヨ妗堜欢鍩烘湰淇℃伅
- QueryWrapper<BaseCase> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(BaseCase::getCode, code);
- BaseCase baseCase = baseCaseMapper.selectOne(wrapper);
+ Map map = new HashMap();
+ map.put("code", code);
+ BaseCase baseCase = baseCaseMapper.selectCondMap(map);
if (baseCase == null) {
return null;
}
+ //鏌ヨ妗堜欢杩濊淇℃伅
+ if (baseCase.getCategory() == 1) {
+ Map mapV = new HashMap();
+ mapV.put("id", baseCase.getId());
+ Violations violations = violationsMapper.selectCondMap(mapV);
+ baseCase.setViolations(violations);
+ } else {
+ IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
+ baseCase.setIllegalBuilding(illegalBuilding);
+ }
bcd.setBaseCase(baseCase);
+ //妗堜欢鐩稿叧淇℃伅
//2.鏌ヨ鍔炵悊缁忚繃淇℃伅
//2.1鏌ヨ澶勭疆娴佺▼閰嶇疆
HandlePassVo handlePassVo = new HandlePassVo();
@@ -242,7 +255,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 +264,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);
}
--
Gitblit v1.8.0