Commit f9a8e056 authored by helinlin's avatar helinlin

修改防火监督隐患导入失败问题

parent 80c7283c
...@@ -213,8 +213,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -213,8 +213,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
try { try {
dangerDto.setBizInfo(this.buildBizInfo(hiddenDangerDto)); dangerDto.setBizInfo(this.buildBizInfo(hiddenDangerDto));
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(),e); log.error(e.getMessage(), e);
throw new RuntimeException("组织数据失败"); throw new RuntimeException("组织数据失败!" + e.getMessage());
} }
return dangerDto; return dangerDto;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -273,6 +273,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -273,6 +273,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
Point point = new Point(); Point point = new Point();
if (!ObjectUtils.isEmpty(hiddenDangerDto.getPointId())) { if (!ObjectUtils.isEmpty(hiddenDangerDto.getPointId())) {
point = iPointDao.findById(hiddenDangerDto.getPointId()).orElseThrow(() -> new RuntimeException("单位不存在")); point = iPointDao.findById(hiddenDangerDto.getPointId()).orElseThrow(() -> new RuntimeException("单位不存在"));
} else {
throw new RuntimeException("单位不存在");
} }
//检查级别 //检查级别
DangerCheckTypeLevelEnum dangerCheckTypeLevelEnum = DangerCheckTypeLevelEnum.getEumByCode(plan.getCheckLevel()); DangerCheckTypeLevelEnum dangerCheckTypeLevelEnum = DangerCheckTypeLevelEnum.getEumByCode(plan.getCheckLevel());
...@@ -288,8 +290,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -288,8 +290,8 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
result.put("bizId", hiddenDangerDto.getCheckInputId()); result.put("bizId", hiddenDangerDto.getCheckInputId());
result.put("bizName", hiddenDangerDto.getInputItemName()); result.put("bizName", hiddenDangerDto.getInputItemName());
result.put("routeId", plan.getRouteId()); result.put("routeId", plan.getRouteId());
result.put("checkUnitId",plan.getCheckUnitId()); // 检查人所在单位id逗号隔开 result.put("checkUnitId", plan.getCheckUnitId()); // 检查人所在单位id逗号隔开
result.put("checkUnitName",plan.getCheckUnitName());// 检查人所在单位名称逗号隔开 result.put("checkUnitName", plan.getCheckUnitName());// 检查人所在单位名称逗号隔开
result.put("leadPeopleId", plan.getLeadPeopleIds()); // 牵头人id result.put("leadPeopleId", plan.getLeadPeopleIds()); // 牵头人id
result.put("leadPeopleName", plan.getLeadPeopleNames()); // 牵头人名称 result.put("leadPeopleName", plan.getLeadPeopleNames()); // 牵头人名称
result.put("makerUserId", plan.getMakerUserId()); // 计划制定人id result.put("makerUserId", plan.getMakerUserId()); // 计划制定人id
...@@ -314,7 +316,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -314,7 +316,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
result.put("checkUserId", checkInput.getUserId()); // 任务执行人id result.put("checkUserId", checkInput.getUserId()); // 任务执行人id
result.put("checkUserName", checkInput.getUserName()); // 任务执行人名称 result.put("checkUserName", checkInput.getUserName()); // 任务执行人名称
result.put("accompanyingUserId", checkInput.getAccompanyUserId()); // 检查陪同人id result.put("accompanyingUserId", checkInput.getAccompanyUserId()); // 检查陪同人id
result.put("accompanyingUserName",checkInput.getAccompanyUserName()); // 检查陪同人名称 result.put("accompanyingUserName", checkInput.getAccompanyUserName()); // 检查陪同人名称
result.put("planExecuteTime", checkInput.getCreateDate()); // 计划任务执行时间 result.put("planExecuteTime", checkInput.getCreateDate()); // 计划任务执行时间
result.put("checkPhotoUrl", shotList.stream().map(CheckShot::getPhotoData).collect(Collectors.joining(","))); result.put("checkPhotoUrl", shotList.stream().map(CheckShot::getPhotoData).collect(Collectors.joining(",")));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment