✨ 并入调整

cas-system/src/main/java/com/inscloudtech/datacenter/service/QueryCenterService.java

@@ -1401,10 +1401,11 @@ public class QueryCenterService {
     }
 
 
-    private static final List<Class> SERVICE_LIST_MERGE = Arrays.asList(BankService.class, OpeningAccountInfoService.class,ITransactionPartnerService.class, IPublicFamilyService.class,
+    private static final List<Class> SERVICE_LIST_MERGE = Arrays.asList(BankService.class, OpeningAccountInfoService.class,
+        ITransactionPartnerService.class, IPublicFamilyService.class,
             IRealEstateService.class, ICarInfoService.class,IOtherAssetsService.class,IOtherInformationService.class, IAnalysisResultService.class,
-        IAnalysisReportService.class, CollectionInformation.class,
-         PlateNumberInfo.class);
+        IAnalysisReportService.class, CollectionInformationService.class,
+         PlateNumberService.class);
 
     public void caseMerge(AnalysisDto bo) {
 
@@ -1417,15 +1418,15 @@ public class QueryCenterService {
         String targetCaseId = bo.getTargetCaseId();
 
         for (Integer moduleIndex : moduleIndexList) {
+            try {
+                Class<?> serviceClass = SERVICE_LIST_MERGE.get(moduleIndex);
+                Object serviceObj =  SpringUtils.getBean(serviceClass);
+                String methodName = "caseMerge";
+                List<Method> methodList = Arrays.stream(serviceClass.getMethods()).filter(method -> method.getName().equals(methodName)).collect(Collectors.toList());
+                Method method = methodList.get(0);//
+                Object[] args = new Object[]{sourceCaseId,targetCaseId};
 
-            Class<?> serviceClass = SERVICE_LIST_MERGE.get(moduleIndex);
-            Object serviceObj =  SpringUtils.getBean(serviceClass);
-            String methodName = "caseMerge";
-            List<Method> methodList = Arrays.stream(serviceClass.getMethods()).filter(method -> method.getName().equals(methodName)).collect(Collectors.toList());
-            Method method = methodList.get(0);//
-            Object[] args = new Object[]{sourceCaseId,targetCaseId};
 
-            try {
                 method.invoke(serviceObj, args);
             }catch (Exception e){
                 e.printStackTrace();