报告复核通过后生成报告流水号

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

@@ -200,26 +200,34 @@ public class CwProjectReportReviewService extends ServiceImpl<CwProjectReportRev
                     infoData.setReportNo(documentNo);
                     //报告流水号生成  根据项目编号去new_line表查询
                     String reportNumber = infoMapper.selectReportNumberByProjectNo(reportData.getProjectNumber());
-                    int stress = 0;
                     if (null != reportNumber){
-                        if (reportNumber.contains(reportData.getProjectNumber() + "-0")){
-                            stress = reportNumber.indexOf("-0");//分隔符位置
-                        }else {
-                            stress = reportNumber.indexOf("-");//分隔符位置
-                        }
+                        int stress = 0;
+                        stress = reportNumber.indexOf("-");//分隔符位置
                         String substring = reportNumber.substring(stress + 1, reportNumber.length());
                         int integer = Integer.parseInt(substring);
 
                         String newReportNumber = "";
-                        if (integer>=9){
-                            newReportNumber = reportData.getProjectNumber() + "-" + (integer + 1);
+                        if (integer<10){
+                            if (integer == 9) {
+                                newReportNumber = reportData.getProjectNumber() + "-010";
+                            } else {
+                                newReportNumber = reportData.getProjectNumber() + "-00" + (integer + 1);
+                            }
                         }else {
-                            newReportNumber = reportData.getProjectNumber() + "-0" + (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() + "-0" + "1");
+                        infoData.setReportNumber(reportData.getProjectNumber() + "-001");
                     }
                     infoMapper.updateByReportId(reportData.getId(),infoData.getReportNumber(),infoData.getReportNo());
                 }