Merge branch 'develop_tzs_test' into develop_tzs_register

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

@@ -320,4 +320,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	 */
 	@ApiModelProperty(value = "创建时间")
 	protected Date createDateEnd;
+
+	/**
+	 * 单位类型集合
+	 */
+	private List<String> unitTypeList;
 }

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

@@ -116,6 +116,13 @@
 					test="tzBaseEnterpriseInfoDto.useUnit!=null and tzBaseEnterpriseInfoDto.useUnit!='' ">
 				AND use_unit LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.useUnit},'%')
 			</if>
+			<if test="tzBaseEnterpriseInfoDto.unitTypeList != null and !tzBaseEnterpriseInfoDto.unitTypeList.isEmpty()">
+				AND (
+				<foreach collection="tzBaseEnterpriseInfoDto.unitTypeList" item="unit" separator=" OR ">
+					FIND_IN_SET(#{unit}, REPLACE(unit_type, '#', ','))
+				</foreach>
+				)
+			</if>
 			<if
 					test="tzBaseEnterpriseInfoDto.useUnitCertificate!=null and tzBaseEnterpriseInfoDto.useUnitCertificate!='' ">
 				AND use_unit_certificate = #{tzBaseEnterpriseInfoDto.useUnitCertificate}

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -34,6 +34,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 企业数据信息
@@ -211,6 +212,15 @@ public class TzBaseEnterpriseInfoController {
             } catch (Exception e) {
             }
         }
+        tzBaseEnterpriseInfoDto.setUnitTypeList(
+                Optional.ofNullable((String) map.get("unitTypeList"))
+                        .filter(ObjectUtils::isNotEmpty)
+                        .map(s -> Arrays.stream(s.split(","))
+                                .map(String::trim)
+                                .filter(ObjectUtils::isNotEmpty)
+                                .collect(Collectors.toList()))
+                        .orElse(Collections.emptyList())
+        );
         return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, tzBaseEnterpriseInfoDto, sort));
     }
 

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

@@ -382,5 +382,7 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     List<String> querySupervisionCompanyCode();
 
     Map<String, String> queryUseRegistrationByRecord(String record);
+
+    String queryTcmUnitNameByCreditCode(@Param("unitCreditCode") String unitCreditCode, @Param("unitType") String unitType);
 }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/tableDataExportVo/BaseEnterpriseVo.java

@@ -3,9 +3,7 @@ package com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yeejoin.amos.boot.module.jg.api.annotation.DictCode2DictName;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.util.Date;
 
 /**
@@ -79,6 +77,7 @@ public class BaseEnterpriseVo {
     String registrationAuthority;
 
     @ExcelProperty(value = "核准时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     Date approvalTime;
 
     @ExcelProperty(value = "经营状态")

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

@@ -4600,4 +4600,15 @@
         where eq.equ_id = #{record}
         limit 1
     </select>
+
+    <select id="queryTcmUnitNameByCreditCode" resultType="java.lang.String">
+        select unit_name from tzs_tcm_unit_info where unit_code = #{unitCreditCode}
+        <if test="unitType != null and unitType != ''">
+            and unit_type in
+            <foreach item="item" index="index" collection="unitType.split(',')" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        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/edit/factory/StringColumnDiffHandler.java

@@ -54,8 +54,8 @@ public class StringColumnDiffHandler implements ColumnDiff {
                 fieldChangeMeta.setColumnOldValue(Boolean.toString((Boolean) oldVal));
                 fieldChangeMeta.setColumnNewValue(Boolean.toString((Boolean) newVal));
             } else {
-                fieldChangeMeta.setColumnOldValue(Objects.toString(oldVal, null));
-                fieldChangeMeta.setColumnNewValue(Objects.toString(newVal, null));
+                fieldChangeMeta.setColumnOldValue(Objects.isNull(oldVal) ? null : Objects.toString(oldVal));
+                fieldChangeMeta.setColumnNewValue(Objects.isNull(newVal) ? null : Objects.toString(newVal));
             }
             fieldChangeMeta.setDisplayOldValue(formatService.format(displayDefine, fieldChangeMeta.getColumnOldValue()));
             fieldChangeMeta.setDisplayNewValue(formatService.format(displayDefine, fieldChangeMeta.getColumnNewValue()));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -17,9 +17,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import com.yeejoin.amos.boot.biz.common.annotation.Group;
-import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
+import com.yeejoin.amos.boot.biz.common.enums.TcmUnitTypeEnum;
 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;
@@ -40,8 +40,8 @@ import com.yeejoin.amos.boot.module.jg.biz.edit.utils.DiffUtils;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
-import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -75,7 +75,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum.YIDENGJI;
 import static com.yeejoin.amos.boot.module.jg.biz.edit.core.SubClassFinder.getAllSubClasses;
 import static com.yeejoin.amos.boot.module.jg.biz.edit.utils.ReflectiveFieldAccessor.getAllFields;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.IdxBizJgProjectContraptionServiceImplService.PROJECT_CONTRAPTION;
@@ -828,7 +827,8 @@ public class CommonEquipDataProcessService {
             JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfo.getUseOrgCode())
                     .eq(JgUseRegistrationManage::getIsDelete, 0)
-                    .eq(JgUseRegistrationManage::getCertificateStatus,YIDENGJI.getName())
+                    .orderByDesc(JgUseRegistrationManage::getRecDate)
+                    .last("limit 1")
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode, JgUseRegistrationManage::getRegDate).one();
             if (!ValidationUtil.isEmpty(jgUseRegistrationManage)) {
                 result.put("receiveCompanyCode", jgUseRegistrationManage.getReceiveCompanyCode());
@@ -1138,8 +1138,8 @@ public class CommonEquipDataProcessService {
         // 2.产权单位名称冗余
         // 产权单位信息
         if (StringUtils.isNotEmpty(useInfoNew.getEstateUnitCreditCode())) {
-            CompanyBo companyBo = this.getCommonMapper().queryCompanyByCode(useInfoNew.getEstateUnitCreditCode());
-            Optional.ofNullable(companyBo).ifPresent(item -> useInfoNew.setEstateUnitName(companyBo.getCompanyName()));
+            String propertyUnitName = commonService.queryTcmUnitNameByCreditCode(useInfoNew.getEstateUnitCreditCode(), TcmUnitTypeEnum.CQ.getCode());
+            useInfoNew.setEstateUnitName(propertyUnitName);
         }
     }
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/SingleEquipChangeProcess.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.collect.Maps;
-import com.yeejoin.amos.boot.biz.common.annotation.EnableEsRollback;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
@@ -30,8 +29,6 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.yeejoin.amos.boot.module.jg.api.enums.CertificateStatusEnum.YIDENGJI;
-
 /**
  * 单个维护设备-策略实现类
  */
@@ -73,7 +70,9 @@ public class SingleEquipChangeProcess implements IEquipChangeDataProcessStrategy
             JgUseRegistrationManage jgUseRegistrationManage = commonEquipDataProcessService.getJgUseRegistrationManageService().lambdaQuery()
                     .eq(JgUseRegistrationManage::getUseRegistrationCode, registerInfoOld.getUseOrgCode())
                     .eq(JgUseRegistrationManage::getIsDelete, 0)
-                    .eq(JgUseRegistrationManage::getCertificateStatus, YIDENGJI.getName())
+//                    .eq(JgUseRegistrationManage::getCertificateStatus, YIDENGJI.getName())
+                    .orderByDesc(JgUseRegistrationManage::getRecDate)
+                    .last("limit 1")
                     .select(JgUseRegistrationManage::getSequenceNbr, JgUseRegistrationManage::getReceiveCompanyCode).one();
             useInfoOld.setReceiveCompanyCode(jgUseRegistrationManage.getReceiveCompanyCode());
         }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TcmServiceFeignClient.java

@@ -29,4 +29,12 @@ public interface TcmServiceFeignClient {
                                                                  @RequestParam(required = false, defaultValue = "all") String type,
                                                                  @RequestBody Map<String, Object> map);
 
+    /**
+     * 企业信息列表分页查询
+     */
+    @RequestMapping(value = "/baseEnterprise/getPageList", method = RequestMethod.GET)
+    ResponseModel<Page<Map<String, String>>> page(@RequestParam("current") int current,
+                                                  @RequestParam("size") int size,
+                                                  @RequestParam("keyword") String keyword,
+                                                  @RequestParam Map<String, Object> map);
 }

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

@@ -55,38 +55,92 @@ public abstract class BaseEquipUsedCheckService implements IEquipUsedCheck {
     }
 
     private void setUsingData2Redis(String record, String companyCode, Set<String> equipListOfUsed) {
-        if (equipListOfUsed == null || equipListOfUsed.isEmpty()) {
-            equipListOfUsed = new TreeSet<>();
+        String redisKey = this.getFlowingEquipRedisKey(companyCode, getApplyBizType());
+        log.info("【setUsingData2Redis】start, record={}, companyCode={}, redisKey={}, thread={}",
+                record, companyCode, redisKey, Thread.currentThread().getName());
+        log.info("【setUsingData2Redis】before handle, incoming equipListOfUsed={}", equipListOfUsed);
+        try {
+            if (equipListOfUsed == null || equipListOfUsed.isEmpty()) {
+                log.info("【setUsingData2Redis】equipListOfUsed is null or empty, init new TreeSet");
+                equipListOfUsed = new TreeSet<>();
+            }
+            boolean added = equipListOfUsed.add(record);
+            log.info("【setUsingData2Redis】after add, added={}, currentSet={}", added, equipListOfUsed);
+            getRedisClient()
+                    .getBucket(redisKey)
+                    .set(equipListOfUsed);
+            log.info("【setUsingData2Redis】redis set success, redisKey={}, value={}", redisKey, equipListOfUsed);
+            FlowingEquipRedisContext.setRedisKeyInfo(
+                    new FlowingEquipRedisKeyDTO(redisKey, Collections.singletonList(record))
+            );
+            log.info("【setUsingData2Redis】FlowingEquipRedisContext set success, redisKey={}, record={}",
+                    redisKey, record);
+        } catch (Exception e) {
+            log.error("【setUsingData2Redis】Exception, record={}, redisKey={}", record, redisKey, e);
+            throw e;
         }
-        equipListOfUsed.add(record);
-        getRedisClient().getBucket(this.getFlowingEquipRedisKey(companyCode, getApplyBizType())).set(equipListOfUsed);
-        FlowingEquipRedisContext.setRedisKeyInfo(new FlowingEquipRedisKeyDTO(this.getFlowingEquipRedisKey(companyCode, getApplyBizType()), Collections.singletonList(record)));
+        log.info("【setUsingData2Redis】end, record={}, redisKey={}", record, redisKey);
     }
 
     @Override
     public void registrationRepeatUsedCheck(String record, String companyCode) {
-        RLock lock = getRedisClient().getLock(this.getRepeatUsedCheckLockKey(companyCode, getApplyBizType(), record));
+
+        String lockKey = this.getRepeatUsedCheckLockKey(companyCode, getApplyBizType(), record);
+        String redisKey = this.getFlowingEquipRedisKey(companyCode, getApplyBizType());
+
+        log.info("【registrationRepeatUsedCheck】start, record={}, companyCode={}, lockKey={}, redisKey={}",
+                record, companyCode, lockKey, redisKey);
+
+        RLock lock = getRedisClient().getLock(lockKey);
+
         try {
+
             boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
+            log.info("【registrationRepeatUsedCheck】tryLock result={}, record={}, thread={}",
+                    isLocked, record, Thread.currentThread().getName());
+
             if (!isLocked) {
-                log.error("使用登记证：{}在被其他业务使用，加锁失败", record);
+                log.error("使用登记证：{}在被其他业务使用，加锁失败，lockKey={}", record, lockKey);
                 throw new BadRequest("使用登记证已被其他流程使用，请刷新后重试！");
             }
-            RBucket<Set<String>> RBucket = getRedisClient().getBucket(this.getFlowingEquipRedisKey(companyCode, getApplyBizType()));
-            Set<String> equipListOfUsed = RBucket.get();
+
+            RBucket<Set<String>> rBucket = getRedisClient().getBucket(redisKey);
+            Set<String> equipListOfUsed = rBucket.get();
+
+            log.info("【registrationRepeatUsedCheck】redis before check, redisKey={}, currentValue={}",
+                    redisKey, equipListOfUsed);
+
             // 查询当前设备在用的申请单号列表
             if (equipListOfUsed != null && equipListOfUsed.contains(record)) {
-                log.error("使用登记证已被其他流程使用，不允许重复提交，使用登记证ID:{}", record);
+                log.error("使用登记证已被其他流程使用，不允许重复提交，使用登记证ID={}, redisKey={}, redisValue={}",
+                        record, redisKey, equipListOfUsed);
                 throw new BadRequest("使用登记证已被其他流程使用，不允许重复提交，请联系管理员!");
             }
+
+            log.info("【registrationRepeatUsedCheck】准备写入redis, record={}, redisKey={}", record, redisKey);
+
             setUsingData2Redis(record, companyCode, equipListOfUsed);
+
+            Set<String> afterSet = rBucket.get();
+            log.info("【registrationRepeatUsedCheck】redis after write, redisKey={}, value={}",
+                    redisKey, afterSet);
+
         } catch (InterruptedException e) {
-            log.error( e.getMessage(), e);
+            log.error("【registrationRepeatUsedCheck】InterruptedException, record={}", record, e);
+            Thread.currentThread().interrupt();
+        } catch (Exception e) {
+            log.error("【registrationRepeatUsedCheck】Exception, record={}", record, e);
+            throw e;
         } finally {
             if (lock.isHeldByCurrentThread()) {
                 lock.unlock();
+                log.info("【registrationRepeatUsedCheck】unlock success, record={}, lockKey={}", record, lockKey);
+            } else {
+                log.warn("【registrationRepeatUsedCheck】current thread not holding lock, record={}, lockKey={}", record, lockKey);
             }
         }
+
+        log.info("【registrationRepeatUsedCheck】end, record={}", record);
     }
 
     private String getRepeatUsedCheckLockKey(String companyCode, String bizType, String record) {
@@ -122,11 +176,54 @@ public abstract class BaseEquipUsedCheckService implements IEquipUsedCheck {
      */
     @Override
     public void delDataForCheckEquipRepeatUsed(List<String> records, String companyCode) {
-        RBucket<Set<String>> rBucket = getRedisClient().getBucket(this.getFlowingEquipRedisKey(companyCode, getApplyBizType()));
-        Set<String> equipListOfUsed = rBucket.get();
-        if(equipListOfUsed != null){
-            equipListOfUsed = equipListOfUsed.stream().filter(record -> !records.contains(record)).collect(Collectors.toSet());
-            rBucket.set(equipListOfUsed);
+        if (records == null || records.isEmpty()) {
+            log.info("delData: records is null or empty");
+            return;
+        }
+
+        String lockKey = "lock:" + getFlowingEquipRedisKey(companyCode, getApplyBizType());
+
+        RLock lock = getRedisClient().getLock(lockKey);
+        boolean locked = false;
+
+        try {
+            locked = lock.tryLock(5, 10, TimeUnit.SECONDS);
+            if (!locked) {
+                log.warn("delData: cannot acquire lock, key={}", lockKey);
+                return;
+            }
+
+            RBucket<Set<String>> rBucket = getRedisClient()
+                    .getBucket(getFlowingEquipRedisKey(companyCode, getApplyBizType()));
+
+            Set<String> equipListOfUsed = rBucket.get();
+            log.info("delData: redis original set={}", equipListOfUsed);
+
+            if (equipListOfUsed == null) {
+                return;
+            }
+
+            Set<String> after = equipListOfUsed.stream()
+                    .filter(record -> !records.contains(record))
+                    .collect(Collectors.toSet());
+
+            log.info("delData: after filter set={}", after);
+
+            rBucket.set(after);
+
+            Set<String> verify = rBucket.get();
+            log.info("delData: after set verify redis set={}", verify);
+
+        } catch (Exception e) {
+            log.error("delData error", e);
+        } finally {
+            if (locked) {
+                try {
+                    lock.unlock();
+                } catch (Exception e) {
+                    log.error("unlock error", e);
+                }
+            }
         }
     }
 

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

@@ -3337,7 +3337,7 @@ public class CommonServiceImpl implements ICommonService {
      * @return 单位信用代码_单位名称
      */
     public String queryTcmUnitCreditCodeBySeq(String unitSeq, String unitType) {
-        Map<String, String> map = commonMapper.queryTcmUnitInfoBySeq(unitSeq, unitType);
+        Map<String, String> map = this.queryTcmUnitInfoBySeq(unitSeq, unitType);
         return MapUtil.getStr(map, "unitCode");
     }
 
@@ -3515,4 +3515,12 @@ public class CommonServiceImpl implements ICommonService {
                         .build())
                 .collect(Collectors.toList()));
     }
+
+    public String queryTcmUnitNameByCreditCode(String unitCreditCode, String unitType) {
+        if (!ValidationUtil.isEmpty(unitCreditCode)) {
+            String unitName = commonMapper.queryTcmUnitNameByCreditCode(unitCreditCode, unitType);
+            return ValidationUtil.isEmpty(unitName) ? unitCreditCode : unitName;
+        }
+        return null;
+    }
 }
\ No newline at end of file

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

@@ -19,7 +19,6 @@ import com.yeejoin.amos.boot.module.jg.api.enums.RegTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.*;
 import com.yeejoin.amos.boot.module.jg.biz.edit.typeHandler.CbDataDictTypeHandler;
-import com.yeejoin.amos.boot.module.jg.biz.feign.JczsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TcmServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.IJgTableDataExportService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.DictUtil;
@@ -31,6 +30,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -39,7 +39,6 @@ import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -104,8 +103,6 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
     @Autowired
     IdxBizJgProjectContraptionServiceImplService idxBizJgProjectContraptionService;
     @Autowired
-    JczsServiceFeignClient jczsServiceFeignClient;
-    @Autowired
     TcmServiceFeignClient tcmServiceFeignClient;
     @Autowired
     private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
@@ -777,45 +774,45 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
                 .fluentPut("time", new Date().getTime()));
     }
 
-    private List<String> getEnterSeqs(String ids, Map<String, Object> map) {
+    private List<Map<String, String>> getEnterList(String ids, Map<String, Object> map) {
         RequestContextWrapper contextWrapper = RequestContextWrapper.capture();
-        List<String> idsList = new ArrayList<>();
+        List<Map<String, String>> resultList = new ArrayList<>();
         if (StringUtils.isEmpty(ids)) {
-            ResponseModel<Page<Map<String, String>>> page = jczsServiceFeignClient.page(1, PAGE_SIZE, null, map);
+            // 查询第一页
+            ResponseModel<Page<Map<String, String>>> page =
+                    tcmServiceFeignClient.page(1, PAGE_SIZE, null, map);
             Page<Map<String, String>> pageResult = page.getResult();
             int totalPage = (int) Math.ceil((double) pageResult.getTotal() / PAGE_SIZE);
-            List<CompletableFuture<List<String>>> futures = new ArrayList<>();
-            List<String> idsCollected = pageResult.getRecords().stream()
-                    .map(item -> item.getOrDefault("sequenceNbr", ""))
-                    .map(String::valueOf)
-                    .collect(Collectors.toList());
-
+            resultList.addAll(pageResult.getRecords());
+            List<CompletableFuture<List<Map<String, String>>>> futures = new ArrayList<>();
             for (int i = 2; i <= totalPage; i++) {
                 int pageIndex = i;
-                CompletableFuture<List<String>> future = CompletableFuture.supplyAsync(() -> {
-                    contextWrapper.apply();
-                    ResponseModel<Page<Map<String, String>>> page1 = jczsServiceFeignClient.page(pageIndex, PAGE_SIZE, null, map);
-                    Page<Map<String, String>> resultPage = page1.getResult();
-                    return resultPage.getRecords().stream()
-                            .map(item -> item.getOrDefault("sequenceNbr", ""))
-                            .map(String::valueOf)
-                            .collect(Collectors.toList());
-                }, executorService);
+                CompletableFuture<List<Map<String, String>>> future =
+                        CompletableFuture.supplyAsync(() -> {
+                            contextWrapper.apply();
+                            ResponseModel<Page<Map<String, String>>> pageData =
+                                    tcmServiceFeignClient.page(pageIndex, PAGE_SIZE, null, map);
+                            return pageData.getResult().getRecords();
+                        }, executorService);
                 futures.add(future);
             }
-            for (CompletableFuture<List<String>> future : futures) {
+
+            // 等待所有线程完成
+            for (CompletableFuture<List<Map<String, String>>> future : futures) {
                 try {
-                    idsCollected.addAll(future.get());
+                    resultList.addAll(future.get());
                 } catch (InterruptedException | ExecutionException e) {
                     log.error("分页查询线程执行失败", e);
                 }
             }
-            idsList.addAll(idsCollected);
         } else {
-            idsList.addAll(Arrays.asList(ids.split(",")));
+            ResponseModel<Page<Map<String, String>>> page =
+                    tcmServiceFeignClient.page(1, PAGE_SIZE, ids, map);
+            resultList.addAll(page.getResult().getRecords());
         }
-        return idsList;
+        return resultList;
     }
+
     public static <T, R> List<R> batchQuery(List<T> list, int batchSize, Function<List<T>, List<R>> function) {
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyList();
@@ -840,10 +837,29 @@ public class JgTableDataExportServiceImpl implements IJgTableDataExportService {
     @Override
     public void enterpriseInformationExport(String uuid, String ids, Map<String, Object> map) {
         ObjectMapper objectMapper = new ObjectMapper();
-        List<String> enterSeqs = getEnterSeqs(ids, map);
-        List<Map<String, String>> enterInfoWithExport =
-                batchQuery(enterSeqs, 500, sequenceNbrs -> tzBaseEnterpriseInfoMapper.getEnterInfoWithExport(sequenceNbrs));
-        List<BaseEnterpriseVo> exportData = JSON.parseArray(JSON.toJSONString(enterInfoWithExport), BaseEnterpriseVo.class);
+        List<Map<String, String>> enterSeqs = getEnterList(ids, map);
+        List<Map<String, String>> source = enterSeqs;
+        boolean hasUseUnit = Optional.ofNullable(map.get("unitTypeList"))
+                .map(Object::toString)
+                .filter(ObjectUtils::isNotEmpty)
+                .map(s -> Arrays.stream(s.split(","))
+                        .map(String::trim)
+                        .anyMatch(t -> t.contains("使用单位") || t.contains("个人主体")))
+                .orElse(false);
+        if (!hasUseUnit) {
+            source = batchQuery(
+                    enterSeqs,
+                    500,
+                    batch -> {
+                        List<String> sequenceNbrs = batch.stream()
+                                .map(m -> m.get("sequenceNbr"))
+                                .filter(ObjectUtils::isNotEmpty)
+                                .collect(Collectors.toList());
+                        return tzBaseEnterpriseInfoMapper.getEnterInfoWithExport(sequenceNbrs);
+                    }
+            );
+        }
+        List<BaseEnterpriseVo> exportData = JSON.parseArray(JSON.toJSONString(source), BaseEnterpriseVo.class);
         exportData.forEach(item -> {
             String categoryJson = item.getEquipCategory();
             if (categoryJson != null && !categoryJson.isEmpty()) {

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

@@ -426,24 +426,24 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 城市
         if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
             city.forEach(item -> {
-                if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("city")))) {
-                    useInfo.setCityName(String.valueOf(item.get("regionName")));
+                if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "city"))) {
+                    useInfo.setCityName(MapUtil.getStr(item, "regionName"));
                 }
             });
         }
         // 区县
         if (!ObjectUtils.isEmpty(map.get("county")) && !ObjectUtils.isEmpty(city)) {
             region.forEach(item -> {
-                if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("county")))) {
-                    useInfo.setCountyName(String.valueOf(item.get("regionName")));
+                if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "county"))) {
+                    useInfo.setCountyName(MapUtil.getStr(item, "regionName"));
                 }
             });
         }
         // 街道
         if (!ObjectUtils.isEmpty(map.get("factoryUseSiteStreet")) && !ObjectUtils.isEmpty(city)) {
             street.forEach(item -> {
-                if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("factoryUseSiteStreet")))) {
-                    useInfo.setStreetName(String.valueOf(item.get("regionName")));
+                if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "factoryUseSiteStreet"))) {
+                    useInfo.setStreetName(MapUtil.getStr(item, "regionName"));
                 }
             });
         }
@@ -506,7 +506,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             idxBizJgSupervisionInfoMapper.update(idxBizJgSupervisionInfo, eq);
         }
         // 更新设备使用登记证
-        idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(String.valueOf(map.get("equipId")), flag ? useRegistrationCode : useOrgCode);
+        idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(MapUtil.getStr(map, "equipId"), flag ? useRegistrationCode : useOrgCode);
         // 生成监管码、96333码(管道合并到有证不生成)
         createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
         if ("2".equals(jgUseRegistration.getRegType()) && "3000".equals(map.getString("equList"))) {
@@ -670,9 +670,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setManageType("set");
 
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
-                jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
+                jgUseRegistration.setOtherAccessories(Optional.ofNullable(map.get("otherAccessories")).map(JSON::toJSONString).orElse(null));
             }
-            String equType = this.baseMapper.getEquType(String.valueOf(map.get("EQU_LIST_CODE")));
+            String equType = this.baseMapper.getEquType(MapUtil.getStr(map, "EQU_LIST_CODE"));
             if (map.containsKey("receiveOrgCode")) {
                 // 接收单位信息
                 String[] splitMaintenanceUnitCode = String.valueOf(map.getString("receiveOrgCode")).split("_");
@@ -711,7 +711,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             // 是否西咸
             if (!ObjectUtils.isEmpty(map.get("isXixian"))) {
-                jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
+                jgUseRegistration.setIsXixian(MapUtil.getStr(map, "isXixian"));
             }
             // 使用地点
             // 市
@@ -724,24 +724,24 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 城市
             if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
                 city.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("city")))) {
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "city"))) {
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
             }
             // 区县
             if (!ObjectUtils.isEmpty(map.get("county")) && !ObjectUtils.isEmpty(city)) {
                 region.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("county")))) {
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "county"))) {
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
             }
             // 街道
             if (!ObjectUtils.isEmpty(map.get("factoryUseSiteStreet")) && !ObjectUtils.isEmpty(city)) {
                 street.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("factoryUseSiteStreet")))) {
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "factoryUseSiteStreet"))) {
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
             }
@@ -764,10 +764,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             map.put("userName", reginParams.getUserModel().getRealName());
             Map<String, Object> useRegistrationFormUrlMap = commonService.getRegistrationFormUrl("set", map);
             Optional.ofNullable(useRegistrationFormUrlMap)
-                    .ifPresent(item -> jgUseRegistration.setUseRegistrationFormUrl(String.valueOf(item.get("useRegistrationFormUrl"))));
-            if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
+                    .ifPresent(item -> jgUseRegistration.setUseRegistrationFormUrl(MapUtil.getStr(item, "useRegistrationFormUrl")));
+            if (map.containsKey("type") && "edit".equals(MapUtil.getStr(map, "type"))) {
                 jgUseRegistration.setUseUnitCreditCode(null);
-                jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
+                jgUseRegistration.setSequenceNbr(Long.valueOf(MapUtil.getStr(map, "sequenceNbr")));
                 this.getBaseMapper().updateById(jgUseRegistration);
                 // 更新设备关联表
                 LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
@@ -776,13 +776,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 jgUseRegistrationEq.setEquId(Objects.toString(map.get("equipId"), null));
                 jgRelationEquipMapper.update(jgUseRegistrationEq, lambda);
                 // 历史设备登记生成的 编辑时更新使用登记证管理表
-                updateRegistrationManage(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
+                updateRegistrationManage(Long.valueOf(MapUtil.getStr(map, "sequenceNbr")));
             } else {
                 // 业务管理设备信息保存
                 JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
                 jgRelationEquip.setEquId(Objects.toString(map.get("equipId"), ""));
                 if (ValidationUtil.isEmpty(jgUseRegistration.getApplyNo())){
-                    ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
+                    ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(MapUtil.getStr(map, "businessCode")), 1);
                     if (!ObjectUtils.isEmpty(listResponseModel)) {
                         jgUseRegistration.setApplyNo(listResponseModel.getResult().get(0));
                     }
@@ -830,7 +830,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
                 if (!ObjectUtils.isEmpty(instanceId)) {
                     // 执行流程
-                    flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")), map);
+                    flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "", "", map.getString("manageType"), MapUtil.getStr(map, "nextTaskId"), map);
                 }
             } else {
                 if (ObjectUtils.isEmpty(map.get("instanceId"))) {
@@ -838,8 +838,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     TaskModelDto dto = new TaskModelDto();
                     TaskMessageDto taskMessageDto = new TaskMessageDto();
                     BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
-                    taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
-                    taskMessageDto.setEQU_LIST_CODE(String.valueOf(map.get("EQU_LIST_CODE")));
+                    taskMessageDto.setEquipId(MapUtil.getStr(map, "equipId"));
+                    taskMessageDto.setEQU_LIST_CODE(MapUtil.getStr(map, "EQU_LIST_CODE"));
                     // 数据参数
                     dto.setModel(taskMessageDto);
                     // 摘要
@@ -941,7 +941,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
             CompanyBo company = reginParams.getCompany();
-            String equListCode = String.valueOf(map.get("EQU_LIST_CODE"));
+            String equListCode = MapUtil.getStr(map, "EQU_LIST_CODE");
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
             if (CollectionUtils.isEmpty(equipmentLists)) {
                 throw new BadRequest("请选择设备后进行暂存!");
@@ -1038,7 +1038,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             // 其他附件
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
-                useRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
+                useRegistration.setOtherAccessories(Optional.ofNullable(map.get("otherAccessories")).map(JSON::toJSONString).orElse(null));
             }
             if (map.containsKey("orgBranchCode")) {
                 // 监察处置机构代码
@@ -1063,12 +1063,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     .build();
             String fullAddress = locationMap.entrySet().stream()
                     .map(entry -> {
-                        String mapKey = String.valueOf(map.get(entry.getKey()));
+                        String mapKey = MapUtil.getStr(map, entry.getKey());
                         List<LinkedHashMap> locations = entry.getValue();
                         return (!ObjectUtils.isEmpty(mapKey) && !ObjectUtils.isEmpty(locations)) ?
                                 locations.stream()
-                                        .filter(item -> mapKey.equals(String.valueOf(item.get("regionCode"))))
-                                        .map(item -> String.valueOf(item.get("regionName")))
+                                        .filter(item -> mapKey.equals(MapUtil.getStr(item, "regionCode")))
+                                        .map(item -> MapUtil.getStr(item, "regionName"))
                                         .findFirst()
                                         .orElse("") :
                                 "";
@@ -1085,10 +1085,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             map.put("userName", reginParams.getUserModel().getRealName());
             Map<String, Object> useRegistrationFormUrlMap = commonService.getRegistrationFormUrl("unit", map);
             Optional.ofNullable(useRegistrationFormUrlMap)
-                    .ifPresent(item -> useRegistration.setUseRegistrationFormUrl(String.valueOf(item.get("useRegistrationFormUrl"))));
+                    .ifPresent(item -> useRegistration.setUseRegistrationFormUrl(MapUtil.getStr(item, "useRegistrationFormUrl")));
             // 新增或编辑保存
             if (StringUtils.isEmpty(useRegistration.getSequenceNbr())) {
-                ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(String.valueOf(map.get("businessCode"))), 1);
+                ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.getCode.get(MapUtil.getStr(map, "businessCode")), 1);
                 if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
                     log.error("使用登记申请单单号获取失败！");
                     throw new BadRequest("使用登记申请单单号获取失败！");
@@ -1138,7 +1138,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                                     this.updateUseRegUnitData(useRegistration.getSequenceNbr(), "0", workflowResultDto, true, null));
                 } else {
                     // 执行流程
-                    flowExecute(useRegistration.getSequenceNbr(), useRegistration.getInstanceId(), "0", "", "", map.getString("manageType"), String.valueOf(map.get("nextTaskId")), map);
+                    flowExecute(useRegistration.getSequenceNbr(), useRegistration.getInstanceId(), "0", "", "", map.getString("manageType"), MapUtil.getStr(map, "nextTaskId"), map);
                 }
             } else {
                 String equType = this.baseMapper.getEquType(equListCode);
@@ -1574,9 +1574,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     private String getRegionName(String key, String codeKey, JSONObject mapData) {
         return Optional.ofNullable((List<LinkedHashMap>) redisUtils.get(key))
                 .flatMap(list -> list.stream()
-                        .filter(item -> String.valueOf(item.get("regionCode"))
-                                .equals(String.valueOf(mapData.get(codeKey))))
-                        .map(item -> (String) item.get("regionName"))
+                        .filter(item -> Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(mapData, codeKey)))
+                        .map(item -> MapUtil.getStr(item, "regionName"))
                         .findFirst())
                 .orElse("");
     }
@@ -1617,13 +1616,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         changeRecord.setRegDate(jgUseRegistration.getCreateDate());
         changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration, BusinessTypeEnum.JG_USAGE_REGISTRATION.getName(), flag));//变更内容
         changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号
-        changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
+        changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyCode());//接收机构公司代码
         // 流水表不需要再次生成唯一编号，使用证管理表对应值
         if (!ObjectUtils.isEmpty(jgUseRegistration.getUseRegistrationCode())) {
-            JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery()
-                    .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
-                    .eq(JgUseRegistrationManage::getIsDelete, 0)
-                    .eq(JgUseRegistrationManage::getCertificateStatus, CertificateStatusEnum.YIDENGJI.getName()).one();
+            JgUseRegistrationManage manage =
+                    jgUseRegistrationManageService.lambdaQuery()
+                            .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
+                            .eq(JgUseRegistrationManage::getIsDelete, 0)
+                            .orderByDesc(JgUseRegistrationManage::getRecDate)
+                            .last("limit 1")
+                            .one();
             changeRecord.setCertificateNo(ValidationUtil.isEmpty(manage) ? this.genCertificateNo(registerInfo, jgUseRegistration) : manage.getCertificateNo());//登记证书唯一码
         }
         changeRecord.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());//使用单位统一信用代码
@@ -1643,7 +1645,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             log.error("日期转换失败：", e);
         }
         String equCode = Optional.ofNullable(registerInfo.getEquDefine()).orElse(registerInfo.getEquCategory());
-        String registrationCode = equCode + codeUtil.getCityRegionCode(jgUseRegistration.getReceiveCompanyOrgCode()) + ym;
+        String registrationCode = equCode + codeUtil.getCityRegionCode(jgUseRegistration.getReceiveCompanyCode()) + ym;
         return tzsServiceFeignClient.deviceRegistrationCode(registrationCode).getResult();
     }
 
@@ -3839,6 +3841,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             Iterable<ESEquipmentInfo> esEquipmentInfosSnapshot = esEquipmentDao.findAllById(records);
             try {
                 this.updateById(jgUseRegistration);
+                //如果是历史登记，使用登记证编号可编辑，需要从设备中拿取最新的证号进行更新
+                if ("1".equals(jgUseRegistration.getRegType())) {
+                    records.stream().findFirst()
+                            .map(idxBizJgRegisterInfoMapper::getUseOrgCodeByEquip)
+                            .filter(org.apache.commons.lang3.StringUtils::isNotBlank)
+                            .ifPresent(jgUseRegistration::setUseRegistrationCode);
+                }
                 // 处理非批量导入数据，更新关联业务状态
                 processElseDataByStatusSet(oldStatus, jgUseRegistration);
                 // es数据处理 提出来便于进行异常回调
@@ -4487,7 +4496,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             // 场车设备校验车牌号的唯一性
             if (EquipmentClassifityEnum.CC.getCode().equals(map.get("EQU_LIST_CODE"))) {
-                String carNum = String.valueOf(map.get(carNumber));
+                String carNum = MapUtil.getStr(map, carNumber);
                 if (!"无".equals(carNum)) {
                     Integer count = idxBizJgRegisterInfoMapper.checkCarNumberUniquenessWithHisCC(carNumber, equipId);
                     if (count > 0) {
@@ -4505,7 +4514,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     DateUtils.dateParse((String) map.get("oRegDate"), DateUtils.DATE_PATTERN));
             jgUseRegistration.setInputUnitNo(Objects.toString(map.get("oRegUnit")));
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
-                jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
+                jgUseRegistration.setOtherAccessories(Optional.ofNullable(map.get("otherAccessories")).map(JSON::toJSONString).orElse(null));
             }
             if (map.containsKey("receiveOrgCode")) {
                 // 接收单位信息
@@ -4542,7 +4551,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             // 是否西咸
             if (!ObjectUtils.isEmpty(map.get("isXixian"))) {
-                jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
+                jgUseRegistration.setIsXixian(MapUtil.getStr(map, "isXixian"));
             }
             // 使用地点
             String useCityName = "";
@@ -4560,9 +4569,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 JSONObject finalMap = map;
                 AtomicReference<String> atomicUseCity = new AtomicReference<>(useCityName);
                 city.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(finalMap.get("city")))) {
-                        atomicUseCity.set("" + item.get("regionName"));
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(finalMap, "city"))) {
+                        atomicUseCity.set(MapUtil.getStr(item, "regionName"));
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
                 useCityName = atomicUseCity.get();
@@ -4572,9 +4581,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 JSONObject finalMap1 = map;
                 AtomicReference<String> atomicUseCounty = new AtomicReference<>(useCountyName);
                 region.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(finalMap1.get("county")))) {
-                        atomicUseCounty.set("" + item.get("regionName"));
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(finalMap1, "county"))) {
+                        atomicUseCounty.set(MapUtil.getStr(item, "regionName"));
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
                 useCountyName = atomicUseCounty.get();
@@ -4584,18 +4593,18 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 JSONObject finalMap2 = map;
                 AtomicReference<String> atomicUseStreet = new AtomicReference<>(useStreetName);
                 street.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(finalMap2.get("factoryUseSiteStreet")))) {
-                        atomicUseStreet.set("" + item.get("regionName"));
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(finalMap2, "factoryUseSiteStreet"))) {
+                        atomicUseStreet.set(MapUtil.getStr(item, "regionName"));
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
                 useStreetName = atomicUseStreet.get();
             }
             jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + JsonDiffUtil.nullToEmpty(map.getString("address")));
 
-            if (map.containsKey("edit") && "1".equals(String.valueOf(map.get("edit")))) {
+            if (map.containsKey("edit") && "1".equals(MapUtil.getStr(map, "edit"))) {
                 jgUseRegistration.setUseUnitCreditCode(null);
-                jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
+                jgUseRegistration.setSequenceNbr(Long.valueOf(MapUtil.getStr(map, "sequenceNbr")));
                 this.getBaseMapper().updateById(jgUseRegistration);
                 // 更新设备关联表
                 LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
@@ -4623,7 +4632,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                             ? FlowStatusEnum.TO_BE_SUBMITTED.getName()
                             : FlowStatusEnum.TO_BE_FINISHED.getName();
                     jgUseRegistration.setStatus(status);
-                    jgUseRegistration.setUseRegistrationCode(ValidationUtil.isEmpty(map.get("useOrgCode")) ? "" : String.valueOf(map.get("useOrgCode")));
+                    jgUseRegistration.setUseRegistrationCode(ValidationUtil.isEmpty(map.get("useOrgCode")) ? "" : MapUtil.getStr(map, "useOrgCode"));
                     jgUseRegistration.setRegType("1");//历史登记
                     this.save(jgUseRegistration);
                     jgRelationEquip.setEquipTransferId(jgUseRegistration.getSequenceNbr().toString());
@@ -4632,7 +4641,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     String status = "tempEdit".equals(submitType)
                             ? FlowStatusEnum.TO_BE_SUBMITTED.getName()
                             : FlowStatusEnum.TO_BE_FINISHED.getName();
-                    jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
+                    jgUseRegistration.setSequenceNbr(Long.valueOf(MapUtil.getStr(map, "sequenceNbr")));
                     jgUseRegistration.setStatus(status);
                     this.getBaseMapper().updateById(jgUseRegistration);
                     // 更新设备关联表
@@ -4651,8 +4660,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 lambdaSup.eq(IdxBizJgSupervisionInfo::getRecord, equipId);
                 IdxBizJgSupervisionInfo supervisionInfo = idxBizJgSupervisionInfoMapper.selectOne(lambdaSup);
                 if (supervisionInfo != null && !ObjectUtils.isEmpty(map.get("orgBranchCode"))) {
-                    supervisionInfo.setOrgBranchCode(String.valueOf(map.get("orgBranchCode")).split("_")[0]);
-                    supervisionInfo.setOrgBranchName(String.valueOf(map.get("orgBranchCode")).split("_")[1]);
+                    supervisionInfo.setOrgBranchCode(MapUtil.getStr(map, "orgBranchCode").split("_")[0]);
+                    supervisionInfo.setOrgBranchName(MapUtil.getStr(map, "orgBranchCode").split("_")[1]);
                     idxBizJgSupervisionInfoMapper.updateById(supervisionInfo);
                 }
 
@@ -4663,17 +4672,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 String equCode = Objects.toString(map.get("equCode"),null);
                 if (registerInfo != null) {
                     registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
-                    registerInfo.setEquCodeType(String.valueOf(map.get("equCodeType")));
+                    registerInfo.setEquCodeType(MapUtil.getStr(map, "equCodeType"));
                     // 新提交或暂存后提交需生成设备代码
                     if(ValidationUtil.isEmpty(submitType) || "tempSubmit".equals(submitType)){
                         equCode = ObjectUtils.isEmpty(map.get("equCode")) && !StringUtils.isEmpty(jgUseRegistration.getReceiveCompanyCode())
                                 ? this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode())
-                                : String.valueOf(map.get("equCode"));
+                                : MapUtil.getStr(map, "equCode");
                     }
                     registerInfo.setEquCode(equCode);// 设备代码
-                    registerInfo.setEquPrice(String.valueOf(map.get("equPrice")));
-                    registerInfo.setProductPhoto(JSONObject.toJSONString(map.get("productPhoto")));
-                    registerInfo.setOtherAccessoriesReg(JSONObject.toJSONString(map.get("otherAccessoriesReg")));
+                    registerInfo.setEquPrice(MapUtil.getStr(map, "equPrice"));
+                    registerInfo.setProductPhoto(Optional.ofNullable(map.get("productPhoto")).map(JSON::toJSONString).orElse(null));
+                    registerInfo.setOtherAccessoriesReg(Optional.ofNullable(map.get("otherAccessoriesReg")).map(JSON::toJSONString).orElse(null));
                     registerInfo.setInstallationIsComplete(map.getOrDefault("installationIsComplete", "1").toString());
                     if (EquipmentClassifityEnum.CC.getCode().equals(map.get("EQU_LIST_CODE"))) {
                         registerInfo.setCarNumber((String) map.get(carNumber));
@@ -4690,13 +4699,13 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     designInfo.setDesignUnitName(MapUtil.getStr(map, "designUnitName"));
                     designInfo.setDesignLicenseNum(MapUtil.getStr(map, "designLicenseNum"));
                     designInfo.setDesignUseDate(MapUtil.getStr(map, "designUseDate"));
-                    designInfo.setDesignDate(!StringUtils.isEmpty(map.get("designDate")) ? DateUtil.parse(String.valueOf(map.get("designDate")), "yyyy-MM-dd") : null);
-                    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(ObjectUtils.isEmpty(map.get("designStandard")) ? null : JSONObject.toJSONString(map.get("designStandard")));
-                    designInfo.setOtherAccessoriesDes(ObjectUtils.isEmpty(map.get("otherAccessoriesDes")) ? null : JSONObject.toJSONString(map.get("otherAccessoriesDes")));
+                    designInfo.setDesignDate(!StringUtils.isEmpty(map.get("designDate")) ? DateUtil.parse(MapUtil.getStr(map, "designDate"), "yyyy-MM-dd") : null);
+                    designInfo.setDrawingDo(ObjectUtils.isEmpty(map.get("drawingDo")) ? null : MapUtil.getStr(map, "drawingDo"));
+                    designInfo.setAppraisalUnit(ObjectUtils.isEmpty(map.get("appraisalUnit")) ? null : MapUtil.getStr(map, "appraisalUnit"));
+                    designInfo.setAppraisalDate(ObjectUtils.isEmpty(map.get("appraisalDate")) ? null : MapUtil.getStr(map, "appraisalDate"));
+                    designInfo.setDesignDoc(Optional.ofNullable(map.get("designDoc")).map(JSON::toJSONString).orElse(null));
+                    designInfo.setDesignStandard(Optional.ofNullable(map.get("designStandard")).map(JSON::toJSONString).orElse(null));
+                    designInfo.setOtherAccessoriesDes(Optional.ofNullable(map.get("otherAccessoriesDes")).map(JSON::toJSONString).orElse(null));
                     idxBizJgDesignInfoMapper.updateById(designInfo);
                 }
 
@@ -4709,38 +4718,38 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     idxBizJgFactoryInfo.setProduceUnitName(MapUtil.getStr(map, "produceUnitName"));
                     idxBizJgFactoryInfo.setFactoryNum(MapUtil.getStr(map, "factoryNum"));
                     idxBizJgFactoryInfo.setProduceLicenseNum(MapUtil.getStr(map, "produceLicenseNum"));
-                    idxBizJgFactoryInfo.setProduceDate(!StringUtils.isEmpty(map.get("produceDate")) ? DateUtil.parse(String.valueOf(map.get("produceDate")), "yyyy-MM-dd") : null);
-                    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(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")));
+                    idxBizJgFactoryInfo.setProduceDate(!StringUtils.isEmpty(map.get("produceDate")) ? DateUtil.parse(MapUtil.getStr(map, "produceDate"), "yyyy-MM-dd") : null);
+                    idxBizJgFactoryInfo.setImported(ObjectUtils.isEmpty(map.get("imported")) ? null : MapUtil.getStr(map, "imported"));
+                    idxBizJgFactoryInfo.setProduceCountry(ObjectUtils.isEmpty(map.get("produceCountry")) ? null : MapUtil.getStr(map, "produceCountry"));
+                    idxBizJgFactoryInfo.setOtherAccessoriesFact(Optional.ofNullable(map.get("otherAccessoriesFact")).map(JSON::toJSONString).orElse(null));
+                    idxBizJgFactoryInfo.setProductQualityYieldProve(Optional.ofNullable(map.get("productQualityYieldProve")).map(JSON::toJSONString).orElse(null));
+                    idxBizJgFactoryInfo.setInsUseMaintainExplain(Optional.ofNullable(map.get("insUseMaintainExplain")).map(JSON::toJSONString).orElse(null));
+                    idxBizJgFactoryInfo.setFactoryStandard(Optional.ofNullable(map.get("factoryStandard")).map(JSON::toJSONString).orElse(null));
+                    idxBizJgFactoryInfo.setFactSupervisionInspectionReport(Optional.ofNullable(map.get("factSupervisionInspectionReport")).map(JSON::toJSONString).orElse(null));
+                    idxBizJgFactoryInfo.setBoilerEnergyEfficiencyCertificate(Optional.ofNullable(map.get("boilerEnergyEfficiencyCertificate")).map(JSON::toJSONString).orElse(null));
                     idxBizJgFactoryInfoMapper.updateById(idxBizJgFactoryInfo);
                 }
 
                 // 使用信息
                 LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
-                lambda.eq(IdxBizJgUseInfo::getRecord, String.valueOf(map.get("equipId")));
+                lambda.eq(IdxBizJgUseInfo::getRecord, MapUtil.getStr(map, "equipId"));
                 IdxBizJgUseInfo useInfo = useInfoMapper.selectOne(lambda);
                 String usePlace = "";
                 if (useInfo != null) {
                     useInfo.setIsIntoManagement(Boolean.TRUE);
-                    useInfo.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));
-                    useInfo.setUseUnitName(String.valueOf(map.get("useUnitName")));
+                    useInfo.setUseUnitCreditCode(MapUtil.getStr(map, "useUnitCreditCode"));
+                    useInfo.setUseUnitName(MapUtil.getStr(map, "useUnitName"));
                     useInfo.setProvince("610000");
                     useInfo.setProvinceName("陕西省");
-                    useInfo.setCity(String.valueOf(map.get("city")));
-                    useInfo.setUseInnerCode(String.valueOf(map.get("useInnerCode")));
+                    useInfo.setCity(MapUtil.getStr(map, "city"));
+                    useInfo.setUseInnerCode(MapUtil.getStr(map, "useInnerCode"));
                     useInfo.setCityName(useCityName);
-                    useInfo.setCounty(String.valueOf(map.get("county")));
+                    useInfo.setCounty(MapUtil.getStr(map, "county"));
                     useInfo.setCountyName(useCountyName);
-                    useInfo.setFactoryUseSiteStreet(String.valueOf(map.get("factoryUseSiteStreet")));
+                    useInfo.setFactoryUseSiteStreet(MapUtil.getStr(map, "factoryUseSiteStreet"));
                     useInfo.setStreetName(useStreetName);
-                    useInfo.setAddress(String.valueOf(map.get("address")));
-                    useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
+                    useInfo.setAddress(MapUtil.getStr(map, "address"));
+                    useInfo.setIsNotXiXian(MapUtil.getStr(map, "isXixian"));
                     if (!ValidationUtil.isEmpty(MapUtil.getStr(map, "estateUnitName")) && MapUtil.getStr(map, "estateUnitName").split("_").length == 2) {
                         useInfo.setEstateUnitCreditCode(MapUtil.getStr(map, "estateUnitName").split("_")[0]);
                         useInfo.setEstateUnitName(MapUtil.getStr(map, "estateUnitName").split("_")[1]);
@@ -4749,16 +4758,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                         useInfo.setEstateUnitCreditCode(MapUtil.getStr(propertyUnitInfo, "unitCode"));
                         useInfo.setEstateUnitName(MapUtil.getStr(propertyUnitInfo, "unitName"));
                     }
-                    useInfo.setPhone(String.valueOf(map.get("phone")));
+                    useInfo.setPhone(MapUtil.getStr(map, "phone"));
                     useInfo.setSafetyManager(map.getString("safetyManagerName"));
                     useInfo.setSafetyManagerId(map.getString("safetyManagerId"));
-                    useInfo.setUseDate(String.valueOf(map.get("useDate")));
-                    useInfo.setLongitudeLatitude(JSON.toJSONString(map.get("longitudeLatitude")));
+                    useInfo.setUseDate(MapUtil.getStr(map, "useDate"));
+                    useInfo.setLongitudeLatitude(Optional.ofNullable(map.get("longitudeLatitude")).map(JSON::toJSONString).orElse(null));
                     useInfo.setUsePlace((String) map.get("usePlace"));
-                    useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
-                    useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
-                    useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
-                    useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
+                    useInfo.setOldUseRegistrationTable(Optional.ofNullable(map.get("oldUseRegistrationTable")).map(JSON::toJSONString).orElse(null));
+                    useInfo.setOldUseRegistrationCertificate(Optional.ofNullable(map.get("oldUseRegistrationCertificate")).map(JSON::toJSONString).orElse(null));
+                    useInfo.setORegDate(MapUtil.getStr(map, "oRegDate"));
+                    useInfo.setORegUnit(MapUtil.getStr(map, "oRegUnit"));
                     // 历史平台登记，将设备状态改为在用
                     if(useInfo.getEquState() == null){
                         useInfo.setEquState(EquipmentEnum.ZAIYONG.getCode().toString());
@@ -4772,7 +4781,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
 
                 // 检验检测【一对多，暂时只取最新一条数据】
-                IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
+                IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(MapUtil.getStr(map, "equipId"));
                 if (ObjectUtils.isEmpty(inspectionDetectionInfo.getSequenceNbr())) {
                     inspectionDetectionInfo.setRecord((String) map.get("equipId"));
                 }
@@ -4780,11 +4789,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 inspectionDetectionInfo.setInspectOrgName(MapUtil.getStr(map, "inspectOrgName"));
                 inspectionDetectionInfo.setInspectConclusion(MapUtil.getStr(map, "inspectConclusion"));
                 inspectionDetectionInfo.setInspectType(MapUtil.getStr(map, "inspectType"));
-                inspectionDetectionInfo.setInspectDate(!StringUtils.isEmpty(map.get("inspectDate")) ? DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd") : null);
+                inspectionDetectionInfo.setInspectDate(!StringUtils.isEmpty(map.get("inspectDate")) ? DateUtil.parse(MapUtil.getStr(map, "inspectDate"), "yyyy-MM-dd") : null);
                 inspectionDetectionInfo.setInspectStaff(MapUtil.getStr(map, "inspectStaff"));
-                inspectionDetectionInfo.setNextInspectDate(!StringUtils.isEmpty(map.get("nextInspectDate")) ? DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd") : null);
-                inspectionDetectionInfo.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
-                inspectionDetectionInfo.setInspectReportNo(String.valueOf(map.get("inspectReportNo")));
+                inspectionDetectionInfo.setNextInspectDate(!StringUtils.isEmpty(map.get("nextInspectDate")) ? DateUtil.parse(MapUtil.getStr(map, "nextInspectDate"), "yyyy-MM-dd") : null);
+                inspectionDetectionInfo.setInspectReport(Optional.ofNullable(map.get("inspectReport")).map(JSON::toJSONString).orElse(null));
+                inspectionDetectionInfo.setInspectReportNo(MapUtil.getStr(map, "inspectReportNo"));
                 iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
 
                 // 生成监管码 96333码
@@ -4810,7 +4819,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                             .applyNo(jgUseRegistration.getApplyNo())
                             .businessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName())
                             .businessId(jgUseRegistration.getSequenceNbr() + "")
-                            .equId(String.valueOf(map.get("equipId")))
+                            .equId(MapUtil.getStr(map, "equipId"))
                             .approvalUnit(jgUseRegistration.getReceiveOrgName())
                             .approvalUnitCode(jgUseRegistration.getReceiveOrgCode())
                             .status("正常")
@@ -4846,9 +4855,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         TaskMessageDto taskMessageDto = new TaskMessageDto();
         BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
         taskMessageDto.setRegType("历史登记");
-        taskMessageDto.setEQU_LIST_CODE(String.valueOf(map.get("equListCode")));
+        taskMessageDto.setEQU_LIST_CODE(MapUtil.getStr(map, "equListCode"));
         taskMessageDto.setAuditStatus(null);
-        taskMessageDto.setEquipId((String.valueOf(map.get("equipId"))));
+        taskMessageDto.setEquipId((MapUtil.getStr(map, "equipId")));
         modelDto.setModel(taskMessageDto);
 
         // 获取URL配置并匹配对应业务类型和pageType
@@ -4887,30 +4896,30 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      * 历史设备登记-》更新维保信息
      */
     private void historyEquUpdateMaintenanceInfo(JSONObject map) {
-        IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
+        IdxBizJgMaintenanceRecordInfo info = idxBizJgMaintenanceRecordInfoService.queryNewestDetailByRecord(MapUtil.getStr(map, "equipId"));
         if (ValidationUtil.isEmpty(info)) {
             info = new IdxBizJgMaintenanceRecordInfo();
         }
-        info.setRecord(String.valueOf(map.get("equipId")));
-        String meUnitName = String.valueOf(map.get("meUnitName"));
+        info.setRecord(MapUtil.getStr(map, "equipId"));
+        String meUnitName = MapUtil.getStr(map, "meUnitName");
         info.setRecDate(new Date());
         info.setRecUserId(RequestContext.getExeUserId());
         info.setMeUnitName(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[1] : null);
         info.setMeUnitCreditCode(!ValidationUtil.isEmpty(meUnitName) && meUnitName.contains("_") ? meUnitName.split("_")[0] : null);
-        info.setMeMaster(ValidationUtil.isEmpty(map.get("maintenanceManagerOneName")) ? null : String.valueOf(map.get("maintenanceManagerOneName")));
-        info.setMeMasterPhone(ValidationUtil.isEmpty(map.get("maintenanceManagerOnePhone")) ? null : String.valueOf(map.get("maintenanceManagerOnePhone")));
-        info.setMeMasterId(ValidationUtil.isEmpty(map.get("maintenanceManagerOneID")) ? null : String.valueOf(map.get("maintenanceManagerOneID")));
-        info.setMeMaster1(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoName")) ? null : String.valueOf(map.get("maintenanceManagerTwoName")));
-        info.setMeMaster1Phone(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoPhone")) ? null : String.valueOf(map.get("maintenanceManagerTwoPhone")));
-        info.setMeMaster1Id(ValidationUtil.isEmpty(map.get("maintenanceManagerTwoID")) ? null : String.valueOf(map.get("maintenanceManagerTwoID")));
+        info.setMeMaster(MapUtil.getStr(map, "maintenanceManagerOneName"));
+        info.setMeMasterPhone(MapUtil.getStr(map, "maintenanceManagerOnePhone"));
+        info.setMeMasterId(MapUtil.getStr(map, "maintenanceManagerOneID"));
+        info.setMeMaster1(MapUtil.getStr(map, "maintenanceManagerTwoName"));
+        info.setMeMaster1Phone(MapUtil.getStr(map, "maintenanceManagerTwoPhone"));
+        info.setMeMaster1Id(MapUtil.getStr(map, "maintenanceManagerTwoID"));
         try {
-            info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : DateUtil.parse(String.valueOf(map.get("informStart"))));
-            info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : DateUtil.parse(String.valueOf(map.get("informEnd"))));
+            info.setInformStart(ValidationUtil.isEmpty(map.get("informStart")) ? null : DateUtil.parse(MapUtil.getStr(map, "informStart")));
+            info.setInformEnd(ValidationUtil.isEmpty(map.get("informEnd")) ? null : DateUtil.parse(MapUtil.getStr(map, "informEnd")));
         } catch (Exception exception) {
             exception.printStackTrace();
             log.info("date转化失败");
         }
-        info.setRepairInform(ValidationUtil.isEmpty(map.get("maintenanceContract")) ? null : JSONObject.toJSONString(map.get("maintenanceContract")));
+        info.setRepairInform(Optional.ofNullable(map.get("maintenanceContract")).map(JSON::toJSONString).orElse(null));
         idxBizJgMaintenanceRecordInfoService.saveOrUpdate(info);
     }
 
@@ -4919,7 +4928,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private void historyEquUpdateInstallInfo(JSONObject map) {
 
-        IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
+        IdxBizJgConstructionInfo constructionInfo = idxBizJgConstructionInfoService.queryNewestDetailByRecord(MapUtil.getStr(map, "equipId"));
         if (!ValidationUtil.isEmpty(constructionInfo.getSequenceNbr())) {
             String uscUnitName = MapUtil.getStr(map, "uscUnitName");
             if (!ValidationUtil.isEmpty(uscUnitName) && uscUnitName.contains("_") && uscUnitName.split("_").length == 2) {
@@ -4934,12 +4943,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     constructionInfo.setUscUnitName(uscUnitName);
                 }
             }
-            constructionInfo.setConstructionLeaderName(ValidationUtil.isEmpty(map.get("installLeaderId")) ? null : String.valueOf(map.get("installLeaderId")));
-            constructionInfo.setConstructionLeaderPhone(ValidationUtil.isEmpty(map.get("installLeaderPhone")) ? null : String.valueOf(map.get("installLeaderPhone")));
-            constructionInfo.setProxyStatementAttachment(ValidationUtil.isEmpty(map.get("proxyStatementAttachmentList")) ? null : JSONObject.toJSONString(map.get("proxyStatementAttachmentList")));
-            constructionInfo.setConstructionContractAttachment(ValidationUtil.isEmpty(map.get("installContractAttachment")) ? null : JSONObject.toJSONString(map.get("installContractAttachment")));
-            constructionInfo.setConstructionOtherAccessories(ValidationUtil.isEmpty(map.get("insOtherAccessories")) ? null : JSONObject.toJSONString(map.get("insOtherAccessories")));
-            constructionInfo.setConstructionOtherAccessories(ValidationUtil.isEmpty(map.get("insOtherAccessories")) ? null : JSONObject.toJSONString(map.get("insOtherAccessories")));
+            constructionInfo.setConstructionLeaderName(MapUtil.getStr(map, "installLeaderId"));
+            constructionInfo.setConstructionLeaderPhone(MapUtil.getStr(map, "installLeaderPhone"));
+            constructionInfo.setProxyStatementAttachment(Optional.ofNullable(map.get("proxyStatementAttachmentList")).map(JSON::toJSONString).orElse(null));
+            constructionInfo.setConstructionContractAttachment(Optional.ofNullable(map.get("installContractAttachment")).map(JSON::toJSONString).orElse(null));
+            constructionInfo.setConstructionOtherAccessories(Optional.ofNullable(map.get("insOtherAccessories")).map(JSON::toJSONString).orElse(null));
             // 类型为安装
             constructionInfo.setConstructionType("6030");
             try {
@@ -5013,11 +5021,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
         jgCertificateChangeRecord.setChangeContent(changeContent);//变更内容
         jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
-        jgCertificateChangeRecord.setReceiveOrgName(String.valueOf(map.get("receiveOrgCode")).split("_")[1]);
-        jgCertificateChangeRecord.setReceiveCompanyCode(String.valueOf(map.get("receiveOrgCode")).split("_")[0]);//接收机构公司代码
+        jgCertificateChangeRecord.setReceiveOrgName(MapUtil.getStr(map, "receiveOrgCode").split("_")[1]);
+        jgCertificateChangeRecord.setReceiveCompanyCode(MapUtil.getStr(map, "receiveOrgCode").split("_")[0]);//接收机构公司代码
         jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
-        jgCertificateChangeRecord.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));//使用单位统一信用代码
-        jgCertificateChangeRecord.setUseUnitName(String.valueOf(map.get("useUnitName")));//使用单位名称
+        jgCertificateChangeRecord.setUseUnitCreditCode(MapUtil.getStr(map, "useUnitCreditCode"));//使用单位统一信用代码
+        jgCertificateChangeRecord.setUseUnitName(MapUtil.getStr(map, "useUnitName"));//使用单位名称
         jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
         jgCertificateChangeRecord.setCreateDate(new Date());
         jgCertificateChangeRecord.setRoutePath("");
@@ -5048,11 +5056,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName());
         jgCertificateChangeRecord.setChangeContent(changeContent);//变更内容
         jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
-        jgCertificateChangeRecord.setReceiveOrgName(String.valueOf(map.get("receiveOrgCode")).split("_")[1]);
-        jgCertificateChangeRecord.setReceiveCompanyCode(String.valueOf(map.get("receiveOrgCode")).split("_")[0]);//接收机构公司代码
+        jgCertificateChangeRecord.setReceiveOrgName(MapUtil.getStr(map, "receiveOrgCode").split("_")[1]);
+        jgCertificateChangeRecord.setReceiveCompanyCode(MapUtil.getStr(map, "receiveOrgCode").split("_")[0]);//接收机构公司代码
         jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
-        jgCertificateChangeRecord.setUseUnitCreditCode(String.valueOf(map.get("useUnitCreditCode")));//使用单位统一信用代码
-        jgCertificateChangeRecord.setUseUnitName(String.valueOf(map.get("useUnitName")));//使用单位名称
+        jgCertificateChangeRecord.setUseUnitCreditCode(MapUtil.getStr(map, "useUnitCreditCode"));//使用单位统一信用代码
+        jgCertificateChangeRecord.setUseUnitName(MapUtil.getStr(map, "useUnitName"));//使用单位名称
         jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
         jgCertificateChangeRecord.setCreateDate(new Date());
         jgCertificateChangeRecord.setRoutePath("");
@@ -5100,7 +5108,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         try {
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             CompanyBo company = reginParams.getCompany();
-            String record = String.valueOf(map.get("equipId"));
+            String record = MapUtil.getStr(map, "equipId");
             // 使用登记信息
             JgUseRegistration jgUseRegistration = new JgUseRegistration();
             jgUseRegistration.setRegDate(new Date());
@@ -5112,7 +5120,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setSupervisoryCode(supervisoryCode);
             // 其他附件
             if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
-                jgUseRegistration.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
+                jgUseRegistration.setOtherAccessories(Optional.ofNullable(map.get("otherAccessories")).map(JSON::toJSONString).orElse(null));
             }
             if (map.containsKey("receiveOrgCode")) {
                 // 接收单位信息
@@ -5156,7 +5164,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             // 是否西咸
             if (!ObjectUtils.isEmpty(map.get("isXixian"))) {
-                jgUseRegistration.setIsXixian(String.valueOf(map.get("isXixian")));
+                jgUseRegistration.setIsXixian(MapUtil.getStr(map, "isXixian"));
             }
             // 使用地点
             // 市
@@ -5169,41 +5177,41 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 城市
             if (!ObjectUtils.isEmpty(map.get("city")) && !ObjectUtils.isEmpty(city)) {
                 city.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("city")))) {
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "city"))) {
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
             }
             // 区县
             if (!ObjectUtils.isEmpty(map.get("county")) && !ObjectUtils.isEmpty(city)) {
                 region.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("county")))) {
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "county"))) {
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
             }
             // 街道
             if (!ObjectUtils.isEmpty(map.get("factoryUseSiteStreet")) && !ObjectUtils.isEmpty(city)) {
                 street.forEach(item -> {
-                    if (String.valueOf(item.get("regionCode")).equals(String.valueOf(map.get("factoryUseSiteStreet")))) {
-                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + item.get("regionName"));
+                    if (Objects.equals(MapUtil.getStr(item, "regionCode"), MapUtil.getStr(map, "factoryUseSiteStreet"))) {
+                        jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + MapUtil.getStr(item, "regionName"));
                     }
                 });
             }
             jgUseRegistration.setUseAddress(jgUseRegistration.getUseAddress() + JsonDiffUtil.nullToEmpty(map.getString("address")));
             jgUseRegistration.setAuditPassDate(new Date());
-            jgUseRegistration.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
+            jgUseRegistration.setSequenceNbr(Long.valueOf(MapUtil.getStr(map, "sequenceNbr")));
             this.getBaseMapper().updateById(jgUseRegistration);
             // 历史设备登记生成的 编辑时更新使用登记证管理表
-            updateRegistrationManage(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
+            updateRegistrationManage(Long.valueOf(MapUtil.getStr(map, "sequenceNbr")));
             // 更新使用信息表中的附件信息
             LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
             lambda.eq(IdxBizJgUseInfo::getRecord, record);
             IdxBizJgUseInfo useInfo = new IdxBizJgUseInfo();
-            useInfo.setOldUseRegistrationTable(JSON.toJSONString(map.get("oldUseRegistrationTable")));
-            useInfo.setOldUseRegistrationCertificate(JSON.toJSONString(map.get("oldUseRegistrationCertificate")));
-            useInfo.setORegDate(String.valueOf(map.get("oRegDate")));
-            useInfo.setORegUnit(String.valueOf(map.get("oRegUnit")));
+            useInfo.setOldUseRegistrationTable(Optional.ofNullable(map.get("oldUseRegistrationTable")).map(JSON::toJSONString).orElse(null));
+            useInfo.setOldUseRegistrationCertificate(Optional.ofNullable(map.get("oldUseRegistrationCertificate")).map(JSON::toJSONString).orElse(null));
+            useInfo.setORegDate(MapUtil.getStr(map, "oRegDate"));
+            useInfo.setORegUnit(MapUtil.getStr(map, "oRegUnit"));
             useInfoMapper.update(useInfo, lambda);
 
             // 更新检验检测信息【一对多，暂时只取最新一条数据】
@@ -5211,15 +5219,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (ObjectUtils.isEmpty(inspectionDetectionInfo.getSequenceNbr())) {
                 inspectionDetectionInfo.setRecord((String) map.get("equipId"));
             }
-            inspectionDetectionInfo.setInspectOrgCode(String.valueOf(map.get("inspectOrgCode")));
-            inspectionDetectionInfo.setInspectOrgName(String.valueOf(map.get("inspectOrgName")));
-            inspectionDetectionInfo.setInspectConclusion(String.valueOf(map.get("inspectConclusion")));
-            inspectionDetectionInfo.setInspectType(String.valueOf(map.get("inspectType")));
-            inspectionDetectionInfo.setInspectDate(!StringUtils.isEmpty(map.get("inspectDate")) ? DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd") : null);
-            inspectionDetectionInfo.setInspectStaff(String.valueOf(map.get("inspectStaff")));
-            inspectionDetectionInfo.setNextInspectDate(!StringUtils.isEmpty(map.get("nextInspectDate")) ? DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd") : null);
-            inspectionDetectionInfo.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
-            inspectionDetectionInfo.setInspectReportNo(String.valueOf(map.get("inspectReportNo")));
+            inspectionDetectionInfo.setInspectOrgCode(MapUtil.getStr(map, "inspectOrgCode"));
+            inspectionDetectionInfo.setInspectOrgName(MapUtil.getStr(map, "inspectOrgName"));
+            inspectionDetectionInfo.setInspectConclusion(MapUtil.getStr(map, "inspectConclusion"));
+            inspectionDetectionInfo.setInspectType(MapUtil.getStr(map, "inspectType"));
+            inspectionDetectionInfo.setInspectDate(!StringUtils.isEmpty(map.get("inspectDate")) ? DateUtil.parse(MapUtil.getStr(map, "inspectDate"), "yyyy-MM-dd") : null);
+            inspectionDetectionInfo.setInspectStaff(MapUtil.getStr(map, "inspectStaff"));
+            inspectionDetectionInfo.setNextInspectDate(!StringUtils.isEmpty(map.get("nextInspectDate")) ? DateUtil.parse(MapUtil.getStr(map, "nextInspectDate"), "yyyy-MM-dd") : null);
+            inspectionDetectionInfo.setInspectReport(Optional.ofNullable(map.get("inspectReport")).map(JSON::toJSONString).orElse(null));
+            inspectionDetectionInfo.setInspectReportNo(MapUtil.getStr(map, "inspectReportNo"));
             iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
             // 暂存历史表
             updateHistory(map, record, String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl

@@ -1006,7 +1006,7 @@
 						<w:sz w:val="24"/>
 					</w:rPr>
 					<w:pict>
-						<v:shape id="文本框 17" o:spid="_x0000_s1032" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:394pt;margin-top:501.95pt;height:150.25pt;width:132.05pt;z-index:251672576;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
+						<v:shape id="文本框 17" o:spid="_x0000_s1032" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:394pt;margin-top:485.95pt;height:150.25pt;width:132.05pt;z-index:251672576;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
 							<v:path/>
 							<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
 							<v:stroke on="f" weight="0.5pt"/>
@@ -1106,7 +1106,7 @@
 						<w:sz w:val="24"/>
 					</w:rPr>
 					<w:pict>
-						<v:shape id="文本框 16" o:spid="_x0000_s1033" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:393.25pt;margin-top:455.45pt;height:53.25pt;width:134.3pt;z-index:251671552;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
+						<v:shape id="文本框 16" o:spid="_x0000_s1033" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:393.25pt;margin-top:452.45pt;height:53.25pt;width:134.3pt;z-index:251671552;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
 							<v:path/>
 							<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
 							<v:stroke on="f" weight="0.5pt"/>
@@ -1772,7 +1772,7 @@
 						<w:sz w:val="24"/>
 					</w:rPr>
 					<w:pict>
-						<v:shape id="文本框 18" o:spid="_x0000_s1036" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:135.25pt;margin-top:502.7pt;height:150.25pt;width:135.7pt;z-index:251673600;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
+						<v:shape id="文本框 18" o:spid="_x0000_s1036" o:spt="202" type="#_x0000_t202" style="position:absolute;left:0pt;margin-left:135.25pt;margin-top:485.95pt;height:150.25pt;width:135.7pt;z-index:251673600;mso-width-relative:page;mso-height-relative:page;" fillcolor="#FFFFFF" filled="t" stroked="f" coordsize="21600,21600">
 							<v:path/>
 							<v:fill on="t" color2="#FFFFFF" focussize="0,0"/>
 							<v:stroke on="f" weight="0.5pt"/>

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

@@ -64,7 +64,7 @@ public class IdxBizJgUseInfo extends TzsBaseEntity implements IBaseChangeData {
      *
      */
     @TableField("\"ESTATE_UNIT_CREDIT_CODE\"")
-    @FieldDisplayDefine(value = "产权单位统一信用代码", typeHandler = "estateUnitTypeHandler")
+    @FieldDisplayDefine(value = "产权单位统一信用代码", isRepeatColumn = true)
     private String estateUnitCreditCode;
 
     /**