Merge remote-tracking branch 'origin/develop_tzs_feat/xzspj' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/CommonMapper.java

@@ -98,16 +98,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     List<String> refreshTheDetailsDataOfCompletedUsageRegistration(String since);
 
     /**
-     * 按照 地市或者区县查询所在的地市code
-     *
-     * @param receiveCompanyCode 地市或者区县code
-     * @param exclusionIds       需要排除的区县
-     * @return 地市code
-     */
-    String selectCityCompanyCode(@Param("receiveCompanyCode") String receiveCompanyCode, @Param("exclusionIds") String[] exclusionIds);
-
-
-    /**
      * 按照 地市或者区县查询对应行政区划seq
      *
      * @param receiveCompanyCode 地市或者区县companyCode

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -521,19 +521,6 @@
         WHERE "status" =  '已完成' and is_delete = 0
           AND "audit_pass_date" <![CDATA[<=]]> #{since}
     </select>
-    <select id="selectCityCompanyCode" resultType="string">
-        SELECT
-            c.company_code
-        FROM "privilege_company" c
-        where
-        c.company_code like concat(left(#{receiveCompanyCode}, 4), '%')
-        and c.level ='prefecture-level'
-        and c.company_type ='监管机构'
-        <foreach collection="exclusionIds" item="id" separator="" open="" close="">
-            and c.company_code != #{id}
-        </foreach>
-        limit 1
-    </select>
     <sql id="notice-query-where">
         <where>
             n.sequence_nbr = ne.equip_transfer_id

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

@@ -105,7 +105,6 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
     public static final String APPLY_STATUS = "applyStatus";
     public static final String APPLY_NO = "applyNo";
     public static final String APPLICATION_FORM_FILE_URL = "applicationFormFileUrl";
-    public static String JG_COMAPNY_TYPE = "监管机构";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
     private final List<String> ATTACHMENT_FIELD = Arrays.asList(APPLICATION_FORM_FILE, OTHER_ACCESSORIES);
     private static final String EQUIP_TRANSFER_PROCESS_KEY = "certReplenish";
@@ -365,7 +364,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
     public JgCertificateReplenish buildCertRep(Long sequenceNbr, JSONObject jsonObj, WorkflowResultDto workflowResultDto, FlowStatusEnum flowStatusEnum) {
         CompanyBo company = getSelectedOrgInfo().getCompany();
         AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
-        boolean isCompany = !company.getCompanyType().equals(JG_COMAPNY_TYPE);
+        boolean isCompany = company.getLevel().equals(BaseController.COMPANY_TYPE_COMPANY);
         String useUnitCode = "";
         String useUnitName = "";
         if (isCompany) {

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
@@ -121,7 +122,6 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     public final static String CHANGE_NAME_KEY = "changeName";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
 
-    public static String JG_COMAPNY_TYPE = "监管机构";
     private static String template = "发起【更名变更登记】业务申请，【申请单号：%s】";
     @Autowired
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
@@ -1083,7 +1083,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
             this.doCompensate(jgChangeRegistrationName);
             jgChangeRegistrationName.setReceiveOrgCode(jgChangeRegistrationName.getReceiveCompanyCode() + "_" + jgChangeRegistrationName.getReceiveOrgName());
             // 页面可编辑（当前登录人是发起人）且符合这个 监管机构 false
-            if (!JG_COMAPNY_TYPE.equals(reginParams.getCompany().getCompanyType())) {
+            if (BaseController.COMPANY_TYPE_COMPANY.equals(reginParams.getCompany().getLevel())) {
                 dtoMap.put("isInProvince", this.justIsInProvince(reginParams.getCompany().getCompanyCode()));
             } else {
                 dtoMap.put("isInProvince", false);

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

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.ShCarDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.ShCar;
 import com.yeejoin.amos.boot.module.jg.api.entity.ShCarEqu;
@@ -63,6 +64,7 @@ public class ShCarEquServiceImpl extends BaseService<ShCarEqu, ShCarEqu, ShCarEq
         BeanUtil.copyProperties(shCar, shCarDto);
         // 补充信息
         String companyType = reginParams.getCompany().getCompanyType();
+        String companyLevel =  reginParams.getCompany().getLevel();
         AgencyUserModel userModel = reginParams.getUserModel();
         shCarDto.setCompanyType(companyType);
         String[] code = reginParams.getCompany().getCompanyCode().split("_");
@@ -76,7 +78,7 @@ public class ShCarEquServiceImpl extends BaseService<ShCarEqu, ShCarEqu, ShCarEq
                 shCarDto.setUseUnitAddress(reginParams.getCompany().getAddress());
             }
         }
-        if ("false".equals(claimOneself) || "监管机构".equals(companyType)) {// 帮别人认领 取 原三环数据填充表单
+        if ("false".equals(claimOneself) || !BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel)) {// 帮别人或监管认领 取 原三环数据填充表单
             shCarDto.setUseUnitName(shCar.getOwner());
             shCarDto.setUseUnitCreditCode(shCar.getOwner());
             shCarDto.setUseUnitAddress(shCar.getAddress());

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

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -273,6 +274,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 		ReginParams selectedOrgInfo = getSelectedOrgInfo();
 		String companyType = selectedOrgInfo.getCompany().getCompanyType();
+		String companyLevel = selectedOrgInfo.getCompany().getLevel();
 
 		// 修改当前登录人选择的单位类型
 		tzBaseEnterpriseInfoDto.setUnitType(companyType);
@@ -284,7 +286,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 				.eq(BaseUnitLicence::getIsDelete, false));
 		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<>();
 		List<BaseUnitLicence> unitLicencesCollect = Optional.ofNullable(unitLicences).orElse(Collections.emptyList());
-		if (!"监管机构".equals(companyType)) {
+		if (BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel)) {
 			List<String> certTypeList = Arrays.asList(Optional.ofNullable(COMPANY_TYPE_CERT_TYPE_MAP.get(companyType))
 					.orElse("")
 					.split(","));