Commit 8050892c authored by tianbo's avatar tianbo

Merge branch 'developer-latentDanger' of http://172.16.10.76/moa/amos-boot-biz…

Merge branch 'developer-latentDanger' of http://172.16.10.76/moa/amos-boot-biz into developer-latentDanger
parents 2c8dc34c 64f2f018
...@@ -1643,7 +1643,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService { ...@@ -1643,7 +1643,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
InputCheckDto inputCheckDto = getInputCheckDto(check, itemId, routePointItemId, checkInputId); InputCheckDto inputCheckDto = getInputCheckDto(check, itemId, routePointItemId, checkInputId);
InputItem inputItem = getInputItem(itemId); InputItem inputItem = getInputItem(itemId);
String photoUrls = getPhotoUrls(inputCheckDto); String photoUrls = getPhotoUrls(inputCheckDto);
if (check.getPlanId() > 0) { if (check.getPlanId() > 0) {
checkType = LatentDangerTypeEnum.计划检查.getCode(); checkType = LatentDangerTypeEnum.计划检查.getCode();
} else if (CheckModeEnum.WEB_OUT.getCode().equals(check.getCheckMode())) { } else if (CheckModeEnum.WEB_OUT.getCode().equals(check.getCheckMode())) {
...@@ -1682,7 +1682,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService { ...@@ -1682,7 +1682,7 @@ public class LatentDangerServiceImpl implements ILatentDangerService {
} }
private InputItem getInputItem(Long itemId) { private InputItem getInputItem(Long itemId) {
return ValidationUtil.isEmpty(itemId) ? iInputItemDao.getOne(itemId) : null; return !ValidationUtil.isEmpty(itemId) ? iInputItemDao.getOne(itemId) : null;
} }
private String getPhotoUrls(InputCheckDto inputCheckDto) { private String getPhotoUrls(InputCheckDto inputCheckDto) {
......
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