Commit 51a3d91b authored by maoying's avatar maoying

修改自动化启动、停止预案兼容数字站预案报告

parent f263bbc1
...@@ -1007,7 +1007,7 @@ public class ContingencyAction implements CustomerAction { ...@@ -1007,7 +1007,7 @@ public class ContingencyAction implements CustomerAction {
planDetail.setSecStatus(ContingencyPlanStatusEnum.AVAILABLE.getCode()); planDetail.setSecStatus(ContingencyPlanStatusEnum.AVAILABLE.getCode());
} }
PlanDetail detail = planDetailDao.save(planDetail); planDetailDao.saveAndFlush(planDetail);
} }
} }
} }
......
...@@ -90,6 +90,9 @@ public class PlanReportServiceImpl extends ServiceImpl<PlanReportMapper, PlanRep ...@@ -90,6 +90,9 @@ public class PlanReportServiceImpl extends ServiceImpl<PlanReportMapper, PlanRep
public void createReport(String batchNo) { public void createReport(String batchNo) {
Assert.notNull(batchNo, "batchNo 不能为空!"); Assert.notNull(batchNo, "batchNo 不能为空!");
PlanReport report = planReportMapper.getByBatchNo(batchNo); PlanReport report = planReportMapper.getByBatchNo(batchNo);
if(ObjectUtils.isEmpty(report)){
return;
}
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
List<ContingencyPlanInstance> list = null; List<ContingencyPlanInstance> list = null;
try { try {
......
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