解决报告作废完成后，在报告作废的详情中查询不到报告的相关信息问题

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/CwProjectInfoMapper.java

@@ -25,6 +25,8 @@ public interface CwProjectInfoMapper extends BaseMapper<CwProjectInfoData> {
 
     CwProjectInfoData selectByReportId(String id);
 
+    CwProjectInfoData selectContainDelByReportId(String id);
+
     /**
      * 去报废的报告文号表中查报告文号
      * @return
@@ -70,6 +72,8 @@ public interface CwProjectInfoMapper extends BaseMapper<CwProjectInfoData> {
      */
     CwProjectInfoData getByReportId(String id);
 
+    CwProjectInfoData getContainDelByReportId(String id);
+
     /**
      * 根据报告id修改报告文号与报告流水号
      * @param

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/CwProjectReportMapper.java

@@ -90,6 +90,8 @@ public interface CwProjectReportMapper extends BaseMapper<CwProjectReport> {
      */
     List<CwProjectReportData> getByProjectId(String projectId);
 
+    List<CwProjectReportData> getContainDelByProjectId(String projectId);
+
     /**
      * 根据报告签章id查询流程id
      * @param id

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectInfoMapper.xml

@@ -24,6 +24,12 @@
         on a.served_unit_id = cw.id
         where report_id = #{id} and a.del_flag = '0'
     </select>
+    <select id="selectContainDelByReportId" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectInfoData">
+        select a.*,cw.name as servedUnitName from cw_project_report_new_line a
+        left join cw_work_client_base cw
+        on a.served_unit_id = cw.id
+        where report_id = #{id}
+    </select>
     <select id="getReportNo" resultType="java.lang.String">
         select report_no from cw_project_report_cancel where del_flag = '0' order by create_date asc
     </select>
@@ -51,6 +57,12 @@
         on a.served_unit_id = cw.id
         where report_id = #{reportId} and a.del_flag = '0'
     </select>
+    <select id="getContainDelByReportId" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectInfoData">
+        select a.*,cw.name as servedUnitName from cw_project_report_new_line a
+        left join cw_work_client_base cw
+        on a.served_unit_id = cw.id
+        where report_id = #{reportId}
+    </select>
     <update id="saveById">
         update cw_project_report_new_line set del_flag = '0' where id = #{id}
     </update>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -184,6 +184,77 @@
         left join cw_project_report_review cw_re on a.id = cw_re.report_id and cw_re.del_flag = '0'
         where a.id = #{id}
     </select>
+    <select id="queryContainDelById" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectReportData">
+        SELECT
+        a.id,
+        a.create_by as createById,
+        a.create_date,
+        a.update_by,
+        a.update_date,
+        a.del_flag,
+        a.remarks,
+        a.status,
+        a.document_no,
+        a.project_report_number,
+        a.project_id,
+        a.office_id,
+        a.signature_type,
+        a.signature_annotator1,
+        a.signature_annotator2,
+        a.signature_contract_id,
+        a.proc_ins_id,
+        a.process_definition_id,
+        b.project_number as projectNumber,
+        b.project_name as projectName,
+        c.name as departmentName,
+        d.name as userName,
+        a.create_date,
+        a.audit_fees,
+        e.name as projectMasterName,
+        a.real_create,
+        a.business_type,
+        a.audit_business_type,
+        a.register_address,
+        a.business_location,
+        a.security_business,
+        cw_prs1.proc_ins_id as proc_ins_id1,
+        cw_prs1.process_definition_id as process_definition_id1,
+        cw_prs1.status as status1,
+        cw_prs1.id as sid1,
+        cw_prs2.proc_ins_id as proc_ins_id2,
+        cw_prs2.process_definition_id as process_definition_id2,
+        cw_prs2.status as status2,
+        cw_prs2.id as sid2,
+        cw_prs3.proc_ins_id as proc_ins_ids3,
+        cw_prs3.process_definition_id as process_definition_id3,
+        cw_prs3.status as status3,
+        cw_prs3.id as sid3,
+        new_line.served_unit_id as servedUnitId,
+        new_line.report_date as reportDate,
+        new_line.report_type as reportType,
+        new_line.report_number as reportNumber,
+        new_line.report_no as reportNo,
+        new_line.opinion_type as opinionType,
+        new_line.seal_type as sealType,
+        cw_re.proc_ins_id as procInsId3,
+        suser.name as real_header_name,
+        b.project_master_id as project_master_id1,
+        b.real_header as project_master_id2,
+        a.industry,
+        a.business_objects
+        FROM cw_project_report a
+        left join cw_project_records b on a.project_id = b.id
+        LEFT JOIN sys_office c on a.office_id = c.id
+        LEFT JOIN sys_user d on a.create_by = d.id
+        LEFT JOIN sys_user e on b.project_master_id = e.id
+        LEFT JOIN sys_user suser on b.real_header = suser.id
+        LEFT JOIN cw_project_report_signature cw_prs1 on cw_prs1.report_id = a.id and cw_prs1.type = '1' and cw_prs1.del_flag = '0'
+        LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
+        LEFT JOIN cw_project_report_signature cw_prs3 on cw_prs3.report_id = a.id and cw_prs3.type = '3' and cw_prs3.del_flag = '0'
+        left join cw_project_report_new_line new_line on a.id = new_line.report_id
+        left join cw_project_report_review cw_re on a.id = cw_re.report_id and cw_re.del_flag = '0'
+        where a.id = #{id}
+    </select>
     <select id="findClineList" resultType="com.jeeplus.test.cw.workClientInfo.service.dto.CwWorkClientBaseDTO">
         select
         <include refid="Base_Column_List"></include>,
@@ -312,6 +383,50 @@
         LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
         where a.project_id = #{projectId} and a.del_flag = '0'
     </select>
+    <select id="getContainDelByProjectId" resultType="com.jeeplus.test.cw.projectReport.domain.CwProjectReportData">
+        SELECT
+        a.id,
+        a.create_by as createById,
+        a.create_date,
+        a.update_by,
+        a.update_date,
+        a.del_flag,
+        a.remarks,
+        a.status,
+        a.document_no,
+        a.project_report_number,
+        a.project_id,
+        a.office_id,
+        a.signature_type,
+        a.signature_annotator1,
+        a.signature_annotator2,
+        a.signature_contract_id,
+        a.proc_ins_id,
+        a.process_definition_id,
+        b.project_number as projectNumber,
+        b.project_name as projectName,
+        c.name as departmentName,
+        d.name as userName,
+        a.create_date,
+        a.audit_fees,
+        e.name as projectMasterName,
+        cw_prs1.proc_ins_id as proc_ins_id1,
+        cw_prs1.process_definition_id as process_definition_id1,
+        cw_prs1.status as status1,
+        cw_prs1.id as sid1,
+        cw_prs2.proc_ins_id as proc_ins_id2,
+        cw_prs2.process_definition_id as process_definition_id2,
+        cw_prs2.status as status2,
+        cw_prs2.id as sid2
+        FROM cw_project_report a
+        left join cw_project_records b on a.project_id = b.id
+        LEFT JOIN sys_office c on a.office_id = c.id
+        LEFT JOIN sys_user d on a.create_by = d.id
+        LEFT JOIN sys_user e on b.project_master_id = e.id
+        LEFT JOIN cw_project_report_signature cw_prs1 on cw_prs1.report_id = a.id and cw_prs1.type = '1' and cw_prs1.del_flag = '0'
+        LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'
+        where a.project_id = #{projectId}
+    </select>
     <select id="findFileList" resultType="com.jeeplus.test.oss.domain.WorkAttachment">
         SELECT * FROM work_attachment a
         left join cw_project_report_file b on a.id = b.report_file_id

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

@@ -2721,4 +2721,347 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     public void updateAnnotatorById(CwProjectReport cwProjectReport) {
         reportMapper.updateAnnotatorById(cwProjectReport);
     }
+
+    public CwProjectReportData queryContainDelById(String id) {
+
+        CwProjectReportData reportData = reportMapper.queryById(id);
+
+        //将新增行数据查询出来放入到cwProjectInfoList中
+        CwProjectInfoData cwProjectInfoData = infoMapper.selectByReportId(id);
+        if (null != cwProjectInfoData){
+            reportData.setServedUnitName(cwProjectInfoData.getServedUnitName());
+            reportData.setServedUnitId(cwProjectInfoData.getServedUnitId());
+            reportData.setReportDate(cwProjectInfoData.getReportDate());
+            reportData.setReportType(cwProjectInfoData.getReportType());
+            reportData.setReportNumber(cwProjectInfoData.getReportNumber());
+            reportData.setReportNo(cwProjectInfoData.getReportNo());
+            reportData.setSealType(cwProjectInfoData.getSealType());
+        }
+
+//        List<CwProjectInfoData> infoData = new ArrayList<>();
+
+        List<ProjectReportWorkAttachmentDTO> dtoList = new ArrayList<>();
+        List<ProjectReportWorkAttachmentDTO> signatureList = new ArrayList<>();
+        if ( null != reportData){
+            List<ProjectReportWorkAttachmentDTO> dtos = attachmentMapper.selectByInfoId(reportData.getId());
+            if (null != dtos){
+
+                Iterator<ProjectReportWorkAttachmentDTO> it = dtos.iterator();
+                while(it.hasNext()){
+                    ProjectReportWorkAttachmentDTO d = it.next();
+                    //根据id查出cw_project_report_file文件表的其他信息
+                    //未签章附件
+                    CwProjectReportFile file = attachmentMapper.selectInfoByFileId(d.getId(),"0");
+                    if (null != file) {
+                        d.setFileType(file.getFileType());
+                        d.setSealType(file.getSealType());
+                        d.setSealedFile(file.getSealedFile());
+                        d.setSealUser(file.getSealUser());
+                        d.setSealDate(file.getSealDate());
+                        d.setRemarks(file.getRemarks());
+                        UserDTO userDTO = new UserDTO();
+                        //根据创建人id查出创建人名称
+                        String name = reportMapper.getUserNameById(file.getCreateBy());
+                        userDTO.setId(file.getCreateBy());
+                        userDTO.setName(name);
+                        d.setCreateBy(userDTO);
+                        d.setCreateDate(file.getCreateDate());
+                        dtoList.add(d);
+                        it.remove();
+                    }
+
+                    //已签章附件
+                    CwProjectReportFile signatureFile = attachmentMapper.selectInfoByFileId(d.getId(),"1");
+                    if (null != signatureFile){
+                        d.setFileType(signatureFile.getFileType());
+                        d.setSealType(signatureFile.getSealType());
+                        d.setSealedFile(signatureFile.getSealedFile());
+                        d.setSealUser(signatureFile.getSealUser());
+                        d.setSealDate(signatureFile.getSealDate());
+                        d.setRemarks(signatureFile.getRemarks());
+                        UserDTO userDTO2 = new UserDTO();
+                        //根据创建人id查出创建人名称
+                        String name2 = reportMapper.getUserNameById(signatureFile.getCreateBy());
+                        userDTO2.setId(signatureFile.getCreateBy());
+                        userDTO2.setName(name2);
+                        d.setCreateBy(userDTO2);
+                        d.setCreateDate(signatureFile.getCreateDate());
+                        signatureList.add(d);
+                        it.remove();
+                    }
+                }
+                reportData.setCwFileInfoList(dtoList);
+                reportData.setSignatureFileList(signatureList);
+            }
+
+            //将附件信息查出
+            // 查询附件信息
+            List<WorkAttachmentDto> fileInfo2 = reportMapper.findDtos(id);
+            List<WorkAttachmentDto> reportFileList = Lists.newArrayList();
+            if(CollectionUtils.isNotEmpty(dtos) && CollectionUtils.isNotEmpty(fileInfo2)){
+                for (ProjectReportWorkAttachmentDTO dto : dtos) {
+                    for (WorkAttachmentDto workAttachmentDto : fileInfo2) {
+                        if(dto.getId().equals(workAttachmentDto.getId())){
+                            reportFileList.add(workAttachmentDto);
+                        }
+                    }
+                }
+            }
+
+            if (CollectionUtils.isNotEmpty(dtos)) {
+                for (WorkAttachmentDto i : reportFileList) {
+                    i.setCreateBy(UserUtils.get(i.getBy()));
+                }
+            }
+            reportData.setCwFileInfoList2(reportFileList);
+            //设置历史报告列表
+            //根据项目id查出所有的信息
+            List<CwProjectReportData> byProjectList = reportMapper.getByProjectId(reportData.getProjectId());
+            List<CwProjectInfoData> dataInfoList = new ArrayList<>();
+            if (null != byProjectList) {
+                CwProjectReportData finalReportData1 = reportData;
+                byProjectList.forEach(pro->{
+                    //根据reportid查出新增行数据
+                    CwProjectInfoData infoData = infoMapper.getByReportId(pro.getId());
+                    //根据reportid查出所有的附件信息
+                    List<ProjectReportWorkAttachmentDTO> fileList = new ArrayList<>();
+                    List<ProjectReportWorkAttachmentDTO> cwFileInfoList = attachmentMapper.selectByInfoIdAndNewLineId(finalReportData1.getId());
+                    //历史的附件信息是否是查改reportid对应的所有附件
+                    if (null != cwFileInfoList){
+                        cwFileInfoList.forEach(fi->{
+                            //未签章附件
+                            CwProjectReportFile file = attachmentMapper.selectInfoByFileId(fi.getId(),"0");
+                            if (null != file) {
+                                fi.setFileType(file.getFileType());
+                                fi.setSealType(file.getSealType());
+                                fi.setSealedFile(file.getSealedFile());
+                                fi.setSealUser(file.getSealUser());
+                                fi.setSealDate(file.getSealDate());
+                                fi.setRemarks(file.getRemarks());
+                                UserDTO userDTO = new UserDTO();
+                                //根据创建人id查出创建人名称
+                                String name = reportMapper.getUserNameById(file.getCreateBy());
+                                userDTO.setId(file.getCreateBy());
+                                userDTO.setName(name);
+                                fi.setCreateBy(userDTO);
+                                fi.setCreateDate(file.getCreateDate());
+                                fileList.add(fi);
+                            }
+                        });
+                        //设置附件信息
+                        infoData.setCwFileInfoList(fileList);
+                        if (pro.getStatus().equals("5")) {
+                            infoData.setDocumentStatus("已完成");
+                        }
+                        dataInfoList.add(infoData);
+                    }
+                });
+            }
+
+            reportData.setCwWorkClientContactDTOList(dataInfoList);
+
+            //将复核数据查出来
+            CwProjectReview review = reviewMapper.selectByReportId(reportData.getId());
+            if ( null != review) {
+                reportData.setReviewStatus(review.getReviewStatus());
+                reportData.setAllPrintNum(review.getAllPrintNum());
+                reportData.setIssueNum(review.getIssueNum());
+                reportData.setPlaceOnFileNum(review.getPlaceOnFileNum());
+                reportData.setPrintedBy(review.getPrintedBy());
+                reportData.setCheckAutograph(review.getCheckAutograph());
+                reportData.setReportTitleType(review.getReportTitleType());
+                reportData.setNeedUpdate1(review.getNeedUpdate1());
+                reportData.setNeedUpdate2(review.getNeedUpdate2());
+                reportData.setNeedUpdate3(review.getNeedUpdate3());
+                reportData.setRemark1(review.getRemark1());
+                reportData.setRemark2(review.getRemark2());
+                reportData.setRemark3(review.getRemark3());
+                reportData.setComputerNo(review.getComputerNo());
+                reportData.setReportReviewNo(review.getReportReviewNo());
+                reportData.setReviewBy(review.getReviewBy());
+                //将一级复核等填入数据查出
+                List<CwProofreadDetail> details = detailMapper.findByReportInfoId(review.getId());
+                if (null != details) {
+                    reportData.setDetails(details);
+                }
+            }
+            //根据报告类型查询下一节点用户
+            List<ReviewUser> stringList = new ArrayList<>();
+            //如果是苏州分部，这里写死
+            String officeId = reportMapper.getOfficeId("苏州分部");
+            if (reportData.getOfficeId().equals(officeId)){
+                stringList = reportMapper.getReviewByPost("质控-苏州分布");
+            }else if (reportData.getReportType().equals("1")) {
+                stringList = reportMapper.getReviewByPost("质控-财务-苏兴会基字");
+            } else {
+                stringList = reportMapper.getReviewByPost("质控-财务-非苏兴会基字");
+            }
+            reportData.setReviewBys(stringList);
+        } else {
+            //传来的是复核表的id
+            CwProjectReview review = reviewMapper.selectById(id);
+            if (null != review) {
+                reportData = reportMapper.queryById(review.getReportId());
+                if ( null != reportData){
+                    List<ProjectReportWorkAttachmentDTO> dtos = attachmentMapper.selectByInfoId(reportData.getId());
+                    if (null != dtos){
+                        dtos.forEach(d->{
+                            //根据id查出cw_project_report_file文件表的其他信息
+                            //未签章附件
+                            CwProjectReportFile file = attachmentMapper.selectInfoByFileId(d.getId(),"0");
+                            if (null != file) {
+                                d.setFileType(file.getFileType());
+                                d.setSealType(file.getSealType());
+                                d.setSealedFile(file.getSealedFile());
+                                d.setSealUser(file.getSealUser());
+                                d.setSealDate(file.getSealDate());
+                                d.setRemarks(file.getRemarks());
+                                UserDTO userDTO = new UserDTO();
+                                //根据创建人id查出创建人名称
+                                String name = reportMapper.getUserNameById(file.getCreateBy());
+                                userDTO.setId(file.getCreateBy());
+                                userDTO.setName(name);
+                                d.setCreateBy(userDTO);
+                                d.setCreateDate(file.getCreateDate());
+                                dtoList.add(d);
+                            }
+
+                            //已签章附件
+                            CwProjectReportFile signatureFile = attachmentMapper.selectInfoByFileId(d.getId(),"1");
+                            if (null != signatureFile){
+                                d.setFileType(signatureFile.getFileType());
+                                d.setSealType(signatureFile.getSealType());
+                                d.setSealedFile(signatureFile.getSealedFile());
+                                d.setSealUser(signatureFile.getSealUser());
+                                d.setSealDate(signatureFile.getSealDate());
+                                d.setRemarks(signatureFile.getRemarks());
+                                UserDTO userDTO2 = new UserDTO();
+                                //根据创建人id查出创建人名称
+                                String name2 = reportMapper.getUserNameById(signatureFile.getCreateBy());
+                                userDTO2.setId(signatureFile.getCreateBy());
+                                userDTO2.setName(name2);
+                                d.setCreateBy(userDTO2);
+                                d.setCreateDate(signatureFile.getCreateDate());
+                                signatureList.add(d);
+                            }
+                        });
+                        reportData.setCwFileInfoList(dtoList);
+                        reportData.setSignatureFileList(signatureList);
+                    }
+                    // 查询附件信息
+                    List<WorkAttachmentDto> fileInfo2 = reportMapper.findDtos(reportData.getId());
+                    if (CollectionUtils.isNotEmpty(dtos)) {
+                        for (WorkAttachmentDto i : fileInfo2) {
+                            i.setCreateBy(UserUtils.get(i.getBy()));
+                        }
+                    }
+                    reportData.setCwFileInfoList2(fileInfo2);
+                    //设置历史报告列表
+                    //根据项目id查出所有的信息
+                    List<CwProjectReportData> byProjectList = reportMapper.getByProjectId(reportData.getProjectId());
+                    List<CwProjectInfoData> dataInfoList = new ArrayList<>();
+                    if (null != byProjectList) {
+                        CwProjectReportData finalReportData = reportData;
+                        byProjectList.forEach(pro->{
+                            //根据reportid查出新增行数据
+                            CwProjectInfoData infoData = infoMapper.getContainDelByReportId(pro.getId());
+                            //根据reportid查出所有的附件信息
+                            List<ProjectReportWorkAttachmentDTO> fileList = new ArrayList<>();
+                            List<ProjectReportWorkAttachmentDTO> cwFileInfoList = attachmentMapper.selectByInfoIdAndNewLineId(finalReportData.getId());
+                            //历史的附件信息是否是查改reportid对应的所有附件
+                            if (null != cwFileInfoList){
+                                cwFileInfoList.forEach(fi->{
+                                    //未签章附件
+                                    CwProjectReportFile file = attachmentMapper.selectInfoByFileId(fi.getId(),"0");
+                                    if (null != file) {
+                                        fi.setFileType(file.getFileType());
+                                        fi.setSealType(file.getSealType());
+                                        fi.setSealedFile(file.getSealedFile());
+                                        fi.setSealUser(file.getSealUser());
+                                        fi.setSealDate(file.getSealDate());
+                                        fi.setRemarks(file.getRemarks());
+                                        UserDTO userDTO = new UserDTO();
+                                        //根据创建人id查出创建人名称
+                                        String name = reportMapper.getUserNameById(file.getCreateBy());
+                                        userDTO.setId(file.getCreateBy());
+                                        userDTO.setName(name);
+                                        fi.setCreateBy(userDTO);
+                                        fi.setCreateDate(file.getCreateDate());
+                                        fileList.add(fi);
+                                    }
+                                });
+                                //设置附件信息
+                                infoData.setCwFileInfoList(fileList);
+                                if (pro.getStatus().equals("5")) {
+                                    infoData.setDocumentStatus("已完成");
+                                }
+                                dataInfoList.add(infoData);
+                            }
+                        });
+                    }
+
+                    reportData.setCwWorkClientContactDTOList(dataInfoList);
+
+                    //将复核数据查出来
+//                CwProjectReview review = reviewMapper.selectByReportId(reportData.getId());
+//                    if ( null != review) {
+//
+//                    }
+                    reportData.setReviewStatus(review.getReviewStatus());
+                    reportData.setAllPrintNum(review.getAllPrintNum());
+                    reportData.setIssueNum(review.getIssueNum());
+                    reportData.setPlaceOnFileNum(review.getPlaceOnFileNum());
+                    reportData.setPrintedBy(review.getPrintedBy());
+                    reportData.setCheckAutograph(review.getCheckAutograph());
+                    reportData.setReportTitleType(review.getReportTitleType());
+                    reportData.setNeedUpdate1(review.getNeedUpdate1());
+                    reportData.setNeedUpdate2(review.getNeedUpdate2());
+                    reportData.setNeedUpdate3(review.getNeedUpdate3());
+                    reportData.setRemark1(review.getRemark1());
+                    reportData.setRemark2(review.getRemark2());
+                    reportData.setRemark3(review.getRemark3());
+                    reportData.setComputerNo(review.getComputerNo());
+                    reportData.setReviewBy(review.getReviewBy());
+
+                    //将一级复核等填入数据查出
+                    List<CwProofreadDetail> details = detailMapper.findByReportInfoId(review.getId());
+                    if (null != details) {
+                        reportData.setDetails(details);
+                    }
+                    //根据报告类型查询下一节点用户
+                    List<ReviewUser> stringList = new ArrayList<>();
+                    //如果是苏州分部，这里写死
+                    String officeId = reportMapper.getOfficeId("苏州分部");
+                    /*if (reportData.getOfficeId().equals(officeId)){
+                        stringList = reportMapper.getReviewByS("13");
+                    }else if (reportData.getReportType().equals("1")) {
+                        stringList = reportMapper.getReviewByS("1");
+                    } else {
+                        stringList = reportMapper.getReviewByS("非苏兴会基字");
+                    }*/
+                    if (reportData.getOfficeId().equals(officeId)){
+                        stringList = reportMapper.getReviewByPost("质控-苏州分布");
+                    }else if (reportData.getReportType().equals("1")) {
+                        stringList = reportMapper.getReviewByPost("质控-财务-苏兴会基字");
+                    } else {
+                        stringList = reportMapper.getReviewByPost("质控-财务-非苏兴会基字");
+                    }
+                    reportData.setReviewBys(stringList);
+                    //将新增行数据查询出来放入到cwProjectInfoList中
+                    cwProjectInfoData = infoMapper.selectByReportId(reportData.getId());
+                    if (null != cwProjectInfoData){
+                        reportData.setServedUnitName(cwProjectInfoData.getServedUnitName());
+                        reportData.setServedUnitId(cwProjectInfoData.getServedUnitId());
+                        reportData.setReportDate(cwProjectInfoData.getReportDate());
+                        reportData.setReportType(cwProjectInfoData.getReportType());
+                        reportData.setReportNumber(cwProjectInfoData.getReportNumber());
+                        reportData.setReportNo(cwProjectInfoData.getReportNo());
+                        reportData.setSealType(cwProjectInfoData.getSealType());
+                    }
+                }
+            }
+
+        }
+        return reportData;
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/mapper/xml/ReportCancellApplyMapper.xml

@@ -113,6 +113,6 @@
     </select>
     <select id="queryReportIdByReportNo" resultType="string">
         select report_id
-        from cw_project_report_new_line where del_flag = '0' and report_no = #{no}
+        from cw_project_report_new_line where report_no = #{no}
     </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/ReportCancellApplyService.java

@@ -146,7 +146,7 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         if (ObjectUtil.isNotEmpty(reportData) && StringUtils.isNotBlank(reportData.getReportNo())) {
             String reportId = applyMapper.queryReportIdByReportNo(reportData.getReportNo());
             if (StringUtils.isNotBlank(reportId)) {
-                CwProjectReportData cwProjectReportData = projectReportService.queryById(reportId);
+                CwProjectReportData cwProjectReportData = projectReportService.queryContainDelById(reportId);
                 reportData.setReportDetail(cwProjectReportData);
             }
         }