fix(jg && 96333)：使用登记完成时向监督管理信息表添加orgcode和companyOrgCode

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/entity/SuperviseInfo.java

@@ -40,6 +40,12 @@ public class SuperviseInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"ORG_BRANCH_CODE\"")
     private String orgBranchCode;
     /**
+     *  	 * 公司/组织机构代码
+     *      */
+
+    @TableField(value ="\"COMPANY_ORG_BRANCH_CODE\"")
+    private String companyOrgBranchCode;
+    /**
      *  	 * 管辖分局名称
      *      */
 

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-api/src/main/java/com/yeejoin/amos/boot/module/app/api/entity/SuperviseInfo.java

@@ -40,6 +40,12 @@ public class SuperviseInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"ORG_BRANCH_CODE\"")
     private String orgBranchCode;
     /**
+     *  	 * 公司/组织机构代码
+     *      */
+
+    @TableField(value ="\"COMPANY_ORG_BRANCH_CODE\"")
+    private String companyOrgBranchCode;
+    /**
      *  	 * 管辖分局名称
      *      */
 

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-api/src/main/java/com/yeejoin/amos/boot/module/cylinder/api/entity/SuperviseInfo.java

@@ -40,6 +40,12 @@ public class SuperviseInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"ORG_BRANCH_CODE\"")
     private String orgBranchCode;
     /**
+     *  	 * 公司/组织机构代码
+     *      */
+
+    @TableField(value ="\"COMPANY_ORG_BRANCH_CODE\"")
+    private String companyOrgBranchCode;
+    /**
      *  	 * 管辖分局名称
      *      */
 

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/java/com/yeejoin/amos/boot/module/jczs/api/entity/SuperviseInfo.java

@@ -46,6 +46,12 @@ public class SuperviseInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"ORG_BRANCH_NAME\"")
     private String orgBranchName;
     /**
+     *  	 * 公司/组织机构代码
+     *      */
+
+    @TableField(value ="\"COMPANY_ORG_BRANCH_CODE\"")
+    private String companyOrgBranchCode;
+    /**
      *  	 * 是否重点监察设备
      *      */
 

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

@@ -192,8 +192,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         IdxBizJgSupervisionInfo idxBizJgSupervisionInfo = new IdxBizJgSupervisionInfo();
         if (map.containsKey("orgBranchCode") && !ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
             String[] data = String.valueOf(map.getString("orgBranchCode")).split("_");
-            idxBizJgSupervisionInfo.setOrgBranchCode(data[0]);
+            List<LinkedHashMap> tree = commonServiceImpl.getCreatTree();
+            String orgCode = this.recursiveMatching(tree, data[0]);
+            idxBizJgSupervisionInfo.setOrgBranchCode(orgCode);
             idxBizJgSupervisionInfo.setOrgBranchName(data[1]);
+            idxBizJgSupervisionInfo.setCompanyOrgBranchCode(data[0]);
             LambdaQueryWrapper<IdxBizJgSupervisionInfo> eq = new QueryWrapper<IdxBizJgSupervisionInfo>().lambda().eq(IdxBizJgSupervisionInfo::getRecord, map.get("equipId"));
             idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);
         }
@@ -204,6 +207,30 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     /**
+     * 递归属地监管部门树匹配监管部门
+     * @param tree 监管树
+     * @param orgBranchCode 监管部门companyCode
+     * @return 监管部门orgCode
+     */
+    public String recursiveMatching(List<LinkedHashMap> tree, String orgBranchCode) {
+        if (tree != null) {
+            for (LinkedHashMap map : tree) {
+                if (orgBranchCode.equals(map.get("companyCode"))) {
+                    return (String) map.get("orgCode");
+                }
+                if (map.containsKey("children") && map.get("children") instanceof List) {
+                    String result = recursiveMatching((List<LinkedHashMap>) map.get("children"), orgBranchCode);
+                    if (!"".equals(result)) {
+                        return result;
+                    }
+                }
+            }
+        }
+        return "";
+    }
+
+
+    /**
      * 获取类型为ZC的“已注册”的字典值
      * @return code
      */

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/SuperviseInfo.java

@@ -40,6 +40,12 @@ public class SuperviseInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"ORG_BRANCH_CODE\"")
     private String orgBranchCode;
     /**
+     *  	 * 公司/组织机构代码
+     *      */
+
+    @TableField(value ="\"COMPANY_ORG_BRANCH_CODE\"")
+    private String companyOrgBranchCode;
+    /**
      *  	 * 管辖分局名称
      *      */
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgSupervisionInfo.java

@@ -2,12 +2,10 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
 
 /**
  * 监督管理信息表
@@ -48,6 +46,12 @@ public class IdxBizJgSupervisionInfo extends TzsBaseEntity {
      */
 	@TableField("\"ORG_BRANCH_CODE\"")
     private String orgBranchCode;
+    /**
+     *  	 * 公司/组织机构代码
+     *      */
+
+    @TableField(value ="\"COMPANY_ORG_BRANCH_CODE\"")
+    private String companyOrgBranchCode;
 
     /**
      *

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/SuperviseInfo.java

@@ -40,6 +40,12 @@ public class SuperviseInfo extends AbstractEquipBaseEntity {
     @TableField(value ="\"ORG_BRANCH_CODE\"")
     private String orgBranchCode;
     /**
+     *  	 * 公司/组织机构代码
+     *      */
+
+    @TableField(value ="\"COMPANY_ORG_BRANCH_CODE\"")
+    private String companyOrgBranchCode;
+    /**
      *  	 * 管辖分局名称
      *      */
 

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

@@ -14,50 +14,12 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipExportDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentMessageDto;
-import com.yeejoin.amos.boot.module.ymt.api.entity.CategoryOtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.api.entity.EsElevator;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgDesignInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgFactoryInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMainParts;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgMaintenanceRecordInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgOtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProtectionDevices;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgSupervisionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsBoiler;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsElevator;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsPipeline;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRides;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVehicle;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsVessel;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentCategoryEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentTypeEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.CategoryOtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryDataMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgFactoryInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgMainPartsMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProtectionDevicesMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsBoilerMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsElevatorMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsLiftingMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsPipelineMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRidesMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsRopewayMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsVehicleMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsVesselMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.ymt.api.service.IGenerateCodeService;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
@@ -98,7 +60,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StopWatch;
-import org.springframework.util.StringUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.DateUtil;
@@ -111,19 +72,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.StringJoiner;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;