Merge remote-tracking branch 'origin/develop_tzs_bugfix' into develop_tzs_bugfix

amos-boot-data/amos-boot-data-accessapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SSOServiceImpl.java

@@ -4,17 +4,23 @@ import cn.hutool.core.util.URLUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.api.openapi.face.orm.entity.SSOAccountRelation;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.feign.model.Page;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.LoginInfoModel;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+import com.yeejoin.amos.feign.privilege.model.VerifyCodeAuthModel;
+import com.yeejoin.amos.feign.privilege.util.AesUtil;
 import com.yeejoin.amos.openapi.enums.SSOLoginStatusEnum;
 import com.yeejoin.amos.openapi.enums.TaAccessConfigBizeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.Date;
-import java.util.List;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -29,6 +35,9 @@ public class SSOServiceImpl  {
 	@Autowired
 	private SSOAccountRelationServiceImpl ssoAccountRelationService;
 
+	@Autowired
+	AmosRequestContext amosRequestContext;
+
 	public Map<String, String> getPlatformUserInfo(String portalCode) {
 		// 获取统一门户accessToken
 		String accessToken = getPortalAccessToken(portalCode);
@@ -53,20 +62,41 @@ public class SSOServiceImpl  {
 			ssoAccountRelationService.save(ssoAccountRelation);
 			return null;
 		}
-		// 存在两个平台用户对应关系并且登录状态(LoginStatus)为1，则用查到的用户信息登录监管平台
-		if (ssoAccountRelation.getLoginStatus().equals(SSOLoginStatusEnum.SUCCESS.getCode())) {
-			// 1.查询监管平台用户登录信息（loginId和password）
-			List<LoginInfoModel> agencyUserClientList = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.getLoginInfoList(userPhoneNumber));
-			if (ValidationUtil.isEmpty(agencyUserClientList)) {
-				ssoAccountRelation.setLoginStatus(SSOLoginStatusEnum.FAILED.getCode());
-				ssoAccountRelationService.updateById(ssoAccountRelation);
+		RequestContext.setProduct(amosRequestContext.getProduct());
+		RequestContext.setAppKey(amosRequestContext.getAppKey());
+		RequestContext.setToken(amosRequestContext.getToken());
+		// 1.查询监管平台用户信息
+		Page<AgencyUserModel> agencyUserModelList = FeignUtil.remoteCall(() -> Privilege.agencyUserClient.queryForPage(null, null, userPhoneNumber, null, 1, 100));
+		if (ValidationUtil.isEmpty(agencyUserModelList) || agencyUserModelList.getTotal() == 0) {
+			ssoAccountRelation.setLoginStatus(SSOLoginStatusEnum.FAILED.getCode());
+			ssoAccountRelationService.updateById(ssoAccountRelation);
+			return null;
+		}  else {
+			ssoAccountRelation.setLoginStatus(SSOLoginStatusEnum.SUCCESS.getCode());
+			// 2.登录监管平台
+			Map<String, String> agencyUserModel = (Map<String, String>) agencyUserModelList.getRecords().get(0);
+			VerifyCodeAuthModel verifyCodeAuthModel = new VerifyCodeAuthModel();
+			verifyCodeAuthModel.setLoginId(agencyUserModel.get("userName"));
+			verifyCodeAuthModel.setVerifyCode(AesUtil.encode(agencyUserModel.get("userName"),"qaz"));
+			FeignClientResult<Map<String, String>> loginResult;
+			loginResult = Privilege.authClient.userNameVerifyCode(verifyCodeAuthModel);
+			if (loginResult.getStatus() != 200) {
 				return null;
 			}
-			// 2.登录监管平台
+			ssoAccountRelationService.updateById(ssoAccountRelation);
+			String amosUserId = loginResult.getResult().get("userId");
+			String amosToken = loginResult.getResult().get("token");
 			// 3.为用户授权应用
+			RequestContext.setToken(amosToken);
+			RequestContext.setAgencyCode("tzs");
+			RequestContext.setExeUserId(amosUserId);
+			FeignUtil.remoteCall(() -> Privilege.applicationClient.queryUserService());
 			// 4.返回监管平台用户登录信息
+			Map<String, String> result = new HashMap<>();
+			result.put("amosToken", amosToken);
+			result.put("amosUserId", amosUserId);
+			return result;
 		}
-		return null;
 	}
 
 	/**

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
 
 /**
  * 安装告知设备关系表 Mapper 接口
@@ -11,4 +13,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JgInstallationNoticeEqMapper extends CustomBaseMapper<JgInstallationNoticeEq> {
 
+
+    /**
+     * 查询安装告知完成但是纳管状态非已纳管的管道
+     *
+     * @return List<JgInstallationNoticeEq> 管道record数组
+     */
+    List<JgInstallationNoticeEq> selectErrorRecordOfInIntoManage();
 }

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

@@ -52,4 +52,11 @@ public interface JgInstallationNoticeMapper extends CustomBaseMapper<JgInstallat
     List<Map<String, Object>> getDeviceListByProjectContraption(@Param("projectContraptionSeq") String projectContraptionSeq);
 
     List<Map<String, Object>> getPipelineEquInfoByRecords(@Param("records") List<String> records);
+
+    /**
+     * 安装使用登记查询关联的安装告知
+     * @param useRegisterId 使用登记id
+     * @return 登记关联的告知
+     */
+    JgInstallationNotice selectNoticeDataByUseRegisterId(@Param("useRegisterId") String useRegisterId );
 }

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

@@ -121,4 +121,5 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
      * @return List<Map<String, Object>>
      */
     List<Map<String, Object>> selectPieLineListByOfCanReg(@Param("projectContraptionSeq") String projectContraptionSeq);
+
 }

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

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper">
 
+    <select id="selectErrorRecordOfInIntoManage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq">
+        SELECT
+            ne.equ_id
+        FROM
+            "tzs_jg_installation_notice" n,
+            tzs_jg_installation_notice_eq ne,
+            "idx_biz_jg_use_info" u
+        WHERE
+            n.notice_status = '6616'
+            and ne.equip_transfer_id = n.sequence_nbr
+            and ne.equ_id = u."RECORD"
+            and (u."IS_INTO_MANAGEMENT" = false or u."IS_INTO_MANAGEMENT" is null)
+            and n.project_contraption <![CDATA[<>]]> ''
+    </select>
 </mapper>

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

@@ -315,6 +315,25 @@
 
         </where>
     </select>
-
-
+    <select id="selectNoticeDataByUseRegisterId" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice">
+        SELECT
+            n.sequence_nbr,
+            n.project_contraption,
+            n.project_contraption_id,
+            ne.equ_id as remark
+        FROM
+            "tzs_jg_installation_notice" n,
+            tzs_jg_installation_notice_eq ne
+        WHERE
+            n.notice_status = '6616'
+          and ne.equip_transfer_id = n.sequence_nbr
+          and ne.equ_id = (
+            select
+                re.equ_id
+            from
+                tzs_jg_use_registration_eq re
+            where
+                re.equip_transfer_id = #{useRegisterId} limit 1
+            )
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataHandlerController.java

@@ -69,4 +69,21 @@ public class DataHandlerController extends BaseController {
         return ResponseHelper.buildResponse(true);
     }
 
+
+    @ApiOperation(httpMethod = "PUT", value = "安装告知缺少装置id、装置未创建、安装告知完成但是设备状态为未纳管数据处理", notes = "历史数据处理")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/v3/projectContraption/notice")
+    public ResponseModel<Boolean> projectContraptionNoticeDataDealV3(){
+        dataHandlerService.projectContraptionNoticeDataDeal();
+        return ResponseHelper.buildResponse(true);
+    }
+
+    @ApiOperation(httpMethod = "PUT", value = "使用登记缺少装置id数据处理", notes = "历史数据处理,依赖/v3/projectContraption/notice作为基础数据")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/v3/projectContraption/useRegister")
+    public ResponseModel<Boolean> projectContraptionUseRegisterDataDealV3(){
+        dataHandlerService.projectContraptionUseRegisterDataDeal();
+        return ResponseHelper.buildResponse(true);
+    }
+
 }

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

@@ -13,13 +13,13 @@ 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.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.PipelineEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.BaseUnitLicenceMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
@@ -27,6 +27,8 @@ import org.springframework.util.StopWatch;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
@@ -86,8 +88,9 @@ public class DataHandlerServiceImpl {
 
     @Resource
     TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
-    @Autowired
-    private BaseUnitLicenceMapper baseUnitLicenceMapper;
+
+    @Resource
+    private JgInstallationNoticeEqMapper jgInstallationNoticeEqMapper;
 
 
     /**
@@ -522,4 +525,178 @@ public class DataHandlerServiceImpl {
             }
         });
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void projectContraptionNoticeDataDeal() {
+        // 1.安装告知完成但是设备状态未非已纳管状态：设备的idx_biz_jg_use_info表的IS_INTO_MANAGEMENT刷为已纳管, es的IS_INTO_MANAGEMENT刷为已纳管
+        List<JgInstallationNoticeEq> eqs = jgInstallationNoticeEqMapper.selectErrorRecordOfInIntoManage();
+        log.info("处理前：1.安装告知完成但是设备状态未非已纳管状态的设备数量：{}", eqs.size());
+        for(JgInstallationNoticeEq eq : eqs){
+            // 使用信息表刷已纳管
+            useInfoService.lambdaUpdate()
+                    .set(IdxBizJgUseInfo::getIsIntoManagement, true)
+                    .eq(IdxBizJgUseInfo::getRecord, eq.getEquId())
+                    .update();
+            // es刷已纳管
+            Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(eq.getEquId());
+            equInfosWithEs.ifPresent(equInfoEs -> {
+                    equInfoEs.setIS_INTO_MANAGEMENT(true);
+                    esEquipmentCategory.save(equInfoEs);
+            });
+        }
+        // 2.安装告知非已作废，但是缺少装置的数据处理：创建装置(计算管道长度)、写入安装告知表project_contraption_id、写入设备es的装置id，设备使用信息表的projectContraptionId
+        List<JgInstallationNotice> noticeList = getErrorInstallNoticeData();
+        log.info("处理前：2.安装告知非已作废，但是缺少装置id安装告知单据数量：{}", noticeList.size());
+        List<IdxBizJgProjectContraption> projectContraptionList = new ArrayList<>();
+        Map<Long, List<String>> projectContraptionIdRecordsMap = new HashMap<>();
+        for(JgInstallationNotice installationNotice : noticeList){
+            List<JgInstallationNoticeEq> noticeEqs = installationNoticeEqService.list(new LambdaQueryWrapper<JgInstallationNoticeEq>().eq(JgInstallationNoticeEq::getEquipTransferId, installationNotice.getSequenceNbr()).select(JgInstallationNoticeEq::getEquId));
+            List<String> records = noticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList());
+            List<IdxBizJgUseInfo> useInfos  = useInfoService.lambdaQuery()
+            .in(IdxBizJgUseInfo::getRecord, records)
+            .list();
+            //技术参数表
+            List<IdxBizJgTechParamsPipeline> idxBizJgTechParamsPipelines = useInfos.isEmpty() ? new ArrayList<>() : techParamsPipelineService
+                    .lambdaQuery()
+                    .in(IdxBizJgTechParamsPipeline::getRecord, records)
+                    .list();
+            double pipeLengthSum = idxBizJgTechParamsPipelines.stream()
+                    .filter(Objects::nonNull)
+                    .filter(pip -> Objects.nonNull(pip.getPipeLength()))
+                    .mapToDouble(pipeline -> Double.parseDouble(pipeline.getPipeLength()))
+                    .sum();
+            BigDecimal pipeLengthSumBig = new BigDecimal(String.valueOf(pipeLengthSum)).setScale(3, RoundingMode.HALF_UP);
+
+            IdxBizJgRegisterInfo registerInfo = registerInfoService.lambdaQuery()
+                    .eq(IdxBizJgRegisterInfo::getRecord, useInfos
+                            .stream().findFirst().orElse(new IdxBizJgUseInfo())
+                            .getRecord())
+                    .one();
+
+            IdxBizJgFactoryInfo factoryInfo = factoryInfoService.lambdaQuery()
+                    .eq(IdxBizJgFactoryInfo::getRecord, useInfos
+                            .stream()
+                            .findFirst().orElse(new IdxBizJgUseInfo())
+                            .getRecord())
+                    .one();
+            Long sequenceNbr = sequence.nextId();
+            installationNotice.setProjectContraptionId(sequenceNbr + "");
+            projectContraptionIdRecordsMap.put(sequenceNbr, records);
+            IdxBizJgProjectContraption idxBizJgProjectContraption = IdxBizJgProjectContraption.builder()
+                    .projectContraption(installationNotice.getProjectContraption())
+                    .projectContraptionNo(installationNotice.getProjectContraption())
+                    .uscUnitCreditCode(installationNotice.getInstallUnitCreditCode())
+                    .uscUnitName(installationNotice.getInstallUnitName())
+                    .equList(installationNotice.getEquListCode())
+                    .equListName(installationNotice.getEquList())
+                    .equCategory(installationNotice.getEquCategoryCode())
+                    .equCategoryName(ObjectUtils.isEmpty(installationNotice.getEquCategoryCode()) ? null : equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, installationNotice.getEquCategoryCode())).getName())
+                    .equDefine(ObjectUtils.isEmpty(registerInfo) ? null : registerInfo.getEquDefine())
+                    .equDefineName(ObjectUtils.isEmpty(ObjectUtils.isEmpty(registerInfo) ? null : registerInfo.getEquDefine()) ? null : equipmentCategoryMapper.selectOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, (ObjectUtils.isEmpty(registerInfo) ? null : registerInfo.getEquDefine()))).getName())
+                    .content(null)
+                    .pipelineLength(pipeLengthSumBig.doubleValue())
+                    .productPhoto(ObjectUtils.isEmpty(registerInfo) ? null : registerInfo.getProductPhoto())
+                    .productQualificationCertificate(ObjectUtils.isEmpty(factoryInfo) ? null : factoryInfo.getProductQualityYieldProve())
+                    .otherAccessories(installationNotice.getOtherAccessories())
+                    .orgCode(installationNotice.getOrgBranchCode())
+                    .orgName(installationNotice.getOrgBranchName())
+                    .province(installationNotice.getProvince())
+                    .provinceName(installationNotice.getProvinceName())
+                    .city(installationNotice.getCity())
+                    .cityName(installationNotice.getCityName())
+                    .county(installationNotice.getCounty())
+                    .countyName(installationNotice.getCountyName())
+                    .street(installationNotice.getStreet())
+                    .streetName(installationNotice.getStreetName())
+                    .address(installationNotice.getAddress())
+                    .startLatitudeLongitude(ObjectUtils.isEmpty(idxBizJgTechParamsPipelines) ? null : idxBizJgTechParamsPipelines.get(0).getStartePosition())
+                    .endLatitudeLongitude(ObjectUtils.isEmpty(idxBizJgTechParamsPipelines) ? null : idxBizJgTechParamsPipelines.get(0).getEndPosition())
+                    .supervisoryCode(installationNotice.getSupervisoryCode())
+                    .isIntoManagement(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()).equals(installationNotice.getNoticeStatus()))
+                    .dataSource("jg")
+                    .build();
+            idxBizJgProjectContraption.setSequenceNbr(sequenceNbr);
+            idxBizJgProjectContraption.setRecDate(new Date());
+            idxBizJgProjectContraption.setIsDelete(Boolean.FALSE);
+            projectContraptionList.add(idxBizJgProjectContraption);
+        }
+        if(!noticeList.isEmpty()){
+            installationNoticeService.updateBatchById(noticeList);
+        }
+        if(!projectContraptionList.isEmpty()){
+            projectContraptionService.saveBatch(projectContraptionList);
+        }
+        projectContraptionIdRecordsMap.forEach((k,v)->{
+            Iterable<ESEquipmentCategoryDto> equipmentCategories = esEquipmentCategory.findAllById(v);
+            equipmentCategories.forEach(e-> e.setProjectContraptionId(k + ""));
+            esEquipmentCategory.saveAll(equipmentCategories);
+        });
+        List<JgInstallationNoticeEq> eqsAfter = jgInstallationNoticeEqMapper.selectErrorRecordOfInIntoManage();
+        log.info("处理后：3.安装告知完成但是设备状态未非已纳管状态的设备数量：{}", eqsAfter.size());
+        List<JgInstallationNotice> noticeListAfter = getErrorInstallNoticeData();
+        log.info("处理后：4.安装告知非已作废，但是缺少装置id安装告知单据数量：{}", noticeListAfter.size());
+    }
+
+    private List<JgInstallationNotice> getErrorInstallNoticeData() {
+        return installationNoticeService.list(new LambdaQueryWrapper<JgInstallationNotice>()
+                .ne(JgInstallationNotice::getNoticeStatus, FlowStatusEnum.TO_BE_DISCARD.getCode())
+                .ne(JgInstallationNotice::getProjectContraption, "")
+                .isNull(JgInstallationNotice::getProjectContraptionId));
+    }
+
+    /**
+     * 刷使用登记缺少装置id的管道的登记数据：1.填充装置id；2.已完成状状态清除装置表的安装单位信息字段,补充使用信息字段
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void projectContraptionUseRegisterDataDeal(){
+        // 查询使用登记：非作废状态 有装置名称但是缺少装置id的使用登记单据进行数据处理
+        List<JgUseRegistration> useRegistrations = getUseRegisterOfError();
+        log.info("处理前：1.使用登记装置id历史数据填充，存在缺少装置id的单据数量：{}", useRegistrations.size());
+        // 循环按照使用登记的eq表关联安装告知eq表，在安装告知主表查询装置id
+        for(JgUseRegistration useRegistration : useRegistrations){
+            // 登记的关联的告知单据
+            JgInstallationNotice installationNotice = installationNoticeService.getBaseMapper().selectNoticeDataByUseRegisterId(useRegistration.getSequenceNbr() + "");
+            if(installationNotice != null && StringUtils.isNotEmpty(installationNotice.getProjectContraptionId())){
+                // 1.填充装置id
+                useRegistration.setProjectContraptionId(installationNotice.getProjectContraptionId());
+                // 2.已完成状状态清除装置表的安装单位信息字段,填充使用信息数据，
+                if(FlowStatusEnum.TO_BE_FINISHED.getName().equals(useRegistration.getStatus())){
+                    IdxBizJgUseInfo useInfo = getIdxBizJgUseInfo(installationNotice.getRemark());
+                    LambdaUpdateWrapper<IdxBizJgProjectContraption> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(BaseEntity::getSequenceNbr, installationNotice.getProjectContraptionId());
+                    updateWrapper.set(IdxBizJgProjectContraption::getUscUnitCreditCode ,null);
+                    updateWrapper.set(IdxBizJgProjectContraption::getUscUnitName,null);
+                    updateWrapper.set(IdxBizJgProjectContraption::getUseRegistrationCode, useRegistration.getUseRegistrationCode());
+                    updateWrapper.set(IdxBizJgProjectContraption::getProvince, useInfo.getProvince());
+                    updateWrapper.set(IdxBizJgProjectContraption::getProvinceName, useInfo.getProvinceName());
+                    updateWrapper.set(IdxBizJgProjectContraption::getCity, useInfo.getCity());
+                    updateWrapper.set(IdxBizJgProjectContraption::getCityName, useInfo.getCityName());
+                    updateWrapper.set(IdxBizJgProjectContraption::getCounty, useInfo.getCounty());
+                    updateWrapper.set(IdxBizJgProjectContraption::getCountyName, useInfo.getCountyName());
+                    updateWrapper.set(IdxBizJgProjectContraption::getStreet, useInfo.getFactoryUseSiteStreet());
+                    updateWrapper.set(IdxBizJgProjectContraption::getStreetName, useInfo.getStreetName());
+                    updateWrapper.set(IdxBizJgProjectContraption::getAddress, useInfo.getAddress());
+                    projectContraptionService.update(null, updateWrapper);
+                }
+            }
+        }
+        List<JgUseRegistration> useRegistrationsAfter = getUseRegisterOfError();
+        log.info("处理后：2.使用登记装置id历史数据填充，存在缺少装置id的单据数量：{}", useRegistrationsAfter.size());
+    }
+
+    private IdxBizJgUseInfo getIdxBizJgUseInfo(String record) {
+        return useInfoService.getOneData(record);
+    }
+
+    /**
+     * 查询非作废状态的装置名称不为空，装置id为空或者null的使用登记数据
+     * @return 符合条件列表
+     */
+    private  List<JgUseRegistration> getUseRegisterOfError() {
+        return useRegistrationService.getBaseMapper().selectList(new LambdaQueryWrapper<JgUseRegistration>()
+                .ne(JgUseRegistration::getStatus, FlowStatusEnum.TO_BE_DISCARD.getName())
+                .ne(JgUseRegistration::getProjectContraption, "")
+                .isNull(JgUseRegistration::getProjectContraptionId)
+                .select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraption, JgUseRegistration::getUseRegistrationCode));
+    }
 }

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

@@ -103,7 +103,8 @@
 			tui.profile,
 			tui.certificate_num certificateNum,
 			tui.post_name postName,
-			tui.phone
+			tui.phone,
+			tui.equip_type equipType
 		FROM
 			tzs_user_info tui
 		where
@@ -117,6 +118,12 @@
 		<if test="map.post != null and map.post != ''">
 			AND tui.post LIKE concat ( '%', #{map.post}, '%' )
 		</if>
+		<if test="map.equipType != null and map.equipType != ''">
+			AND tui.equip_type LIKE concat ( '%', #{map.equipType}, '%' )
+		</if>
+		<if test="map.phone != null and map.phone != ''">
+			AND tui.phone LIKE concat ( '%', #{map.phone}, '%' )
+		</if>
 	</select>
 	<select id="getPostList" resultType="java.util.Map">
 		SELECT

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

@@ -116,7 +116,8 @@
 			tui.certificate_num certificateNum,
 			tui.unit_name unitName,
 			tui.post_name postName,
-			tui.phone
+			tui.phone,
+			tui.equip_type equipType
 		FROM
 			tzs_user_info tui
 		LEFT JOIN tz_base_enterprise_info bei ON tui.unit_code = bei.use_code
@@ -146,6 +147,12 @@
 		<if test="paramDto.unitName != null and paramDto.unitName != ''">
 			AND tui.unit_name LIKE concat ( '%', #{paramDto.unitName}, '%' )
 		</if>
+		<if test="paramDto.equipType != null and paramDto.equipType != ''">
+			AND tui.equip_type LIKE concat ( '%', #{paramDto.equipType}, '%' )
+		</if>
+		<if test="paramDto.phone != null and paramDto.phone != ''">
+			AND tui.phone LIKE concat ( '%', #{paramDto.phone}, '%' )
+		</if>
 	</select>
     <select id="count" resultType="java.lang.Integer">
 		select count(1) from idx_biz_jg_other_info where INFORMATION_SITUATION NOTNULL

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/EnterpriseBizByTCMServiceImpl.java

@@ -28,8 +28,10 @@ import com.yeejoin.amos.boot.module.statistics.api.mapper.EnterpriseBizMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.PlanTaskMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsBaseInstitutionMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.BaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.BaseUnitLicence;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.BaseUnitLicenceMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.flc.api.dto.RegUnitIcDto;
 import com.yeejoin.amos.boot.module.ymt.flc.api.dto.RegUnitInfoDto;
@@ -86,6 +88,8 @@ public class EnterpriseBizByTCMServiceImpl {
 
     private PlanTaskMapper planTaskMapper;
 
+    private EquipmentCategoryMapper equipmentCategoryMapper;
+
     public EnterpriseBizByTCMServiceImpl(RedisUtils redisUtils, StCommonServiceImpl stCommonService,
                                          TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper,
                                          EnterpriseBizMapper enterpriseBizMapper,
@@ -95,7 +99,8 @@ public class EnterpriseBizByTCMServiceImpl {
                                          BaseUnitLicenceMapper baseUnitLicenceMapper,
                                          RegUnitInfoMapper regUnitInfoMapper,
                                          RegUnitIcMapper regUnitIcMapper,
-                                         PlanTaskMapper planTaskMapper) {
+                                         PlanTaskMapper planTaskMapper,
+                                         EquipmentCategoryMapper equipmentCategoryMapper) {
         this.redisUtils = redisUtils;
         this.stCommonService = stCommonService;
         this.tzBaseEnterpriseInfoMapper = tzBaseEnterpriseInfoMapper;
@@ -107,6 +112,7 @@ public class EnterpriseBizByTCMServiceImpl {
         this.regUnitInfoMapper = regUnitInfoMapper;
         this.regUnitIcMapper = regUnitIcMapper;
         this.planTaskMapper = planTaskMapper;
+        this.equipmentCategoryMapper = equipmentCategoryMapper;
     }
 
     public Map<String, Object> getInfoByUseCodeMap(String useCode) {
@@ -441,6 +447,23 @@ public class EnterpriseBizByTCMServiceImpl {
 
     public Page<Map<String,Object>> getPersonPage(JSONObject map, Page page) {
         Page<Map<String, Object>> result = planTaskMapper.getPersonPage(page, map);
+        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
+        Map<String,String> equipType = new HashMap<>();
+        for(EquipmentCategoryDto dto : equipmentCategoryDtos){
+            equipType.put(dto.getCode(),dto.getName());
+        }
+        for(Map<String,Object> m : result.getRecords()){
+            if(StrUtil.isNotEmpty((String) m.get("equipType"))){
+                JSONArray array = JSONArray.parseArray(m.get("equipType")+"");
+                array.forEach(t->{
+                    if(StrUtil.isEmpty((String) m.get("equipTypeName"))){
+                        m.put("equipTypeName",equipType.get(t+""));
+                    }else{
+                        m.put("equipTypeName",m.get("equipTypeName")+"/"+equipType.get(t+""));
+                    }
+                });
+            }
+        }
         return result;
     }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -1145,6 +1146,23 @@ public class ZLDPStatisticsServiceImpl {
         String orgCode = stCommonService.getAndSetOrgCode(regionCode);
         List<String> unitTypeList = UnitTypeEnum.getNameListByType(paramDto.getCompanyType());
         Page<Map<String, Object>> result = screenMapper.getPersonPage(page, paramDto, orgCode, unitTypeList);
+        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
+        Map<String,String> equipType = new HashMap<>();
+        for(EquipmentCategoryDto dto : equipmentCategoryDtos){
+            equipType.put(dto.getCode(),dto.getName());
+        }
+        for(Map<String,Object> m : result.getRecords()){
+            if(StrUtil.isNotEmpty((String) m.get("equipType"))){
+                JSONArray array = JSONArray.parseArray(m.get("equipType")+"");
+                array.forEach(t->{
+                    if(StrUtil.isEmpty((String) m.get("equipTypeName"))){
+                        m.put("equipTypeName",equipType.get(t+""));
+                    }else{
+                        m.put("equipTypeName",m.get("equipTypeName")+"/"+equipType.get(t+""));
+                    }
+                });
+            }
+        }
         return result;
     }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json

@@ -139,6 +139,7 @@
       "keyParams": [
         { "key": "unitType", "label": "单位类型" },
         { "key": "useUnit", "label": "单位名称" },
+        { "key": "useUnitCertificate", "label": "证件类型" },
         { "key": "useUnitCode", "label": "证件号码" },
         { "key": "governingBody", "label": "管辖机构" },
         { "key": "address", "label": "地址" },