财务-报告管理修改

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

@@ -229,21 +229,27 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                         //报告流水号生成  根据项目编号去new_line表查询
                         String reportNumber = infoMapper.selectReportNumberByProjectNo(report.getProjectNumber());
                         int stress = 0;
-                        if (reportNumber.contains(report.getProjectNumber() + "-0")){
-                            stress = reportNumber.indexOf("-0");//分隔符位置
+                        if (null != reportNumber){
+                            if (reportNumber.contains(report.getProjectNumber() + "-0")){
+                                stress = reportNumber.indexOf("-0");//分隔符位置
+                            }else {
+                                stress = reportNumber.indexOf("-");//分隔符位置
+                            }
+                            String substring = reportNumber.substring(stress + 1, reportNumber.length());
+                            Integer integer = Integer.valueOf(substring);
+                            String newReportNumber = "";
+                            if (integer>=9){
+                                newReportNumber = report.getProjectNumber() + "-" + (integer + 1);
+                            }else {
+                                newReportNumber = report.getProjectNumber() + "-0" + (integer + 1);
+                            }
+                            in.setReportNumber(newReportNumber);
                         }else {
-                            stress = reportNumber.indexOf("-");//分隔符位置
+                            in.setReportNumber(report.getProjectNumber() + "-0" + "1");
                         }
 
-                        String substring = reportNumber.substring(stress + 1, reportNumber.length());
-                        Integer integer = Integer.valueOf(substring);
-                        String newReportNumber = "";
-                        if (integer>=9){
-                            newReportNumber = report.getProjectNumber() + "-" + (integer + 1);
-                        }else {
-                            newReportNumber = report.getProjectNumber() + "-0" + (integer + 1);
-                        }
-                        in.setReportNumber(newReportNumber);
+
+
                         infoMapper.insert(in);
                     }else {
                         infoMapper.updateById(in);
@@ -382,18 +388,21 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                     }else {
                         stress = reportNumber.indexOf("-");//分隔符位置
                     }
-                }
-                String substring = reportNumber.substring(stress + 1, reportNumber.length());
-                Integer integer = Integer.valueOf(substring);
+                    String substring = reportNumber.substring(stress + 1, reportNumber.length());
+                    Integer integer = Integer.valueOf(substring);
+
+                    String newReportNumber = "";
+                    if (integer>=9){
+                        newReportNumber = report.getProjectNumber() + "-" + (integer + 1);
+                    }else {
+                        newReportNumber = report.getProjectNumber() + "-0" + (integer + 1);
+                    }
 
-                String newReportNumber = "";
-                if (integer>=9){
-                    newReportNumber = report.getProjectNumber() + "-" + (integer + 1);
+                    in.setReportNumber(newReportNumber);
                 }else {
-                    newReportNumber = report.getProjectNumber() + "-0" + (integer + 1);
+                    in.setReportNumber(report.getProjectNumber() + "-0" + "1");
                 }
 
-                in.setReportNumber(newReportNumber);
                 infoMapper.insert(in);
                 //对上传的文件数据进行持久化操作
                 List<ProjectReportWorkAttachmentDTO> fileInfoList = new ArrayList<>();