From 09d16543f899f54b8d96671a355a53a5740b1937 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 13 十月 2022 11:38:08 +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 | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 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 2bb3762..f4069a2 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());
@@ -199,17 +201,33 @@
public Boolean saveViolationCase(ViolationParam violationParam, Long id) {
Violations violations = new Violations();
BeanUtils.copyProperties(violationParam, violations);
- violations.setId(id);
Integer value = 1;
+ violations.setId(id);
+ setDisposeRecord(id);
return violationsMapper.insert(violations) == value ? true : false;
+ }
+
+ private void setDisposeRecord(Long id) {
+ String stepName = "璋冨害";
+ Integer state = 0;
+ DisposeRecord disposeRecord = new DisposeRecord();
+ disposeRecord.setBaseCaseId(id);
+ disposeRecord.setState(state);
+ disposeRecord.setCreateTime(LocalDateTime.now());
+ AdminUserDetails userDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ disposeRecord.setCreateUser(userDetails.getUserId());
+ disposeRecord.setStartTime(LocalDateTime.now());
+ disposeRecord.setStepName(stepName);
+ disposeRecordMapper.insert(disposeRecord);
}
@Override
public Boolean saveIllegalBuildingCase(IllegalBuildingParam illegalBuildingParam, Long id) {
IllegalBuilding illegalBuilding = new IllegalBuilding();
BeanUtils.copyProperties(illegalBuildingParam, illegalBuilding);
- illegalBuilding.setBaseCaseId(id);
+ setDisposeRecord(id);
Integer value = 1;
+ illegalBuilding.setBaseCaseId(id);
return illegalBuildingMapper.insert(illegalBuilding) == value ? true : false;
}
@@ -217,18 +235,20 @@
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) {
- Violations violations = violationsMapper.selectById(baseCase.getId());
+ Map mapV = new HashMap();
+ mapV.put("id", baseCase.getId());
+ Violations violations = violationsMapper.selectCondMap(mapV);
baseCase.setViolations(violations);
} else {
- IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
+ IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
baseCase.setIllegalBuilding(illegalBuilding);
}
bcd.setBaseCase(baseCase);
@@ -260,7 +280,7 @@
continue;
}
for (DisposeRecord record : records) {
- if (record != null&&record.getCreateTime()!=null) {
+ if (record != null && record.getCreateTime() != null) {
record.setLinkTime(
DateUtil.getDistanceDateTime(
DateUtil.fromLocalDateTime(baseCase.getAlarmTime()),
--
Gitblit v1.8.0