Commit 36ede852 authored by xinglei's avatar xinglei

*)修改方法

parent 7c37c4c4
...@@ -1636,17 +1636,26 @@ public class LatentDangerServiceImpl implements ILatentDangerService { ...@@ -1636,17 +1636,26 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
Long checkId = param.getLong("checkId"); Long checkId = param.getLong("checkId");
Long itemId = param.getLong("itemId"); Long itemId = param.getLong("itemId");
Long routePointItemId = param.getLong("routePointItemId"); Long routePointItemId = param.getLong("routePointItemId");
Integer checkType = null;
Check check = getCheck(checkId); Check check = getCheck(checkId);
InputCheckDto inputCheckDto = getInputCheckDto(checkId, itemId, routePointItemId); InputCheckDto inputCheckDto = getInputCheckDto(checkId, itemId, routePointItemId);
InputItem inputItem = getInputItem(itemId); InputItem inputItem = getInputItem(itemId);
String photoUrls = getPhotoUrls(inputCheckDto); String photoUrls = getPhotoUrls(inputCheckDto);
if (check.getPlanId() > 0) {
checkType = LatentDangerTypeEnum.计划检查.getCode();
} else if (CheckModeEnum.WEB_OUT.getCode().equals(check.getCheckMode())) {
checkType = LatentDangerTypeEnum.无码检查.getCode();
} else {
checkType = LatentDangerTypeEnum.无计划检查.getCode();
}
result.put("inputCheck", inputCheckDto); result.put("inputCheck", inputCheckDto);
result.put("inputItemName", !ValidationUtil.isEmpty(inputItem) ? inputItem.getName() : null); result.put("inputItemName", !ValidationUtil.isEmpty(inputItem) ? inputItem.getName() : null);
result.put("photos", photoUrls); result.put("photos", photoUrls);
result.put("checkMode", !ValidationUtil.isEmpty(check) ? check.getCheckMode() : null); result.put("checkMode", !ValidationUtil.isEmpty(check) ? check.getCheckMode() : null);
result.put("checkType", null); result.put("checkType", !ValidationUtil.isEmpty(check) ? checkType : null);
return result; return result;
} }
......
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