个人主体bug修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/CompanyTypeEnum.java

@@ -29,7 +29,7 @@ public enum CompanyTypeEnum {
 
     FILLING("company","filling", "充装单位"),
 
-    INDIVIDUAL("company","individual", "个人"),
+    INDIVIDUAL("company","individual", "个人主体"),
 
     CONSTRUCTION("company","construction", "安装改造维修单位"),
 

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/JgEquipTransferServiceImpl.java

@@ -13,10 +13,10 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
@@ -545,10 +545,10 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         String companyType = getStringFromMap(companyTypeMap, "companyType");
 
         if ("company".equals(companyLevel) && companyType != null) {
-            if (companyType.contains("use")) {
+            if (companyType.contains(CompanyTypeEnum.USE.getCode()) || companyType.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
                 dto.setUseUnitCodeFilter(company.getCompanyCode());
             }
-            if (companyType.contains("construction")) {
+            if (companyType.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
                 dto.setInstallUnitCodeFilter(company.getCompanyCode());
             }
         }

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/JgMaintenanceContractServiceImpl.java

@@ -14,6 +14,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
@@ -111,12 +112,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             // 监管单位用"接收机构统一使用代码"匹配
             dto.setReceiveOrgCodeFilter(company.getCompanyCode());
         } else if ("company".equals(companyLevel)) {
-            if (companyType.contains("use")) {
+            if (companyType.contains(CompanyTypeEnum.USE.getCode()) || companyType.contains(CompanyTypeEnum.INDIVIDUAL.getCode())) {
                 // 使用单位用"使用单位统一信用代码"匹配数据
                 dto.setUseUnitCodeFilter(company.getCompanyCode());
                 dto.setRoleIds(null);
             }
-            if (companyType.contains("construction")) {
+            if (companyType.contains(CompanyTypeEnum.CONSTRUCTION.getCode())) {
                 // 维保单位用"维保单位统一信用代码"匹配数据
                 dto.setMaintenanceUnitCodeFilter(company.getCompanyCode());
             }