feat(module-jg): 增加单位信息查询功能并优化相关接口

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/FieldMapping.java

+package com.yeejoin.amos.boot.biz.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FieldMapping {
+    /**
+     * 字段映射配置组
+     */
+    FieldMap[] value();
+
+    @interface FieldMap {
+        // 参数索引位置（默认第0个参数）
+        int paramIndex() default 0;
+
+        // 源字段路径（支持嵌套）
+        String sourceField();
+
+        // 目标字段路径（支持嵌套）
+        String targetField();
+
+        // 查询服务类
+        Class<?> serviceClass();
+
+        // 查询方法名
+        String queryMethod();
+
+        // 查询参数类型（默认String）
+        Class<?> queryParamType() default String.class;
+
+        // 是否覆盖源字段
+        boolean overrideSource() default false;
+
+        // 是否直接使用整个参数作为源值
+        boolean useEntireParam() default false;
+
+        // 是否替换整个参数
+        boolean replaceParam() default false;
+    }
+}

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/annotation/ResultFieldMapping.java

+package com.yeejoin.amos.boot.biz.common.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ResultFieldMapping {
+    /**
+     * 需要转换的字段配置
+     */
+    ResultFieldMap[] value();
+
+    @interface ResultFieldMap {
+        // 源字段路径（支持嵌套）
+        String sourceField();
+        // 目标字段路径（支持嵌套）
+        String targetField();
+        // 查询服务类
+        Class<?> serviceClass();
+        // 查询方法名称
+        String queryMethod();
+        // 查询参数类型（默认String）
+        Class<?> queryParamType() default String.class;
+    }
+}
+

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/FieldMappingAspect.java

+package com.yeejoin.amos.boot.biz.common.aop;
+
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+@Aspect
+@Component
+@Slf4j
+public class FieldMappingAspect {
+
+    // 使用Guava Cache构建二级缓存
+    private static final LoadingCache<Class<?>, Map<String, Field>> FIELD_CACHE = CacheBuilder.newBuilder()
+            .maximumSize(1000) // 控制最大缓存类数量
+            .expireAfterAccess(1, TimeUnit.HOURS) // 访问1小时后过期
+            .weakKeys() // 使用弱引用键防止内存泄漏
+            .build(new CacheLoader<Class<?>, Map<String, Field>>() {
+                // 当缓存未命中时，该方法会为指定类创建一个线程安全的空字段映射容器（ConcurrentHashMap），用于后续存储该类的反射字段信息
+                @Override
+                public Map<String, Field> load(Class<?> clazz) {
+                    return new ConcurrentHashMap<>();
+                }
+            });
+
+    // 方法缓存优化
+    private static final LoadingCache<MethodKey, Method> METHOD_CACHE = CacheBuilder.newBuilder()
+            .maximumSize(1000)
+            .expireAfterAccess(1, TimeUnit.HOURS) // 访问1小时后过期
+            .weakKeys() // 使用弱引用键防止内存泄漏
+            .build(new CacheLoader<MethodKey, Method>() {
+                public Method load(MethodKey key) throws Exception {
+                    return key.clazz.getMethod(key.methodName, key.paramTypes);
+                }
+            });
+
+    private final ApplicationContext applicationContext;
+
+    public FieldMappingAspect(ApplicationContext applicationContext) {
+        this.applicationContext = applicationContext;
+    }
+
+    @Around("@annotation(fieldMapping)")
+    public Object doFieldMapping(ProceedingJoinPoint joinPoint, FieldMapping fieldMapping) throws Throwable {
+        Object[] args = joinPoint.getArgs();
+
+        // 遍历处理所有字段映射配置
+        for (FieldMapping.FieldMap mapping : fieldMapping.value()) {
+            processSingleMapping(args, mapping);
+        }
+
+        return joinPoint.proceed(args);
+    }
+
+    private void processSingleMapping(Object[] args, FieldMapping.FieldMap mapping) {
+        // 使用缓存获取方法
+        MethodKey methodKey = new MethodKey(
+                mapping.serviceClass(),
+                mapping.queryMethod(),
+                mapping.queryParamType()
+        );
+        try {
+            if (args.length <= mapping.paramIndex()) return;
+
+            Object paramObj = args[mapping.paramIndex()];
+            Object sourceValue;
+
+            // 获取源值逻辑
+            if (mapping.useEntireParam()) {
+                sourceValue = paramObj;
+            } else {
+                sourceValue = getSourceValue(paramObj, mapping.sourceField());
+            }
+            if (sourceValue == null) {
+                if (mapping.replaceParam()) {
+                    args[mapping.paramIndex()] = null; // 允许清空参数
+                }
+                return;
+            }
+
+            // 服务调用逻辑
+            Object service = applicationContext.getBean(mapping.serviceClass());
+            Method queryMethod = METHOD_CACHE.get(methodKey);
+            Object convertedValue = convertType(sourceValue, mapping.queryParamType());
+            Object result = queryMethod.invoke(service, convertedValue);
+
+            // 设置目标字段
+            if (mapping.replaceParam()) {
+                Class<?> paramType = args[mapping.paramIndex()].getClass();
+                if (!paramType.isAssignableFrom(result.getClass())) {
+                    throw new IllegalArgumentException("类型不匹配: "
+                            + result.getClass() + " cannot be cast to " + paramType);
+                }
+                args[mapping.paramIndex()] = result; // 直接替换参数
+            } else {
+                setTargetValue(
+                        paramObj,
+                        mapping.overrideSource() ? mapping.sourceField() : mapping.targetField(),
+                        result
+                );
+            }
+        } catch (Exception e) {
+            log.error("Field mapping failed for {}: {}", mapping.sourceField(), e.getMessage());
+            Throwable cause = e.getCause();
+            if (cause instanceof NoSuchMethodException) {
+                log.error("Method not found: {}.{}({})",
+                        mapping.serviceClass().getSimpleName(),
+                        mapping.queryMethod(),
+                        mapping.queryParamType().getSimpleName());
+            }
+        }
+    }
+
+    private Object getSourceValue(Object paramObj, String key) {
+        if (key.contains(".")) { // 新增嵌套判断
+            return getNestedFieldValue(paramObj, key);
+        }
+        if (paramObj instanceof Map) {
+            return ((Map<?, ?>) paramObj).get(key);
+        }
+        return getFieldValue(paramObj, key);
+    }
+
+    private Object getFieldValue(Object obj, String fieldName) {
+        try {
+            Field field = getCachedField(obj.getClass(), fieldName);
+            return field != null ? field.get(obj) : null;
+        } catch (IllegalAccessException e) {
+            log.debug("Field access error: {}", e.getMessage());
+            return null;
+        }
+    }
+
+    private Field getCachedField(Class<?> clazz, String fieldName) {
+        try {
+            return FIELD_CACHE.get(clazz)
+                    .computeIfAbsent(fieldName, name -> {
+                        try {
+                            Field field = clazz.getDeclaredField(name);
+                            field.setAccessible(true);
+                            return field;
+                        } catch (NoSuchFieldException e) {
+                            log.debug("Field not found: {} in {}", name, clazz.getName());
+                            return null;
+                        }
+                    });
+        } catch (ExecutionException e) {
+            log.error("Cache operation failed", e);
+            return null;
+        }
+    }
+
+    private Object convertType(Object value, Class<?> targetType) {
+        if (value == null) return null;
+        if (targetType.isAssignableFrom(value.getClass())) {
+            return value;
+        }
+
+        if (targetType == String.class) return value.toString();
+        if (targetType == int.class || targetType == Integer.class) {
+            return Integer.parseInt(value.toString());
+        }
+        if (targetType == long.class || targetType == Long.class) {
+            return Long.parseLong(value.toString());
+        }
+        log.warn("Unsupported type conversion: {} -> {}",
+                value.getClass(), targetType);
+        return value;
+    }
+
+    private void setTargetValue(Object paramObj, String key, Object value) {
+        if (key.contains(".")) { // 新增嵌套判断
+            setNestedFieldValue(paramObj, key, value);
+            return;
+        }
+        if (paramObj instanceof Map) {
+            ((Map<String, Object>) paramObj).put(key, value);
+        } else {
+            Optional.ofNullable(getCachedField(paramObj.getClass(), key))
+                    .ifPresent(field -> {
+                        try {
+                            field.set(paramObj, convertType(value, field.getType()));
+                        } catch (IllegalAccessException e) {
+                            log.debug("Field set error: {}", e.getMessage());
+                        }
+                    });
+        }
+    }
+
+    private Object getNestedFieldValue(Object obj, String fieldPath) {
+        String[] parts = fieldPath.split("\\.");
+        Object current = obj;
+
+        for (String part : parts) {
+            if (current == null) return null;
+
+            if (current instanceof Map) {
+                current = ((Map<?, ?>) current).get(part);
+            } else {
+                Field field = getCachedField(current.getClass(), part);
+                if (field == null) return null;
+                try {
+                    current = field.get(current);
+                } catch (IllegalAccessException e) {
+                    log.debug("Nested field access error: {}", e.getMessage());
+                    return null;
+                }
+            }
+        }
+        return current;
+    }
+
+    private void setNestedFieldValue(Object obj, String fieldPath, Object value) {
+        String[] parts = fieldPath.split("\\.");
+        Object current = obj;
+
+        try {
+            for (int i = 0; i < parts.length - 1; i++) {
+                String part = parts[i];
+
+                if (current instanceof Map) {
+                    current = ((Map<String, Object>) current).computeIfAbsent(part, k -> new HashMap<>());
+                } else {
+                    Field field = getCachedField(current.getClass(), part);
+                    if (field == null) return;
+
+                    Object next = field.get(current);
+                    if (next == null) {
+                        next = field.getType().newInstance();
+                        field.set(current, next);
+                    }
+                    current = next;
+                }
+            }
+
+            String lastPart = parts[parts.length - 1];
+            if (current instanceof Map) {
+                ((Map<String, Object>) current).put(lastPart, value);
+            } else {
+                Field field = getCachedField(current.getClass(), lastPart);
+                if (field != null) {
+                    Object converted = convertType(value, field.getType());
+                    field.set(current, converted);
+                }
+            }
+        } catch (Exception e) {
+            log.error("Nested field set error", e);
+        }
+    }
+
+    @Around("@annotation(resultFieldMapping)")
+    public Object processResultMapping(ProceedingJoinPoint joinPoint, ResultFieldMapping resultFieldMapping) throws Throwable {
+        Object result = joinPoint.proceed();
+        return processResultObject(result, resultFieldMapping.value());
+    }
+
+    private Object processResultObject(Object result, ResultFieldMapping.ResultFieldMap[] resultFieldMaps) {
+        if (result == null || resultFieldMaps.length == 0) return result;
+
+        try {
+            // 处理集合类型
+            if (result instanceof Collection) {
+                ((Collection<?>) result).forEach(item -> processItem(item, resultFieldMaps));
+            }
+            // 处理数组类型
+            else if (result.getClass().isArray()) {
+                Arrays.stream((Object[]) result).forEach(item -> processItem(item, resultFieldMaps));
+            }
+            // 处理单个对象
+            else {
+                processItem(result, resultFieldMaps);
+            }
+        } catch (Exception e) {
+            log.error("Result mapping processing failed", e);
+        }
+        return result;
+    }
+
+    private void processItem(Object item, ResultFieldMapping.ResultFieldMap[] resultFieldMaps) {
+        for (ResultFieldMapping.ResultFieldMap mapping : resultFieldMaps) {
+            try {
+                // 使用缓存获取方法
+                MethodKey methodKey = new MethodKey(
+                        mapping.serviceClass(),
+                        mapping.queryMethod(),
+                        mapping.queryParamType()
+                );
+
+                // 获取源字段值
+                Object sourceFieldValue = getNestedFieldValue(item, mapping.sourceField());
+                if (sourceFieldValue == null) continue;
+
+                // 转换类型
+                Object convertedValue = convertType(sourceFieldValue, mapping.queryParamType());
+
+                // 调用服务查询
+                Object service = applicationContext.getBean(mapping.serviceClass());
+                Method method = METHOD_CACHE.get(methodKey);
+                Object targetFieldValue = method.invoke(service, convertedValue);
+
+                // 设置名称值
+                setNestedFieldValue(item, mapping.targetField(), targetFieldValue);
+            } catch (Exception e) {
+                log.warn("Field mapping failed for {}: {}", mapping.sourceField(), e.getMessage());
+            }
+        }
+    }
+
+        // 在FieldMappingAspect类内部添加
+    private static class MethodKey {
+        final Class<?> clazz;
+        final String methodName;
+        final Class<?>[] paramTypes;
+
+        MethodKey(Class<?> clazz, String methodName, Class<?>... paramTypes) {
+            this.clazz = clazz;
+            this.methodName = methodName;
+            this.paramTypes = paramTypes;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            MethodKey methodKey = (MethodKey) o;
+            return Objects.equals(clazz, methodKey.clazz) &&
+                    Objects.equals(methodName, methodKey.methodName) &&
+                    Arrays.equals(paramTypes, methodKey.paramTypes);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = Objects.hash(clazz, methodName);
+            result = 31 * result + Arrays.hashCode(paramTypes);
+            return result;
+        }
+    }
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgUseRegistrationManageDto.java

@@ -141,4 +141,7 @@ public class JgUseRegistrationManageDto extends BaseDto {
 
     @ApiModelProperty("是否可以做业务-西安电梯导入用（0-否，1-是）")
     private String isDoBusiness;
+
+    @ApiModelProperty("使用单位seq")
+    private String useUnitSeq;
 }

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

@@ -4,7 +4,6 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
-import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.biz.common.dto.KeyValueDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jg.api.bo.JgBizCountDataBO;
@@ -290,5 +289,11 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
     List<KeyValueDto> queryAllCompanyDict();
 
     Integer checkRecordUniqueness(String record);
+
+    String queryUnitCreditInfoBySeq(String unitSeq);
+
+    String queryUnitInfoByCreditCode(String unitCreditCode);
+
+    List<Map<String, Object>> getUnitInfoListByType(String type);
 }
 

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

@@ -281,4 +281,7 @@ public class JgVehicleInformationVo implements Serializable {
 
     @ApiModelProperty(value = "投用日期")
     private String useDate;
+
+    @ApiModelProperty(value = "产权单位seq")
+    private String estateUnitSeq;
 }

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

@@ -22,6 +22,27 @@
         </if>
     </select>
 
+    <select id="getUnitInfoListByType" resultType="java.util.Map">
+        SELECT sequence_nbr AS useCode,
+        CASE
+        WHEN unit_type = '个人主体'
+        THEN CONCAT(use_unit, '_', SUBSTRING(use_unit_code, LENGTH(use_unit_code) - 3, 4))
+        ELSE use_unit
+        END AS useUnit
+        FROM tz_base_enterprise_info
+        WHERE is_delete = '0'
+        <if test="type != null and type != 'all'">
+            <choose>
+                <when test="type == '使用单位'">
+                    and ( unit_type = '个人主体' OR unit_type LIKE CONCAT('%', #{type}, '%') )
+                </when>
+                <otherwise>
+                    and unit_type LIKE CONCAT('%', #{type}, '%')
+                </otherwise>
+            </choose>
+        </if>
+    </select>
+
     <select id="getSecurityAdmin" resultType="java.util.Map">
         SELECT
         sequence_nbr sequenceNbr,
@@ -2762,4 +2783,12 @@
     <select id="checkRecordUniqueness" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM idx_biz_jg_use_info jui WHERE jui.record = #{record}
     </select>
+
+    <select id="queryUnitCreditInfoBySeq" resultType="java.lang.String">
+        select concat(use_unit_code, '_', use_unit) useUnitCreditCode from tz_base_enterprise_info where sequence_nbr = #{unitSeq}
+    </select>
+
+    <select id="queryUnitInfoByCreditCode" resultType="java.lang.String">
+        select sequence_nbr seq from tz_base_enterprise_info where use_unit_code = #{unitCreditCode}
+    </select>
 </mapper>

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

@@ -414,7 +414,9 @@
     <select id="queryForUnitByProjectContraptionPage"
             resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
         SELECT distinct
-        ibjpc.*
+        ibjpc.*,
+        (SELECT CONCAT(ESTATE_UNIT_CREDIT_CODE, '_', ESTATE_UNIT_NAME) FROM idx_biz_jg_use_info
+        WHERE "PROJECT_CONTRAPTION_ID" = ibjpc."sequence_nbr" ORDER BY REC_DATE DESC LIMIT 1) AS estateUnitName
         FROM
         idx_biz_jg_project_contraption ibjpc
         left join tzs_jg_use_registration_manage tjurm ON ibjpc.use_registration_code = tjurm.use_registration_code

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -20,6 +21,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgCertificateReplenishServic
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IPdfService;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgRegistrationHistoryServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
@@ -145,7 +147,7 @@ public class CommonController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "通过单位类型获取单位列表", notes = "通过单位类型获取单位列表")
     public ResponseModel<List<Map<String, Object>>> getUnitList(@RequestParam(value = "type") String type,
                                                                 @RequestParam(value = "business", required = false) String business) {
-        return ResponseHelper.buildResponse(commonService.getUnitListByType(type, business));
+        return ResponseHelper.buildResponse(commonService.getUnitListByType(type, business, false));
     }
 
     /**
@@ -162,7 +164,7 @@ public class CommonController extends BaseController {
         String companyType = getSelectedOrgInfo().getCompany().getCompanyType();
         List<Map<String, Object>> result = new ArrayList<>();
         if (COMPANY_TYPE_SUPERVISION_NAME.equals(companyType)) {
-            result = commonService.getUnitListByType("use", null);
+            result = commonService.getUnitListByType("use", null, false);
         }else {
             result.add(MapBuilder.<String, Object>create()
                     .put("useCode", getSelectedOrgInfo().getCompany().getCompanyCode())
@@ -395,6 +397,26 @@ public class CommonController extends BaseController {
     @PostMapping(value = "/saveOrSubmit")
     @ApiOperation(httpMethod = "POST", value = "业务发起公共接口", notes = "业务发起公共接口")
     @RestEventTrigger(value = "operateLogRestEventHandler")
+    @FieldMapping({
+            @FieldMapping.FieldMap(
+                    sourceField = "notice.estateUnitSeq",
+                    paramIndex = 1,
+                    targetField = "notice.estateUnitName",
+                    serviceClass = CommonServiceImpl.class,
+                    queryMethod = "queryUnitCreditInfoBySeq"),
+            @FieldMapping.FieldMap(
+                    sourceField = "notice.propertyUnitSeq",
+                    paramIndex = 1,
+                    targetField = "notice.propertyUnitName",
+                    serviceClass = CommonServiceImpl.class,
+                    queryMethod = "queryUnitCreditInfoBySeq"),
+            @FieldMapping.FieldMap(
+                    sourceField = "notice.useUnitSeq",
+                    paramIndex = 1,
+                    targetField = "notice.useUnitCreditCode",
+                    serviceClass = CommonServiceImpl.class,
+                    queryMethod = "queryUnitCreditInfoBySeq")
+    })
     public ResponseModel<Object> save(@RequestParam(value = "submitType", required = false) String submitType,
                                       @RequestBody Map<String, Object> map) {
         ReginParams reginParams = getSelectedOrgInfo();
@@ -827,6 +849,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "使用登记表生成", notes = "使用登记表生成")
     @PostMapping(value = "/getRegistrationFormUrl")
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "formData.estateUnitSeq", targetField = "formData.estateUnitName", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq", overrideSource = true)})
     public ResponseModel<Map<String, Object>> getRegistrationFormUrl(@RequestBody JSONObject map) {
         JSONObject formData = JSONObject.parseObject(JSONObject.toJSONString(map.get("formData")));
         String manageType = String.valueOf(map.get("manageType"));
@@ -866,6 +889,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "pdf流生成", notes = "pdf流生成")
     @PostMapping(value = "/getRegistrationFormStream")
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "formData.estateUnitSeq", targetField = "formData.estateUnitName", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")})
     public void getRegistrationFormStream(@RequestBody JSONObject map, HttpServletResponse response) {
         JSONObject formData = JSONObject.parseObject(JSONObject.toJSONString(map.get("formData")));
         String manageType = String.valueOf(map.get("manageType"));
@@ -891,6 +915,7 @@ public class CommonController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "使用登记表/补证申请表生成", notes = "使用登记表/补证申请表生成")
     @PostMapping(value = "/getRegistrationOrCertReplenishFormUrl")
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "formData.estateUnitSeq", targetField = "formData.estateUnitName", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")})
     public ResponseModel<Map<String, Object>> getRegistrationOrCertReplenishFormUrl(@RequestBody JSONObject jsonObject) {
         String formBusinessType = Objects.toString(jsonObject.get("formBusinessType"));
         if (ApplicationFormTypeEnum.BZDJ.getBusinessCode().equals(formBusinessType)) {
@@ -905,4 +930,12 @@ public class CommonController extends BaseController {
         }
         return ResponseHelper.buildResponse(null);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUnitInfoList")
+    @ApiOperation(httpMethod = "GET", value = "通过单位类型获取单位列表-返回数据主键", notes = "通过单位类型获取单位列表-返回数据主键")
+    public ResponseModel<List<Map<String, Object>>> getUnitInfoList(@RequestParam(value = "type") String type,
+                                                                @RequestParam(value = "business", required = false) String business) {
+        return ResponseHelper.buildResponse(commonService.getUnitListByType(type, business, true));
+    }
 }

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

@@ -3,10 +3,12 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,12 +23,16 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -120,6 +126,9 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "设备注册信息分页查询", notes = "设备注册信息分页查询")
+    @FieldMapping({
+            @FieldMapping.FieldMap(sourceField = "useUnitSeq", targetField = "useUnitCreditCode", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq"),
+    })
     public ResponseModel<Page<JSONObject>> queryForPage(@RequestParam Map<String, Object> map) {
         JSONObject jsonObject = new JSONObject(map);
         return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.queryForEquipmentRegisterPage(jsonObject));

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeVehicleRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeVehicleRegistrationUnit;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeVehicleRegistrationUnitServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -122,6 +124,7 @@ public class JgChangeVehicleRegistrationUnitController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping (value = "/getUseRegistrationCodeData")
 	@ApiOperation(httpMethod = "GET", value = "获取当前企业，某接收机构审批的使用登记证信息", notes = "获取当前企业，某接收机构审批的使用登记证信息")
+	@FieldMapping({@FieldMapping.FieldMap(paramIndex = 2, useEntireParam = true, sourceField = "useUnitCreditCode", replaceParam = true, targetField = "useUnitCreditCode", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")})
 	public ResponseModel<Page<JgUseRegistrationManageDto>> getUseRegistrationCodeData(
 			@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size,

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

@@ -20,7 +20,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * 改造告知

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

@@ -3,11 +3,13 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.CaseFormat;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import io.swagger.annotations.Api;
@@ -342,6 +344,7 @@ public class JgUseRegistrationManageController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/unitChange/page")
     @ApiOperation(httpMethod = "GET", value = "单位变更分页查询", notes = "单位变更分页查询")
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "useUnitSeq", targetField = "originalUseUnitCreditCode", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")})
     public ResponseModel<Page<JgUseRegistrationManageDto>> queryForUnitChangePage(JgUseRegistrationManageDto dto,
                                                                         @RequestParam(value = "sort", required = false) String sort,
                                                                         @RequestParam(value = "current") int current,
@@ -366,10 +369,11 @@ public class JgUseRegistrationManageController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/unitChangeByProjectContraption/page")
     @ApiOperation(httpMethod = "GET", value = "单位变更选择工程/装置分页查询", notes = "单位变更选择工程/装置分页查询")
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "useUnitSeq", targetField = "originalUseUnitCreditCode", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")})
     public ResponseModel<Page<IdxBizJgProjectContraption>> queryForUnitByProjectContraptionPage(@RequestParam Map<String, String> params,
-                                                                                  @RequestParam(value = "sort", required = false) String sort,
-                                                                                  @RequestParam(value = "current") int current,
-                                                                                  @RequestParam(value = "size") int size) {
+                                                                                                @RequestParam(value = "sort", required = false) String sort,
+                                                                                                @RequestParam(value = "current") int current,
+                                                                                                @RequestParam(value = "size") int size) {
         Page<IdxBizJgProjectContraption> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgVehicleInformationVo;
-import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgVehicleInformationServiceImpl;
-import org.typroject.tyboot.component.event.RestEventTrigger;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 车用气瓶控制类
@@ -48,6 +49,7 @@ public class JgVehicleInformationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增车用气瓶控制类", notes = "新增车用气瓶控制类")
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "estateUnitSeq", targetField = "estateUnitName", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")})
     public ResponseModel<Object> saveOrSubmit(@RequestBody JSONObject map, @RequestParam(value = "submit") String submit) {
         return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.save(submit, 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/ICommonService.java

@@ -36,7 +36,7 @@ public interface ICommonService {
 
     List<LinkedHashMap> creatTree();
 
-    List<Map<String, Object>> getUnitListByType(String type, String business);
+    List<Map<String, Object>> getUnitListByType(String type, String business, Boolean needAuth);
 
     /**
      * 查询所有检验检测信息

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

@@ -19,6 +19,7 @@ import com.itextpdf.text.pdf.AcroFields;
 import com.itextpdf.text.pdf.BaseFont;
 import com.itextpdf.text.pdf.PdfReader;
 import com.itextpdf.text.pdf.PdfStamper;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -824,7 +825,7 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
-    public List<Map<String, Object>> getUnitListByType(String type, String business) {
+    public List<Map<String, Object>> getUnitListByType(String type, String business, Boolean needAuth) {
 
         switch (type) {
             case "use":
@@ -858,7 +859,7 @@ public class CommonServiceImpl implements ICommonService {
             List<DictionarieValueModel> result = Systemctl.dictionarieClient.dictValues("OLD_USE_UNIT").getResult();
             result.forEach(x -> convertAndAddToUnitList(x, unitList));
         }
-        List<Map<String, Object>> unitListByType = commonMapper.getUnitListByType(type);
+        List<Map<String, Object>> unitListByType = needAuth ? commonMapper.getUnitInfoListByType(type) : commonMapper.getUnitListByType(type);
         unitList.addAll(unitListByType);
         return unitList;
     }
@@ -1372,6 +1373,9 @@ public class CommonServiceImpl implements ICommonService {
     }
 
     @Override
+    @FieldMapping({
+            @FieldMapping.FieldMap(sourceField = "second.estateUnitSeq", targetField = "second.estateUnitName", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")
+    })
     public Object invokeBusinessType(Map<String, Object> map) {
         String historyEquType = (String) map.get(HISTORY_EQU_TYPE);
         JSONObject jsonObject = new JSONObject((Map<String, Object>) map.get(SECOND));
@@ -2295,10 +2299,6 @@ public class CommonServiceImpl implements ICommonService {
             formData.put("type", "SP_TT");
         }
 
-        //如果是历史无证的修改类型为SP_TT并且枚举没有在登记类型中
-        if (Objects.isNull(RegistrationTypeEnum.getNameByType(formData.getString("type"))) && "jg_his_black".equals(formData.getString("dataSource"))) {
-            formData.put("type", "SP_TT");
-        }
         //登记类型
         if (formData.containsKey("type")) {
             formData.put("registrationType", RegistrationTypeEnum.getNameByType(formData.getString("type")));
@@ -3035,4 +3035,27 @@ public class CommonServiceImpl implements ICommonService {
         }
         return commonMapper.isRegistrationNumberUsedByOtherUnits(useRegistrationCode, companyCode);
     }
+
+    /**
+     * 根据单位ID查询单位的信用代码及名称
+     * @param unitSeq 单位seq
+     * @return 单位信用代码_单位名称
+     */
+    public String queryUnitCreditInfoBySeq(String unitSeq) {
+        return commonMapper.queryUnitCreditInfoBySeq(unitSeq);
+    }
+
+    /**
+     * 根据单位信息查询单位seq
+     * @param unitInfo 单位信息
+     * @return 单位seq
+     */
+    public String queryUnitInfoByCreditCode(String unitInfo) {
+        if (StringUtils.isBlank(unitInfo)) {
+            return "";
+        }
+        String unitCreditCode = unitInfo.split("_")[0];
+        return commonMapper.queryUnitInfoByCreditCode(unitCreditCode);
+    }
+
 }
\ 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/IdxBizJgRegisterInfoServiceImpl.java

@@ -560,7 +560,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             //更新时工业管道（8300）检验检测信息
             IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(toJSONString(pipeline), IdxBizJgInspectionDetectionInfo.class);
             if (!ValidationUtil.isEmpty(inspectionDetectionInfo)) {
-                List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars");
+                List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars", false);
                 Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
                 Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
                 inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
@@ -2535,7 +2535,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         } else {
             if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) || !ObjectUtils.isEmpty(map.getString("useUnitCreditCode"))) {
                 BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
-                String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : map.getString("useUnitCreditCode");
+                String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : String.valueOf(map.get("useUnitCreditCode")).split("_")[0];
                 String param = QueryParser.escape(uucc);
                 param = param.contains("_") ? param.split("_")[0] : param;
                 uuccBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", param));
@@ -2934,7 +2934,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         } else {
             if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) || !ObjectUtils.isEmpty(map.getString("useUnitCreditCode"))) {
                 BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
-                String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : map.getString("useUnitCreditCode");
+                String uucc = !ValidationUtil.isEmpty(map.getString("USE_UNIT_CREDIT_CODE")) ? map.getString("USE_UNIT_CREDIT_CODE") : String.valueOf(map.get("useUnitCreditCode")).split("_")[0];
                 String param = QueryParser.escape(uucc);
                 param = param.contains("_") ? param.split("_")[0] : param;
                 uuccBuilder.must(QueryBuilders.matchQuery("USE_UNIT_CREDIT_CODE", param));
@@ -3241,7 +3241,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
             } else if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory)) {
                 IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
-                List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars");
+                List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars", false);
                 Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
                 Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
                 inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
@@ -3267,7 +3267,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             } else if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory)) {
                 //更新时 固定式压力容器（2100）和 气瓶（2300）可以更新检验检测信息
                 IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
-                List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars");
+                List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars", false);
                 Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
                 Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
                 inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));

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

@@ -835,7 +835,7 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
         List<JSONObject> equipmentLists = this.queryEquByCert(registrationManage.getUseRegistrationCode());
         result.put(EQU_LISTS, equipmentLists);
         result.put(useRegistrationCode, registrationManage.getUseRegistrationCode());
-        result.put(equUseAddress, registrationManage.getEquUseAddress());
+        result.put(equUseAddress, StringUtils.isEmpty(registrationManage.getEquUseAddress())?  "" : registrationManage.getEquUseAddress());
         return result;
     }
 

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

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -148,6 +150,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      */
     @GlobalTransactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
+    @FieldMapping({@FieldMapping.FieldMap(paramIndex = 1, sourceField = "notice.estateUnitSeq", targetField = "transferUseInfo", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitCreditInfoBySeq")})
     public List<JgChangeRegistrationTransferDto> createTransfer(String submitType, JSONObject map, ReginParams reginParams) {
         try {
             Map<String, Object> tableData = (Map<String, Object>) map.get(TABLE_PAGE_ID);
@@ -600,6 +603,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @return
      */
     @Override
+    @ResultFieldMapping({@ResultFieldMapping.ResultFieldMap(sourceField = "changeRegistrationTransfer.transferUseInfo", targetField = "changeRegistrationTransfer.estateUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")})
     public Map<String, Map<String, Object>> getTransferDetail(String sequenceNbr) {
         Map<String, Map<String, Object>> pageDataMap = new HashMap<>();
         Map<String, Object> resultDataMap = new HashMap<>();

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -39,7 +40,6 @@ import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
 import io.seata.spring.annotation.GlobalTransactional;
-import lombok.var;
 import org.apache.commons.lang3.ObjectUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -192,6 +192,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * @return 单位变更
      */
     @Override
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "changeRegisInfo.useUnitCreditCode", targetField = "changeRegisInfo.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")
+    })
     public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
         // 单位变更信息
         JgChangeRegistrationUnit notice = JgChangeRegistrationUnitMapper.selectById(sequenceNbr);

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -808,6 +809,9 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         return Boolean.TRUE;
     }
 
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "useUnitCreditCode", targetField = "useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")
+    })
     public Map<String, Object> getDetails(String sequenceNbr, ReginParams selectedOrgInfo) {
         JgChangeVehicleRegistrationUnit registrationUnit = this.getById(sequenceNbr);
         this.doCompensate(registrationUnit);

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.util.StringUtil;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
@@ -209,6 +210,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
      * @return 安装告知
      */
     @Override
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "installationInfo.useUnitCreditCode", targetField = "installationInfo.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
+            @ResultFieldMapping.ResultFieldMap(sourceField = "installationInfo.propertyUnitName", targetField = "installationInfo.propertyUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")
+    })
     public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, String companyLevel) {
         // 安装告知信息
         JgInstallationNotice notice = jgInstallationNoticeMapper.selectById(sequenceNbr);

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -162,6 +163,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
      * @return 维修告知
      */
     @Override
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "maintainInfo.useUnitCreditCode", targetField = "maintainInfo.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
+    })
     public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
         // 维修告知信息
         JgMaintainNotice notice = jgMaintainNoticeMapper.selectById(sequenceNbr);

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

@@ -10,14 +10,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
@@ -55,7 +56,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -147,6 +147,9 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
      * @return 改造告知
      */
     @Override
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "useUnitCreditCode", targetField = "useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
+    })
     public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
         // 改造告知信息
         JgReformNotice notice = jgReformNoticeMapper.selectById(sequenceNbr);

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -128,6 +129,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
      * @return 移装告知
      */
     @Override
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "transferNoticeInfo.useUnitCreditCode", targetField = "transferNoticeInfo.useUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode"),
+    })
     public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr, String companyLevel) {
         // 移装告知信息
         JgTransferNotice notice = jgTransferNoticeMapper.selectById(sequenceNbr);

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

@@ -15,6 +15,8 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldMapping;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
@@ -2154,6 +2156,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    @ResultFieldMapping({
+            @ResultFieldMapping.ResultFieldMap(sourceField = "estateUnitName", targetField = "estateUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")
+    })
     public Map<String, Object> getDetail(String record, Long sequenceNbr, ReginParams selectedOrgInfo) {
         if (!ObjectUtils.isEmpty(sequenceNbr)) {
             JgUseRegistration jgUseRegistration = this.getBaseMapper().selectById(sequenceNbr);

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

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -13,6 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -593,7 +593,8 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
      * @param selectedOrgInfo
      * @return JgVehicleInformationModel
      */
-    public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
+        @ResultFieldMapping({@ResultFieldMapping.ResultFieldMap(sourceField = "estateUnitName", targetField = "estateUnitSeq", serviceClass = CommonServiceImpl.class, queryMethod = "queryUnitInfoByCreditCode")})
+        public JgVehicleInformationVo queryBySequenceNbr(Long sequenceNbr, ReginParams selectedOrgInfo) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())) + "", ReginParams.class);
         JgVehicleInformationVo vo = new JgVehicleInformationVo();
         JgVehicleInformationDto dto = this.baseMapper.queryBySequenceNbr(sequenceNbr);

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

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.ymt.api.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
 
@@ -288,4 +287,7 @@ public class IdxBizJgProjectContraption extends BaseEntity {
     @TableField(exist = false)
     private Boolean disableBasicButton;
 
+    @TableField(exist = false)
+    private String estateUnitName;
+
 }

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

@@ -2604,10 +2604,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
         List<ESEquipmentCategoryDto> saveList = new ArrayList<>();
 
         // 批量获取旧数据
-        for (String record : paramMap.keySet()) {
-            Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
-            optional.ifPresent(dto -> oldDataMap.put(record, dto));
-        }
+//        for (String record : paramMap.keySet()) {
+//            Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
+//            optional.ifPresent(dto -> oldDataMap.put(record, dto));
+//        }
+        Iterable<ESEquipmentCategoryDto> optiona = esEquipmentCategory.findAllById(paramMap.keySet());
+        optiona.forEach(dto -> oldDataMap.put(dto.getSEQUENCE_NBR(), dto));
 
         for (Map.Entry<String, Map<String, Object>> entry : paramMap.entrySet()) {
             String record = entry.getKey();