中审报告归档调整

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/service/ZsReportArchieveService.java

@@ -299,16 +299,21 @@ public class ZsReportArchieveService {
                 }
             }
             //报告文号类型
-            String reportNo = reportArchieveDTO.getReportNo();
-            String type = reportNo.substring(2, reportNo.lastIndexOf("("));
-            if (StringUtils.isNotBlank(type)){
-                for (String key : reportNoTypeDTOs.keySet()) {
-                    if(type.equals(key)){
-                        zsReportArchieve.setReportNoType(String.valueOf(reportNoTypeDTOs.get(key)));
-                        break;
+            try {
+                String reportNo = reportArchieveDTO.getReportNo();
+                String type = reportNo.substring(reportNo.indexOf("环")+1, reportNo.lastIndexOf("("));
+                if (StringUtils.isNotBlank(type)){
+                    for (String key : reportNoTypeDTOs.keySet()) {
+                        if(type.equals(key)){
+                            zsReportArchieve.setReportNoType(String.valueOf(reportNoTypeDTOs.get(key)));
+                            break;
+                        }
                     }
                 }
+            }catch (Exception e) {
+                e.printStackTrace();
             }
+
             //流水号生成
             String currentToken = TokenProvider.getCurrentToken();
             OfficeDTO officeDTO = reportArchieveMapper.getOfficeDTOByName("中审江苏分所");