|
|
@@ -974,7 +974,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(vo.getOrgList())) {
|
|
|
List<IdNameVo> idNameVos = remoteOrgService.selectOrgByIdList(vo.getOrgList(), SecurityConstants.INNER)
|
|
|
- .stream().map(o -> new IdNameVo(o.getId(), o.getName(), null))
|
|
|
+ .stream().map(o -> new IdNameVo(o.getId(), o.getShortName(), null))
|
|
|
.collect(Collectors.toList());
|
|
|
detailVo.setOrgs(idNameVos);
|
|
|
}
|
|
|
@@ -1473,14 +1473,14 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
|
|
|
if (!(submitName.toString().contains(vo.getSubmitName()))) {
|
|
|
submitName.append(vo.getSubmitName());
|
|
|
}
|
|
|
+ ResumptionPdf tem = new ResumptionPdf();
|
|
|
+ tem.setPointName(pointName);
|
|
|
+ tem.setSubmitName(String.valueOf(submitName));
|
|
|
+ //null:未执行 0:正常 1:异常
|
|
|
+ tem.setResValue(result);
|
|
|
+ befs.add(tem);
|
|
|
}
|
|
|
- ResumptionPdf tem = new ResumptionPdf();
|
|
|
- tem.setPointName(pointName);
|
|
|
- tem.setSubmitName(String.valueOf(submitName));
|
|
|
- //null:未执行 0:正常 1:异常
|
|
|
- tem.setResValue(result);
|
|
|
-// tem.setResValue(result > 0 ? 1 : 0);
|
|
|
- befs.add(tem);
|
|
|
+
|
|
|
}
|
|
|
return befs;
|
|
|
}
|