Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

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

@@ -453,7 +453,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtils.copyProperties(scrapCancel, taskMessageDto);
             taskModelDto.setModel(taskMessageDto);
-//            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquList(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
+            taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getEquListCode(), scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
             taskModelDto.setTaskCode(scrapCancel.getApplyNo());
             taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
             taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());

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

@@ -586,7 +586,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     // 数据参数
                     dto.setModel(taskMessageDto);
                     // 摘要
-                    dto.setTaskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
+//                    dto.setTaskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
+                    dto.setTaskContent("来自" + equType + "的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
                     // 申请单号
                     dto.setTaskCode(jgUseRegistration.getApplyNo());
                     // 业务类型
@@ -793,7 +794,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 String equType = this.baseMapper.getEquType(String.valueOf(map.get("EQU_LIST_CODE")));
                 TaskModelDto dto = TaskModelDto.builder()
                         .model(BeanUtil.copyProperties(useRegistration, TaskMessageDto.class))
-                        .taskContent("来自" + equType + "【" + (ObjectUtils.isEmpty(useRegistration.getSupervisoryCode()) ? "无" : useRegistration.getSupervisoryCode()) + "】等的业务办理,"
+                        .taskContent("来自" + equType + "的业务办理,"
                                 + "【申请单号：" + useRegistration.getApplyNo() + "】")
                         .taskCode(useRegistration.getApplyNo())
                         .taskType(String.valueOf(BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode()))
@@ -1392,7 +1393,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!jgUseRegistrationEqList.isEmpty()) {
             String equId = jgUseRegistrationEqList.get(0).getEquId();
             taskMessageDto.setEquipId(equId);
-            dto.setTaskContent("来自" + this.getBaseMapper().getEquType(equId) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
+//            dto.setTaskContent("来自" + this.getBaseMapper().getEquType(equId) + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
+            dto.setTaskContent("来自" + this.getBaseMapper().getEquType(equId) + "的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
         }
         dto.setModel(taskMessageDto);
         dto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
@@ -2693,15 +2695,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoService.getOne(lambdaDes);
                 designInfo.setDesignUnitCreditCode(String.valueOf(map.get("designUnitCreditCode")));
                 designInfo.setDesignUnitName(String.valueOf(map.get("designUnitName")));
-                designInfo.setDesignLicenseNum(String.valueOf(map.get("designLicenseNum")));
+                designInfo.setDesignLicenseNum(ObjectUtils.isEmpty(map.get("designLicenseNum")) ? null : String.valueOf(map.get("designLicenseNum")));
                 designInfo.setDesignUseDate(String.valueOf(map.get("designUseDate")));
                 designInfo.setDesignDate(DateUtil.parse(String.valueOf(map.get("designDate")), "yyyy-MM-dd"));
-                designInfo.setDrawingDo(String.valueOf(map.get("drawingDo")));
-                designInfo.setAppraisalUnit(String.valueOf(map.get("appraisalUnit")));
-                designInfo.setAppraisalDate(String.valueOf(map.get("appraisalDate")));
+                designInfo.setDrawingDo(ObjectUtils.isEmpty(map.get("drawingDo")) ? null : String.valueOf(map.get("drawingDo")));
+                designInfo.setAppraisalUnit(ObjectUtils.isEmpty(map.get("appraisalUnit")) ? null : String.valueOf(map.get("appraisalUnit")));
+                designInfo.setAppraisalDate(ObjectUtils.isEmpty(map.get("appraisalDate")) ? null : String.valueOf(map.get("appraisalDate")));
                 designInfo.setDesignDoc(JSONObject.toJSONString(map.get("designDoc")));
-                designInfo.setDesignStandard(JSONObject.toJSONString(map.get("designStandard")));
-                designInfo.setOtherAccessoriesDes(JSONObject.toJSONString(map.get("otherAccessoriesDes")));
+                designInfo.setDesignStandard(ObjectUtils.isEmpty(map.get("designStandard")) ? null : JSONObject.toJSONString(map.get("designStandard")));
+                designInfo.setOtherAccessoriesDes(ObjectUtils.isEmpty(map.get("otherAccessoriesDes")) ? null : JSONObject.toJSONString(map.get("otherAccessoriesDes")));
                 idxBizJgDesignInfoMapper.updateById(designInfo);
 
 
@@ -2714,14 +2716,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 idxBizJgFactoryInfo.setFactoryNum(String.valueOf(map.get("factoryNum")));
                 idxBizJgFactoryInfo.setProduceLicenseNum(String.valueOf(map.get("produceLicenseNum")));
                 idxBizJgFactoryInfo.setProduceDate(DateUtil.parse(String.valueOf(map.get("produceDate")), "yyyy-MM-dd"));
-                idxBizJgFactoryInfo.setImported(String.valueOf(map.get("imported")));
-                idxBizJgFactoryInfo.setProduceCountry(String.valueOf(map.get("produceCountry")));
-                idxBizJgFactoryInfo.setOtherAccessoriesFact(JSONObject.toJSONString(map.get("otherAccessoriesFact")));
+                idxBizJgFactoryInfo.setImported(ObjectUtils.isEmpty(map.get("imported")) ? null : String.valueOf(map.get("imported")));
+                idxBizJgFactoryInfo.setProduceCountry(ObjectUtils.isEmpty(map.get("produceCountry")) ? null : String.valueOf(map.get("produceCountry")));
+                idxBizJgFactoryInfo.setOtherAccessoriesFact(ObjectUtils.isEmpty(map.get("otherAccessoriesFact")) ? null : JSONObject.toJSONString(map.get("otherAccessoriesFact")));
                 idxBizJgFactoryInfo.setProductQualityYieldProve(JSONObject.toJSONString(map.get("productQualityYieldProve")));
-                idxBizJgFactoryInfo.setInsUseMaintainExplain(JSONObject.toJSONString(map.get("insUseMaintainExplain")));
-                idxBizJgFactoryInfo.setFactoryStandard(JSONObject.toJSONString(map.get("factoryStandard")));
-                idxBizJgFactoryInfo.setFactSupervisionInspectionReport(JSONObject.toJSONString(map.get("factSupervisionInspectionReport")));
-                idxBizJgFactoryInfo.setBoilerEnergyEfficiencyCertificate(JSONObject.toJSONString(map.get("boilerEnergyEfficiencyCertificate")));
+                idxBizJgFactoryInfo.setInsUseMaintainExplain(ObjectUtils.isEmpty(map.get("insUseMaintainExplain")) ? null : JSONObject.toJSONString(map.get("insUseMaintainExplain")));
+                idxBizJgFactoryInfo.setFactoryStandard(ObjectUtils.isEmpty(map.get("factoryStandard")) ? null : JSONObject.toJSONString(map.get("factoryStandard")));
+                idxBizJgFactoryInfo.setFactSupervisionInspectionReport(ObjectUtils.isEmpty(map.get("factSupervisionInspectionReport")) ? null : JSONObject.toJSONString(map.get("factSupervisionInspectionReport")));
+                idxBizJgFactoryInfo.setBoilerEnergyEfficiencyCertificate(ObjectUtils.isEmpty(map.get("boilerEnergyEfficiencyCertificate")) ? null : JSONObject.toJSONString(map.get("boilerEnergyEfficiencyCertificate")));
                 idxBizJgFactoryInfoMapper.updateById(idxBizJgFactoryInfo);
 
                 // 使用信息

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

@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jyjc.api.common.StringUtil;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResultAttachment;
@@ -116,6 +118,9 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
     @Autowired
     BizEmqPublisher bizEmqPublisher;
 
+    @Autowired
+    private ESEquipmentCategory esEquipmentCategory;
+
     /**
      * 检验检测单位分页查询
      */
@@ -293,9 +298,21 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         }
         //更新使用信息表
         useInfoMapper.updateByRecord(model.getEquipUnicode(), model.getNextInspectionDate(), model.getInspectionType(), model.getApplicationNo());
+        this.updateEquipNextInspectDate(model);
         return model;
     }
 
+    private void updateEquipNextInspectDate(JyjcInspectionResultModel model) {
+        if (model.getNextInspectionDate() != null) {
+            Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(model.getEquipUnicode());
+            if (optional.isPresent()) {
+                ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
+                esEquipmentCategoryDto.setNEXT_INSPECT_DATE(String.valueOf(model.getNextInspectionDate().getTime()));
+                esEquipmentCategory.save(esEquipmentCategoryDto);
+            }
+        }
+    }
+
     private void extracted(JyjcInspectionResultModel model, InspectionDetectionInfo info, JyjcInspectionResultAttachment jybgFile) {
         info.setInspectOrgName(model.getInspectionUnitName());
         info.setInspectType(model.getInspectionType());

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/ZLStatisticsMapper.java

@@ -28,4 +28,8 @@ public interface ZLStatisticsMapper {
     String getOrgCodeByCompanyCode(@Param("cityCode") String cityCode);
 
     List<Map<String, String>> userCountNew(@Param("screenDto") DPFilterParamDto screenDto, @Param("unitTypeList") List<String> unitTypeList);
+
+    Long countCompanyForCertDateTimeOut(@Param("dto") DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode, @Param("limitDate") String limitDate);
+
+    Long countCompanyForCertDateTemporary(@Param("dto")DPFilterParamDto dpFilterParamDto, @Param("orgCode") String orgCode, @Param("limitDate") String limitDate);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/ZLStatisticsMapper.xml

@@ -69,7 +69,34 @@
 			</foreach>
 		  </if>
 	</select>
-
+	<sql id="countCompanyNumber">
+		select
+			count(1)
+		from
+			(
+			SELECT
+				(select min(l.expiry_date)  from tz_base_unit_licence l where l.unit_code = b.use_unit_code) as expiry_date
+			FROM
+				"tz_base_enterprise_info" b
+			where
+				1=1
+				and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
+				and operating_status = '在业'
+				and register_type !='个人主体'
+				and expiry_date is not null
+			) a
+	</sql>
+	<select id="countCompanyForCertDateTimeOut" resultType="java.lang.Long">
+		<include refid="countCompanyNumber"/>
+		where
+			a.expiry_date  <![CDATA[<]]> #{limitDate}
+	</select>
+	<select id="countCompanyForCertDateTemporary" resultType="java.lang.Long">
+		<include refid="countCompanyNumber"/>
+		where
+			a.expiry_date >= current_date
+			and a.expiry_date <![CDATA[<=]]> #{limitDate}
+	</select>
 </mapper>
 
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/logback-dev.xml

@@ -8,7 +8,7 @@
     <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/jyjc.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/statistics.log.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <!--日志文件大小-->

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/BaseInstitutionRegisterDto.java

@@ -121,4 +121,10 @@ public class BaseInstitutionRegisterDto extends BaseDto {
     @ApiModelProperty(value = "平台用户id,平台创建用户后更新")
     private String adminUserId;
 
+    @ApiModelProperty(value = "省内办公地址省#市#区")
+    private String officeRegion;
+
+    @ApiModelProperty(value = "省内办公详细地址")
+    private String officeAddress;
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java

@@ -309,6 +309,12 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	@ApiModelProperty(value = "企业标签信息")
 	private String regulatoryLabels;
 
+	@ApiModelProperty(value = "省内办公地址省#市#区")
+	private List<Integer> officeRegion;
+
+	@ApiModelProperty(value = "省内详细办公地址")
+	private String officeAddress;
+
 	// 注册类型
 	private String registerType;
 

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

@@ -196,4 +196,10 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
 
     @ApiModelProperty(value = "企业问题状态")
     private String status;
+
+    @ApiModelProperty(value = "省内办公地址省#市#区")
+    private String officeRegion;
+
+    @ApiModelProperty(value = "省内详细办公地址")
+    private String officeAddress;
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/api/dto/RegUnitInfoDto.java

@@ -146,6 +146,13 @@ public class RegUnitInfoDto extends BaseDto {
     @ApiModelProperty(value = "单位所在地是否为全国")
     private String isNationwide;
 
+
+    @ApiModelProperty(value = "省内办公地址省#市#区")
+    private String officeRegion;
+
+    @ApiModelProperty(value = "省内详细办公地址")
+    private String officeAddress;
+
     /**
      * 气站对接appId
      */

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

@@ -305,6 +305,13 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	private TzBaseEnterpriseInfoDto getDetail(TzBaseEnterpriseInfo tzBaseEnterpriseInfo){
 		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(tzBaseEnterpriseInfo.getSequenceNbr());
+		if(!ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getOfficeRegion())){
+			List<Integer> officeRegion = new ArrayList<>();
+			for (String s : tzBaseEnterpriseInfo.getOfficeRegion().split("#")) {
+				officeRegion.add(Integer.valueOf(s));
+			}
+			tzBaseEnterpriseInfoDto.setOfficeRegion(officeRegion);
+		}
 		RegUnitIcDto regUnitIcDto = tzBaseEnterpriseInfoDto.getRegUnitIcDto();
 		String creditCode = tzBaseEnterpriseInfoDto.getUseCode();
 		if (!ObjectUtils.isEmpty(tzBaseEnterpriseInfo.getRegisterType()) && tzBaseEnterpriseInfo.getRegisterType().contains(UnitTypeEnum.grzt.getName())) {
@@ -593,7 +600,13 @@ public class TzBaseEnterpriseInfoServiceImpl
 		tzBaseEnterpriseInfo.setSuperviseOrgName(ObjectUtils.isEmpty(map.get("superviseOrgName")) ? null : String.valueOf(map.get("superviseOrgName")));
 		tzBaseEnterpriseInfo.setOtherAccessories(ObjectUtils.isEmpty(map.get("otherAccessories")) ? null : JSON.toJSONString(map.get("otherAccessories")));
 		tzBaseEnterpriseInfo.setLegalPerson(ObjectUtils.isEmpty(map.get("legalPerson")) ? null : (String)map.get("legalPerson"));
-
+		String officeRegion = null;
+		if(!ObjectUtils.isEmpty(map.get("officeRegion"))){
+			List list = (List<Object>) map.get("officeRegion");
+			officeRegion = list.stream().map(String::valueOf).collect(Collectors.joining("#")).toString();
+		}
+		tzBaseEnterpriseInfo.setOfficeRegion(officeRegion);
+		tzBaseEnterpriseInfo.setOfficeAddress(ObjectUtils.isEmpty(map.get("officeAddress")) ? null : (String)map.get("officeAddress"));
 		// 修改事业单位信息
 		TzsBaseInstitutionDto baseInstitutionDto =  JSON.toJavaObject(JSON.parseObject(JSON.toJSONString(map.get("regUnitMessage"))), TzsBaseInstitutionDto.class);
 		if (!ValidationUtil.isEmpty(baseInstitutionDto)) {

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

 package com.yeejoin.amos.boot.module.tcm.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.tcm.api.dto.AccountDto;
 import com.yeejoin.amos.boot.module.tcm.api.dto.BaseInstitutionRegisterDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzsBaseInstitution;
 import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsBaseInstitutionMapper;
 import com.yeejoin.amos.boot.module.tcm.api.service.ITzsBaseInstitutionService;
-import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.RegUnitInfoDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitInfoServiceImpl;
@@ -21,16 +22,15 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/controller/UnitInfoController.java

@@ -105,6 +105,18 @@ public class UnitInfoController extends BaseController {
 	}
 
 	/**
+	 * 获取提级后组织机构树
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
+	@GetMapping(value = "/region/step/tree")
+	@ApiOperation(httpMethod = "GET", value = "获取提级后组织机构树", notes = "获取提级后组织机构树")
+	public ResponseModel<Collection<RegionModel>> getRegionStepTree() {
+		return ResponseHelper.buildResponse(unitInfoServiceImpl.getRegionStepTree());
+	}
+
+	/**
 	 * 获取全国行政区划树
 	 *
      */

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

@@ -400,6 +400,8 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
         if (type.equals(EnterpriseEnums.GR_ZT.getType())) {
             baseEnterpriseInfo.setUseUnitCode(regUnitInfo.getUnitCode().split("_")[1]);
         } else {
+            baseEnterpriseInfo.setOfficeRegion(regUnitInfo.getOfficeRegion());
+            baseEnterpriseInfo.setOfficeAddress(regUnitInfo.getOfficeAddress());
             baseEnterpriseInfo.setProvince(regUnitInfo.getProvince());
             baseEnterpriseInfo.setCity(regUnitInfo.getCity());
             baseEnterpriseInfo.setDistrict(regUnitInfo.getDistrict());

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -10,6 +11,7 @@ import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
 import com.yeejoin.amos.boot.module.common.api.service.ISourceFileService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
@@ -20,6 +22,7 @@ import com.yeejoin.amos.boot.module.tcm.api.enums.TzsCommonParam;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.TzsAuthServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.WechatRelationServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.biz.service.impl.WechatServiceImpl;
+import com.yeejoin.amos.boot.module.tcm.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.tcm.biz.utils.RedisUtil;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.UnitInfoApproveDto;
 import com.yeejoin.amos.boot.module.tcm.flc.api.dto.UnitInfoDto;
@@ -36,12 +39,14 @@ import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -64,6 +69,9 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
 
     private final Logger logger = LogManager.getLogger(UnitInfoServiceImpl.class);
 
+    @Value("classpath:/json/stepRegion.json")
+    private Resource stepRegin;
+
     @Autowired
     private TzsAuthServiceImpl tzsAuthServiceImpl;
 
@@ -653,6 +661,108 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto, UnitInfo, Unit
         return result;
     }
 
+
+    public Collection<RegionModel> getRegionStepTree() {
+        Collection<RegionModel> result = getRegionTree(null, null);
+        // 将原有树结构中需要提级的行政区划删除
+        result = getStepResult(result);
+        // 删除三级的行政区划
+        result = deleteThreeLevel(result);
+
+        // 获取需要提级的行政区划
+        /**
+         * 注：目前使用的是在线文档https://docs.qq.com/sheet/DVXFlQUtCZXhDV0Jl?tab=BB08J2中需要提级的行政区划数据
+         * 如需使用从平台中行政区划的数据中获取提级，调用方法getOriginalStepRegion(Collection<RegionModel> children)即可
+         */
+        Map<String,Map<String,Object>> stepRegion = getStepRegion();
+        // 将需要提级的行政区划进行提级赋值
+        for (RegionModel regionModel : result) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            Collection<RegionModel> children = regionModel.getChildren();
+            children.add(objectMapper.convertValue(stepRegion.get("hcRegionModel"),RegionModel.class));
+            children.add(objectMapper.convertValue(stepRegion.get("ylRegionModel"),RegionModel.class));
+            children.add(objectMapper.convertValue(stepRegion.get("xxRegionModel"),RegionModel.class));
+        }
+        return result;
+    }
+
+
+    private Collection<RegionModel> getStepResult(Collection<RegionModel> result) {
+        Iterator<RegionModel> iterator = result.iterator();
+        if (!ObjectUtils.isEmpty(result)) {
+            while (iterator.hasNext()) {
+                RegionModel region = iterator.next();
+                if (ReginStepEnum.HANCHENG.getCode().equals(region.getRegionCode().toString())) {
+                    iterator.remove();
+                } else if (ReginStepEnum.YANGLING.getCode().equals(region.getRegionCode().toString())) {
+                    iterator.remove();
+                } else if (!ObjectUtils.isEmpty(region.getChildren()) && region.getRegionCode().toString().endsWith("00")) {
+                    getStepResult(region.getChildren());
+                }
+            }
+        }
+        return result;
+    }
+
+    private Collection<RegionModel> deleteThreeLevel(Collection<RegionModel> result) {
+        Iterator<RegionModel> iterator = result.iterator();
+        if (!ObjectUtils.isEmpty(result)) {
+            while (iterator.hasNext()) {
+                RegionModel region = iterator.next();
+                if ("3".equals(region.getLevel())) {
+                    region.setChildren(null);
+                }
+                if (!ObjectUtils.isEmpty(region.getChildren())) {
+                    deleteThreeLevel(region.getChildren());
+                }
+            }
+        }
+        return result;
+    }
+
+    private Map<String, Map<String,Object>> getStepRegion() {
+        Map<String, Map<String,Object>> resultMap = new HashMap<>();
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(stepRegin);
+        for (Map<String, Object> map : resourceJson.get("stepRegin")) {
+            if (ReginStepEnum.HANCHENG.getCode().equals(map.get("regionCode").toString())) {
+                resultMap.put("hcRegionModel", map);
+            } else if (ReginStepEnum.YANGLING.getCode().equals(map.get("regionCode").toString())) {
+                resultMap.put("ylRegionModel", map);
+            } else {
+                resultMap.put("xxRegionModel", map);
+            }
+        }
+        return  resultMap;
+    }
+
+    // 获取原始行政区划中需要提级的行政区划
+    private Map<String, Object> getOriginalStepRegion(Collection<RegionModel> children) {
+        Map<String, Object> map = new HashMap<>();
+        Iterator<RegionModel> iterator = children.iterator();
+        while (iterator.hasNext()) {
+            RegionModel region = iterator.next();
+            if ("610500".equals(region.getRegionCode().toString())) {
+                Iterator<RegionModel> iterator1 = region.getChildren().iterator();
+                while (iterator1.hasNext()) {
+                    RegionModel region1 = iterator1.next();
+                    if (ReginStepEnum.HANCHENG.getCode().equals(region1.getRegionCode().toString())) {
+                        map.put("hcRegionModel", region1);
+                    }
+                }
+            }
+            if ("610400".equals(region.getRegionCode().toString())) {
+                Iterator<RegionModel> iterator1 = region.getChildren().iterator();
+                while (iterator1.hasNext()) {
+                    RegionModel region1 = iterator1.next();
+                    if (ReginStepEnum.YANGLING.getCode().equals(region1.getRegionCode().toString())) {
+                        map.put("ylRegionModel", region1);
+                    }
+                }
+            }
+        }
+        return map;
+    }
+
     public Collection<RegionModel> getAllRegionTree(String isNationwide) {
         Collection<RegionModel> result;
         // isNationwide = null 获取陕西省行政区划，其他获取全国行政区划

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/resources/json/stepRegion.json

+{
+  "stepRegin": [
+    {
+      "parentId": "0",
+      "regionCode": 617000,
+      "parentRegionCode": 0,
+      "regionName": "西咸新区",
+      "level": "2",
+      "levelName": "",
+      "agencyCode": "tzs",
+      "sequenceNbr": "1402458558599617000",
+      "children": [
+        {
+          "parentId": "1402458558599617000",
+          "regionCode": 617001,
+          "parentRegionCode": 617000,
+          "regionName": "秦汉新城",
+          "level": "3",
+          "levelName": "",
+          "agencyCode": "tzs",
+          "sequenceNbr": "1402458558599617001",
+          "children": []
+        },
+        {
+          "parentId": "1402458558599617000",
+          "regionCode": 617002,
+          "parentRegionCode": 617000,
+          "regionName": "泾河新城",
+          "level": "3",
+          "levelName": "",
+          "agencyCode": "tzs",
+          "sequenceNbr": "1402458558599617002",
+          "children": []
+        },
+        {
+          "parentId": "1402458558599617000",
+          "regionCode": 617003,
+          "parentRegionCode": 617000,
+          "regionName": "沣东新城",
+          "level": "3",
+          "levelName": "",
+          "agencyCode": "tzs",
+          "sequenceNbr": "1402458558599617003",
+          "children": []
+        },
+        {
+          "parentId": "1402458558599617000",
+          "regionCode": 617004,
+          "parentRegionCode": 617000,
+          "regionName": "空港新城",
+          "level": "3",
+          "levelName": "",
+          "agencyCode": "tzs",
+          "sequenceNbr": "1402458558599617004",
+          "children": []
+        },
+        {
+          "parentId": "1402458558599617000",
+          "regionCode": 617005,
+          "parentRegionCode": 617000,
+          "regionName": "沣西新城",
+          "level": "3",
+          "levelName": "",
+          "agencyCode": "tzs",
+          "sequenceNbr": "1402458558599617005",
+          "children": []
+        }
+      ]
+    },
+    {
+      "parentId": "0",
+      "regionCode": 610403,
+      "parentRegionCode": 0,
+      "regionName": "杨凌示范区",
+      "level": "2",
+      "levelName": "",
+      "longitude": "",
+      "latitude": "",
+      "agencyCode": "tzs",
+      "sequenceNbr": "1402458558599610403",
+      "children": []
+    },
+    {
+      "parentId": "0",
+      "regionCode": 610581,
+      "parentRegionCode": 0,
+      "regionName": "韩城市",
+      "level": "2",
+      "levelName": "",
+      "longitude": "",
+      "latitude": "",
+      "agencyCode": "tzs",
+      "sequenceNbr": "1402458558599610581",
+      "children": []
+    }
+  ]
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -224,6 +224,7 @@
 		 	 1=1
 		 	and ((supervise_org_code != '50' and supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (supervise_org_code = '50' and office_region LIKE CONCAT ('%', #{cityCode}, '%')))
 		 	and operating_status = #{operatingStatus}
+		 	and register_type !='个人主体'
 	</select>
 	<select id="queryByUseCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">
 		select * from tz_base_enterprise_info where use_code in