报告归档修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportReviewService.java

@@ -12,6 +12,7 @@ import com.jeeplus.flowable.service.FlowTaskService;
 import com.jeeplus.test.cw.projectReportArchive.domain.CwProjectReportArchive;
 import com.jeeplus.test.cw.projectReportArchive.mapper.CwProjectReportArchiveMapper;
 import com.jeeplus.test.mould.service.SerialnumTplService;
+import com.jeeplus.test.cw.projectReportArchive.service.dto.CwProjectReportArchiveDTO;
 import org.flowable.bpmn.model.FlowNode;
 import org.flowable.engine.TaskService;
 import org.apache.commons.beanutils.PropertyUtils;
@@ -162,10 +163,11 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
             CwProjectReport cwProjectReport = cwProjectReportService.getById(reportData.getId());
             CwProjectReportArchive cwProjectReportArchive = new CwProjectReportArchive();
             cwProjectReportArchive.setStatus("0");
-            cwProjectReportArchive.setReportId(review.getReportId());
+            cwProjectReportArchive.setReportId(reportData.getId());
             cwProjectReportArchive.setCreateBy(cwProjectReport.getCreateBy());
             cwProjectReportArchive.setProjectId(cwProjectReport.getProjectId());
-            cwProjectReportArchive.setReportNum(cwProjectReport.getReportNumber());
+            String fileNumber = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), CwProjectReportArchiveDTO.BIZ_CODE);
+            cwProjectReportArchive.setFileNumber(fileNumber);
             cwProjectReportArchiveMapper.insert(cwProjectReportArchive);
         }
         mapper.updateById(review);