财务报告-取号类型

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -89,6 +89,8 @@
         cw_rev.audit_time as auditTime,
         new_line.report_no as reportNo,
         new_line.report_date,
+        new_line.approved_no_including_tax as approvedNoIncludingTax,
+        new_line.approved_including_tax as approvedIncludingTax,
         cwcb.name as servedUnitName,
         art.ID_ as rev_task_id,
         arta.ID_ as rev_task_id2,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportNumberApplyService.java

@@ -129,47 +129,48 @@ public class CwProjectReportNumberApplyService extends ServiceImpl<CwProjectRepo
             if(StringUtils.isNotBlank(reportData.getReportNo())){
                 infoData.setReportNo(reportData.getReportNo());
             }else{
-                if(StringUtils.isNotBlank(reportData.getReportType())) {
-                    ReportNoDto projectReportByNumber = new ReportNoDto();
-                    switch (reportData.getReportType()) {
-                        case "1":   //基字
-                            do{
-                                documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE,currentToken);
-                                //根据报告号查询诗剧苦中是否存在
-                                projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
-                            }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                            break;
-                        case "2":   //咨字
-                            do{
-                                documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CONSULT_BIZ_CODE,currentToken);
-                                //根据报告号查询诗剧苦中是否存在
-                                projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
-                            }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                            break;
-                        case "3":   //审字
-                            do{
-                                documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.EXAMINE_BIZ_CODE,currentToken);
-                                //根据报告号查询诗剧苦中是否存在
-                                projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
-                            }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                            break;
-                        case "4":   //验字
-                            do{
-                                documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CHECK_BIZ_CODE,currentToken);
-                                //根据报告号查询诗剧苦中是否存在
-                                projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
-                            }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                            break;
-                        case "5":   //特字
-                            do{
-                                documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.SPECIAL_BIZ_CODE,currentToken);
-                                //根据报告号查询诗剧苦中是否存在
-                                projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
-                            }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                            break;
+                if (!reportData.getTakeNumberType().equals("2")){
+                    if(StringUtils.isNotBlank(reportData.getReportType())) {
+                        ReportNoDto projectReportByNumber = new ReportNoDto();
+                        switch (reportData.getReportType()) {
+                            case "1":   //基字
+                                do{
+                                    documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE,currentToken);
+                                    //根据报告号查询诗剧苦中是否存在
+                                    projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
+                                }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                break;
+                            case "2":   //咨字
+                                do{
+                                    documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CONSULT_BIZ_CODE,currentToken);
+                                    //根据报告号查询诗剧苦中是否存在
+                                    projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
+                                }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                break;
+                            case "3":   //审字
+                                do{
+                                    documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.EXAMINE_BIZ_CODE,currentToken);
+                                    //根据报告号查询诗剧苦中是否存在
+                                    projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
+                                }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                break;
+                            case "4":   //验字
+                                do{
+                                    documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CHECK_BIZ_CODE,currentToken);
+                                    //根据报告号查询诗剧苦中是否存在
+                                    projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
+                                }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                break;
+                            case "5":   //特字
+                                do{
+                                    documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.SPECIAL_BIZ_CODE,currentToken);
+                                    //根据报告号查询诗剧苦中是否存在
+                                    projectReportByNumber = reviewMapper.getProjectReportByNumber(documentNo);
+                                }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                break;
+                        }
                     }
                 }
-
                 if(StringUtils.isNotBlank(reportData.getReportNumber())){
                     infoData.setReportNumber(reportData.getReportNumber());
                 }else {

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportReviewService.java

@@ -185,49 +185,50 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                     CwProjectInfoData infoData = new CwProjectInfoData();
                     //报告文号生成
                     String documentNo = "";
-                    if(StringUtils.isNotBlank(reportData.getReportNo())){
-                        infoData.setReportNo(reportData.getReportNo());
-                    }else{
-                        if(StringUtils.isNotBlank(reportData.getReportType())) {
-                            ReportNoDto projectReportByNumber = new ReportNoDto();
-                            switch (reportData.getReportType()) {
-                                case "1":   //基字
-                                    do{
-                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE,currentToken);
-                                        //根据报告号查询诗剧苦中是否存在
-                                        projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
-                                    }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                                    break;
-                                case "2":   //咨字
-                                    do{
-                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CONSULT_BIZ_CODE,currentToken);
-                                        //根据报告号查询诗剧苦中是否存在
-                                        projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
-                                    }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                                    break;
-                                case "3":   //审字
-                                    do{
-                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.EXAMINE_BIZ_CODE,currentToken);
-                                        //根据报告号查询诗剧苦中是否存在
-                                        projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
-                                    }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                                    break;
-                                case "4":   //验字
-                                    do{
-                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CHECK_BIZ_CODE,currentToken);
-                                        //根据报告号查询诗剧苦中是否存在
-                                        projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
-                                    }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                                    break;
-                                case "5":   //特字
-                                    do{
-                                        documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.SPECIAL_BIZ_CODE,currentToken);
-                                        //根据报告号查询诗剧苦中是否存在
-                                        projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
-                                    }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
-                                    break;
+                    if (!reportData.getTakeNumberType().equals("2")){
+                        if(StringUtils.isNotBlank(reportData.getReportNo())){
+                            infoData.setReportNo(reportData.getReportNo());
+                        }else{
+                            if(StringUtils.isNotBlank(reportData.getReportType())) {
+                                ReportNoDto projectReportByNumber = new ReportNoDto();
+                                switch (reportData.getReportType()) {
+                                    case "1":   //基字
+                                        do{
+                                            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE,currentToken);
+                                            //根据报告号查询诗剧苦中是否存在
+                                            projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
+                                        }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                        break;
+                                    case "2":   //咨字
+                                        do{
+                                            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CONSULT_BIZ_CODE,currentToken);
+                                            //根据报告号查询诗剧苦中是否存在
+                                            projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
+                                        }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                        break;
+                                    case "3":   //审字
+                                        do{
+                                            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.EXAMINE_BIZ_CODE,currentToken);
+                                            //根据报告号查询诗剧苦中是否存在
+                                            projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
+                                        }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                        break;
+                                    case "4":   //验字
+                                        do{
+                                            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.CHECK_BIZ_CODE,currentToken);
+                                            //根据报告号查询诗剧苦中是否存在
+                                            projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
+                                        }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                        break;
+                                    case "5":   //特字
+                                        do{
+                                            documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.SPECIAL_BIZ_CODE,currentToken);
+                                            //根据报告号查询诗剧苦中是否存在
+                                            projectReportByNumber = mapper.getProjectReportByNumber(documentNo);
+                                        }while (null != projectReportByNumber && StringUtils.isNotBlank(projectReportByNumber.getReportNo()));
+                                        break;
+                                }
                             }
-                        }
                         /*try {
                             documentNo = serialnumTplService.genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE);
                             if(documentNo.contains("{replacement}")){
@@ -254,15 +255,17 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                         } catch (Exception e) {
                             e.printStackTrace();
                         }*/
-                        infoData.setReportId(review.getReportId());
-                        infoData.setReportNo(documentNo);
-                        // 如果数据已经生成报告文号，则不重复生成
-                        CwProjectInfoData byReportId = infoMapper.getByReportId(review.getReportId());
-                        if(ObjectUtil.isNotEmpty(byReportId)) {
-                            if (StringUtils.isNotBlank(byReportId.getReportNo())) {
-                                infoData.setReportNo(byReportId.getReportNo());
+                            infoData.setReportId(review.getReportId());
+                            infoData.setReportNo(documentNo);
+                            // 如果数据已经生成报告文号，则不重复生成
+                            CwProjectInfoData byReportId = infoMapper.getByReportId(review.getReportId());
+                            if(ObjectUtil.isNotEmpty(byReportId)) {
+                                if (StringUtils.isNotBlank(byReportId.getReportNo())) {
+                                    infoData.setReportNo(byReportId.getReportNo());
+                                }
                             }
                         }
+
                     }
                     if(StringUtils.isNotBlank(reportData.getReportNumber())){
                         infoData.setReportNumber(reportData.getReportNumber());

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/CwReimbursementInfoService.java

@@ -104,7 +104,13 @@ public class CwReimbursementInfoService {
          */
         queryWrapper.eq("a.del_flag", 0);
         queryWrapper.eq("c.id", dto.getProjectId());
-        return infoMapper.getReportNoList(page, queryWrapper);
+        IPage<ReportNoDto> reportNoList = infoMapper.getReportNoList(page, queryWrapper);
+        reportNoList.getRecords().stream().forEach(item ->{
+            if (StringUtils.isBlank(item.getReportNo())){
+                item.setReportNo("无报告号报告");
+            }
+        });
+        return reportNoList;
     }
 
     /**