|
|
@@ -547,12 +547,16 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
|
|
|
Map<String, ZhcxInsideInspectionDo> map = new HashMap<>(16);
|
|
|
OperDto operDto = getOper("30");
|
|
|
InsideInspectionDispatchRequest req = new InsideInspectionDispatchRequest();
|
|
|
+ List<String> insideIdList = new ArrayList<>();
|
|
|
Map<String, String> descMap = new HashMap<>();
|
|
|
for (ZhcxInsideInspectionVo vo: list) {
|
|
|
vo.setSupervision(vo.getSupervision().replace("'", ""));
|
|
|
vo.setInspectioncode(vo.getInspectioncode().replace("'", ""));
|
|
|
vo.setInspectionstatus(vo.getInspectionstatus().replace("'", ""));
|
|
|
vo.setSupervisionphone(vo.getSupervisionphone().replace("'", ""));
|
|
|
+ if (ObjectUtil.isNull(vo.getInspectioncode()) || "NULL".equals(vo.getInspectioncode())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
InsideOperDto inOper = getInsideOperByCodeDto(vo.getInspectioncode());
|
|
|
inOper.setOperTime(operDto.getOperTime());
|
|
|
inOper.setOperUser(operDto.getOperUser());
|
|
|
@@ -560,7 +564,7 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
|
|
|
req.setDispatchFlag(2);
|
|
|
SysUserDo sysUserDo = userMap.get(vo.getSupervision());
|
|
|
if (!ObjectUtil.isNull(sysUserDo)) {
|
|
|
- if(req.getSupervisionId().equals(sysUserDo.getId())) {
|
|
|
+ if(inOper.getDispatch().getSupervisionid().equals(sysUserDo.getId())) {
|
|
|
continue;
|
|
|
}
|
|
|
ZhcxInsideInspectionDo inspectionDo = map.get(sysUserDo.getId() + "gp");
|
|
|
@@ -590,9 +594,14 @@ public class ZhcxInsideInspectionServiceImpl extends ServiceImpl<ZhcxInsideInspe
|
|
|
sb.append("改为");
|
|
|
sb.append(vo.getSupervision());
|
|
|
descMap.put(inOper.getInspection().getId(), sb.toString());
|
|
|
+ insideIdList.add(inOper.getInspection().getId());
|
|
|
}
|
|
|
}
|
|
|
- operLogService.saveOperLog(req, operDto, descMap);
|
|
|
+ if (insideIdList.size() > 0) {
|
|
|
+ req.setInsideIdList(insideIdList);
|
|
|
+ req.setLaunchSource("pc");
|
|
|
+ operLogService.saveOperLog(req, operDto, descMap);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/**
|
