fix(jg):更名变更添加超时时间，使用登记添加监察处置单位

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationNameServiceImpl.java

@@ -145,7 +145,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     private EventPublisher eventPublisher;
 
     @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 600000)
     public List<JgChangeRegistrationName> save2(String submitType, JSONObject requestParam) {
         Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>) JSONObject.parseObject(JSONObject.toJSONString(requestParam), Map.class);
         return Collections.singletonList(this.save(submitType, jgRegistrationInfoMap));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -157,6 +157,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private static final Logger logger = LogManager.getLogger(JgUseRegistrationServiceImpl.class);
 
     private static final String DEFINITION_KEY = "useRegistration";
+    private static final String JIAN_CHA_ROLE_ID = "1864242478501093377";
     private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");;
     private static final int BATCH_SIZE = 1000;
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废");
@@ -2232,6 +2233,20 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 //通过
                 //一级通过，且是特殊登记,需要监察，approvalStatus=2
                 if ("2".equals(jgUseRegistration.getRegType()) && (WorkFlowStatusEnum.USE_RECEIVE.getPass().equals(jgUseRegistration.getStatus()) || WorkFlowStatusEnum.USE_RECEIVE.getReject().equals(jgUseRegistration.getStatus()))) {
+                    List<AgencyUserModel> taskExecutor = Privilege.agencyUserClient
+                            .queryByRoleId(String.join(",", JIAN_CHA_ROLE_ID), null,
+                                    true, true, "", buildOrgCodePrefixes(orgCode)).getResult();
+                    if (!ValidationUtil.isEmpty(taskExecutor)) {
+                        String companyCodes = taskExecutor.stream()
+                                .map(AgencyUserModel::getCompanys)
+                                .filter(Objects::nonNull)
+                                .filter(list -> !list.isEmpty())
+                                .map(list -> list.get(0).getCompanyCode())
+                                .filter(Objects::nonNull)
+                                .distinct()
+                                .collect(Collectors.joining(","));
+                        dto.setNextExecuteUserCompanyCode(companyCodes);
+                    }
                     dto.setResultCode("approvalStatus");
                     map.put("approvalStatus", "9");
                     map.put("nextExecuteUserOrgCode", orgCode);
@@ -2266,6 +2281,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    public static String buildOrgCodePrefixes(String orgCode) {
+        if (orgCode == null || orgCode.isEmpty()) return "";
+        String[] parts = orgCode.split("\\*");
+        List<String> prefixes = new ArrayList<>();
+        if (parts.length >= 3) prefixes.add(String.join("*", Arrays.copyOfRange(parts, 0, 3)));
+        if (parts.length >= 2) prefixes.add(String.join("*", Arrays.copyOfRange(parts, 0, 2)));
+        return String.join(",", prefixes);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 6000000)
     public void withdraw(String instanceId, String nextTaskId, String manageType) {