中审报告归档调整

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

@@ -301,7 +301,7 @@ public class ZsReportArchieveService {
             //报告文号类型
             try {
                 String reportNo = reportArchieveDTO.getReportNo();
-                String type = reportNo.substring(reportNo.indexOf("环")+1, reportNo.lastIndexOf("("));
+                String type = reportNo.substring(reportNo.indexOf("环")+1, reportNo.indexOf("字")+1);
                 if (StringUtils.isNotBlank(type)){
                     for (String key : reportNoTypeDTOs.keySet()) {
                         if(type.equals(key)){
@@ -454,7 +454,7 @@ public class ZsReportArchieveService {
      */
     public ZsReportArchieve findByReportNo(String reportNo) {
         if (StringUtils.isNotBlank(reportNo)){
-            String type = reportNo.substring(2, reportNo.lastIndexOf("("));
+            String type = reportNo.substring(reportNo.indexOf("环")+1, reportNo.indexOf("字")+1);
             String noType = SpringUtil.getBean(IDictApi.class).getDictValue(type, "report_no_type", "");
             if (StringUtils.isNotBlank(noType)){
                 ZsReportArchieve reportArchieve = reportArchieveMapper.findByReportNoType(noType);
@@ -471,7 +471,7 @@ public class ZsReportArchieveService {
      * @return
      */
     public boolean checkReportTypeAndReportNo(String reportNoType, String reportNo) {
-        String type = reportNo.substring(2, reportNo.lastIndexOf("("));
+        String type = reportNo.substring(reportNo.indexOf("环")+1, reportNo.indexOf("字")+1);
         String noType = SpringUtil.getBean(IDictApi.class).getDictValue(type, "report_no_type", "");
         if (StringUtils.isNotBlank(noType)){
             if (noType.equals(reportNoType)){