diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java index beae3b6c5..572079412 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -280,17 +280,28 @@ public class IssuesServiceImpl implements IssuesService { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(RMpElectricQualityProblemFlowDetails::getPowerQualityProblemNo,processParam.getPowerQualityProblemNo()); RMpElectricQualityProblemFlowDetails details = flowDetailsMapper.selectOne(query); - BeanUtil.copyProperties(processParam,details); LocalDateTime local = LocalDateTimeUtil.now(); if (DicDataEnum.PLAN_MEASURES.getCode().equals(code)){ details.setDataDateJhzg(local); + details.setReportProcessContentJhzg(processParam.getReportProcessContentJhzg()); + details.setUserReportProcessContentJhzg(processParam.getUserReportProcessContentJhzg()); + details.setFileNameJhzg(processParam.getFileNameJhzg()); + details.setFilePathJhzg(processParam.getFilePathJhzg()); }else if (DicDataEnum.ACTUAL_MEASURES.getCode().equals(code)){ details.setDataDateSjcq(local); + details.setReportProcessContentSjcq(processParam.getReportProcessContentSjcq()); + details.setUserReportProcessContentSjcq(processParam.getUserReportProcessContentSjcq()); + details.setFileNameSjcq(processParam.getFileNameSjcq()); + details.setFilePathSjcq(processParam.getFilePathSjcq()); }else if (DicDataEnum.INSIGHTS.getCode().equals(code)){ details.setDataDateZlxg(local); + details.setDescriptionZlxg(processParam.getDescriptionZlxg()); + details.setFileNameZlxg(processParam.getFileNameZlxg()); + details.setFilePathZlxg(processParam.getFilePathZlxg()); } flowDetailsMapper.update(details, query); issuesOut.setReportProcess(code); + issuesOut.setReportProcessStatus(DicDataEnum.AUDITT.getCode()); issuesMapper.update(issuesOut,issuesQuery); }else { throw new BusinessException(ProcessResponseEnum.PROCESS_ERROR); @@ -326,6 +337,9 @@ public class IssuesServiceImpl implements IssuesService { } } + /** + * 下载文件 + */ @Override public String downloadFile(String powerQualityProblemNo,String reportProcess) { LambdaQueryWrapper issuesQuery = new LambdaQueryWrapper<>();