代码调整

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

@@ -169,64 +169,72 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                     CwProjectInfoData infoData = new CwProjectInfoData();
                     //报告文号生成
                     String documentNo = "";
-                    try {
-                        documentNo = serialnumTplService.genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE);
-                        if(documentNo.contains("{replacement}")){
-                            if(StringUtils.isNotBlank(reportData.getReportType())){
-                                switch (reportData.getReportType()){
-                                    case "1":
-                                        documentNo = documentNo.replace("{replacement}","基");
-                                        break;
-                                    case "2":
-                                        documentNo = documentNo.replace("{replacement}","咨");
-                                        break;
-                                    case "3":
-                                        documentNo = documentNo.replace("{replacement}","审");
-                                        break;
-                                    case "4":
-                                        documentNo = documentNo.replace("{replacement}","验");
-                                        break;
-                                    case "5":
-                                        documentNo = documentNo.replace("{replacement}","特");
-                                        break;
+                    if(StringUtils.isNotBlank(reportData.getReportNo())){
+                        infoData.setReportNo(reportData.getReportNo());
+                    }else{
+                        try {
+                            documentNo = serialnumTplService.genSerialNumNoSort(userDTO.getCompanyDTO().getId(), CwProjectInfoData.BIZ_CODE);
+                            if(documentNo.contains("{replacement}")){
+                                if(StringUtils.isNotBlank(reportData.getReportType())){
+                                    switch (reportData.getReportType()){
+                                        case "1":
+                                            documentNo = documentNo.replace("{replacement}","基");
+                                            break;
+                                        case "2":
+                                            documentNo = documentNo.replace("{replacement}","咨");
+                                            break;
+                                        case "3":
+                                            documentNo = documentNo.replace("{replacement}","审");
+                                            break;
+                                        case "4":
+                                            documentNo = documentNo.replace("{replacement}","验");
+                                            break;
+                                        case "5":
+                                            documentNo = documentNo.replace("{replacement}","特");
+                                            break;
+                                    }
                                 }
                             }
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                        infoData.setReportId(review.getReportId());
+                        infoData.setReportNo(documentNo);
                     }
-                    infoData.setReportId(review.getReportId());
-                    infoData.setReportNo(documentNo);
-                    //报告流水号生成  根据项目编号去new_line表查询
-                    String reportNumber = infoMapper.selectReportNumberByProjectNo(reportData.getProjectNumber());
-                    if (null != reportNumber){
-                        int stress = 0;
-                        stress = reportNumber.indexOf("-");//分隔符位置
-                        String substring = reportNumber.substring(stress + 1, reportNumber.length());
-                        int integer = Integer.parseInt(substring);
+                    if(StringUtils.isNotBlank(reportData.getReportNumber())){
+                        infoData.setReportNumber(reportData.getReportNumber());
+                    }else {
+                        //报告流水号生成  根据项目编号去new_line表查询
+                        String reportNumber = infoMapper.selectReportNumberByProjectNo(reportData.getProjectNumber());
+                        if (null != reportNumber) {
+                            int stress = 0;
+                            stress = reportNumber.indexOf("-");//分隔符位置
+                            String substring = reportNumber.substring(stress + 1, reportNumber.length());
+                            int integer = Integer.parseInt(substring);
 
-                        String newReportNumber = "";
-                        if (integer<10){
-                            if (integer == 9) {
-                                newReportNumber = reportData.getProjectNumber() + "-010";
-                            } else {
-                                newReportNumber = reportData.getProjectNumber() + "-00" + (integer + 1);
-                            }
-                        }else {
-                            if (integer<100) {
-                                if (integer == 99) {
-                                    newReportNumber = reportData.getProjectNumber() + "-100";
+                            String newReportNumber = "";
+                            if (integer < 10) {
+                                if (integer == 9) {
+                                    newReportNumber = reportData.getProjectNumber() + "-010";
                                 } else {
-                                    newReportNumber = reportData.getProjectNumber() + "-0" + (integer + 1);
+                                    newReportNumber = reportData.getProjectNumber() + "-00" + (integer + 1);
                                 }
                             } else {
-                                newReportNumber = reportData.getProjectNumber() + "-" + (integer + 1);
+                                if (integer < 100) {
+                                    if (integer == 99) {
+                                        newReportNumber = reportData.getProjectNumber() + "-100";
+                                    } else {
+                                        newReportNumber = reportData.getProjectNumber() + "-0" + (integer + 1);
+                                    }
+                                } else {
+                                    newReportNumber = reportData.getProjectNumber() + "-" + (integer + 1);
+                                }
                             }
-                        }
 
-                        infoData.setReportNumber(newReportNumber);
-                    }else {
-                        infoData.setReportNumber(reportData.getProjectNumber() + "-001");
+                            infoData.setReportNumber(newReportNumber);
+                        } else {
+                            infoData.setReportNumber(reportData.getProjectNumber() + "-001");
+                        }
                     }
                     infoMapper.updateByReportId(reportData.getId(),infoData.getReportNumber(),infoData.getReportNo());
                 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/klgBase/question/service/KlgBaseQuestionsService.java

@@ -89,7 +89,9 @@ public class KlgBaseQuestionsService extends ServiceImpl<KlgBaseQuestionsMapper,
                     if (i != split.length-1) {
                         disposeByName = disposeByName + user.getName() + ",";
                     } else {
-                        disposeByName = disposeByName + user.getName();
+                        if(null != user){
+                            disposeByName = disposeByName + user.getName();
+                        }
                     }
                 }
                 item.setDisposeByName(disposeByName);