fix(jg):更名变更，单位变更三级审核业务处理

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.*;
+
+/**
+ * 履历信息关系表（气瓶用）
+ *
+ * @author system_generator
+ * @date 2026-01-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgResumeInfoEqDto", description="")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class JgResumeInfoEqDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "履历主表ID")
+    private String resumeId;
+
+    @ApiModelProperty(value = "设备ID")
+    private String equId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgResumeInfoEq.java

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+
+/**
+ * 监管履历信息关系表
+ *
+ * @author system_generator
+ * @date 2024-05-29
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tzs_jg_resume_info_eq")
+@Builder
+public class JgResumeInfoEq implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
+    private Long sequenceNbr;
+
+    /**
+     * 履历主表id
+     */
+    @TableField("resume_id")
+    private Long resumeId;
+
+    /**
+     * 设备ID
+     */
+    @TableField("equ_id")
+    private String equId;
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfoEq;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2026-01-26
+ */
+public interface JgResumeInfoEqMapper extends CustomBaseMapper<JgResumeInfoEq> {
+
+}
\ No newline at end of file

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

@@ -59,4 +59,6 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
     Integer checkUseRegCertInBusiness(@Param("useRegistrationCode")String useRegistrationCode);
 
     Page<JgUseRegistrationManageDto> queryUseRegistrationManagePage(@Param("page") Page<JgUseRegistrationManageDto> page, @Param("dto") JgUseRegistrationManageDto dto, @Param("sort") SortVo sortMap);
+
+    void batchUpdateManageBySeq(@Param("newUseUnitName")String newUseUnitName, @Param("changeReason")String changeReason, @Param("receiveCompanyCode")String receiveCompanyCode, @Param("receiveOrgName")String receiveOrgName, @Param("seqBatch")List<String> seqBatch);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgResumeInfoEqService.java

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2026-01-26
+ */
+public interface IJgResumeInfoEqService {}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgResumeInfoEqMapper">
+
+</mapper>

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

@@ -790,4 +790,21 @@
             tjurm.create_date DESC
         </where>
     </select>
+
+    <update id="batchUpdateManageBySeq" parameterType="map">
+        <if test="seqBatch != null and seqBatch.size() > 0">
+            UPDATE tzs_jg_use_registration_manage
+            SET
+            use_unit_name = #{newUseUnitName},
+            audit_pass_date = CURRENT_DATE,
+            version = version + 1,
+            change_reason = #{changeReason},
+            receive_company_code =  #{receiveCompanyCode},
+            receive_org_name =  #{receiveOrgName}
+            WHERE sequence_nbr IN
+            <foreach collection="seqBatch" item="seq" open="(" close=")" separator=",">
+                #{seq}
+            </foreach>
+        </if>
+    </update>
 </mapper>

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

@@ -181,4 +181,16 @@ public class JgChangeRegistrationNameController extends BaseController {
         return ResponseHelper.buildResponse(WorkFlowStatusEnum.getInfoList(code));
     }
 
+    /**
+     * 处理更名变更流程结束，业务未结束单子问题
+     * @param applyNo 申请单号
+     * @return s
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/handleChangeRegistrationNameWrongData")
+    @ApiOperation(httpMethod = "POST", value = "处理更名变更流程结束，业务未结束单子问题", notes = "处理更名变更流程结束，业务未结束单子问题")
+    public ResponseModel<Object> handleChangeRegistrationNameWrongData(@RequestParam("applyNo") String applyNo) {
+        jgChangeRegistrationNameService.handleChangeRegistrationNameWrongData(applyNo);
+        return ResponseHelper.buildResponse("ok");
+    }
 }

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfoEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgResumeInfoEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgResumeInfoEqService;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2026-01-26
+ */
+@Service
+public class JgResumeInfoEqServiceImpl extends BaseService<JgResumeInfoEq,JgResumeInfoEq,JgResumeInfoEqMapper> implements IJgResumeInfoEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgResumeInfoEq> queryForJgResumeInfoEqPage(Page<JgResumeInfoEq> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgResumeInfoEq> queryForJgResumeInfoEqList()   {
+        return this.queryForList("" , false);
+    }
+}
\ 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/JgUseRegistrationManageServiceImpl.java

@@ -1080,4 +1080,8 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         }
         return projectContraptionPage;
     }
+
+    public void batchUpdateManageBySeq(String newUseUnitName, String changeReason, String receiveCompanyCode, String receiveOrgName, List<String> seqBatch) {
+        this.baseMapper.batchUpdateManageBySeq(newUseUnitName, changeReason, receiveCompanyCode, receiveOrgName, seqBatch);
+    }
 }
\ No newline at end of file

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

+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ * @author system_generator
+ * @date 2023-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tz_base_individuality")
+public class TzsBaseIndividuality extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+	@TableField("credentials_type")
+    private String credentialsType;
+
+    /**
+     *
+     */
+	@TableField("credentials_num")
+    private String credentialsNum;
+
+    /**
+     *
+     */
+	@TableField("real_name")
+    private String realName;
+
+    /**
+     *
+     */
+	@TableField("expiration_date_start")
+    private String expirationDateStart;
+
+    /**
+     *
+     */
+	@TableField("expiration_date_end")
+    private String expirationDateEnd;
+
+    /**
+     *
+     */
+	@TableField("expiration_date_type")
+    private String expirationDateType;
+
+    /**
+     *
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     *
+     */
+	@TableField("enterprise_id")
+    private Long enterpriseId;
+
+    /**
+     * 证件照片
+     */
+    @TableField("identification_photo")
+    private String identificationPhoto;
+}

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgRegisterInfoMapper.java

@@ -82,4 +82,7 @@ public interface IdxBizJgRegisterInfoMapper extends CustomBaseMapper<IdxBizJgReg
     List<IdxBizJgRegisterInfo> selectDeleteEquipIsNotClaimed(@Param("useUnitCreditCode") String useUnitCreditCode,
                                                              @Param("equList")String equList,
                                                              @Param("dataSource")String dataSource);
+
+    Integer batchUpdateUseOrgCodeByRecord(@Param("useOrgCode") String useOrgCode, @Param("records") List<String> records);
+
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgSupervisionInfoMapper.java

@@ -16,4 +16,7 @@ import java.util.List;
 public interface IdxBizJgSupervisionInfoMapper extends CustomBaseMapper<IdxBizJgSupervisionInfo> {
 
     void updateOrgBranchCodeBatch(@Param("dtos") List<ESEquipmentCategoryDto> esEquipmentCategoryDtos);
+
+    int batchUpdateSupervisionInfo(@Param("orgBranchCode") String orgBranchCode,@Param("orgBranchName") String orgBranchName,@Param("recordList") List<String> recordList);
+
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/IdxBizJgUseInfoMapper.java

@@ -60,4 +60,8 @@ public interface IdxBizJgUseInfoMapper extends CustomBaseMapper<IdxBizJgUseInfo>
     List<String> selectUseInfoOfOneVersionWithParams(@Param("version") Integer version,@Param("params")  Map<String, Object> params);
 
     List<String> selectRecordList(@Param("shard") Integer shard, @Param("slots") Integer slots);
+
+    int batchUpdateUseInfoByRecords(@Param("useInfo") IdxBizJgUseInfo useInfo, @Param("records") List<String> records);
+
+    void updateUseUnitNameByRecords(@Param("useUnitName") String useUnitName, @Param("useUnitCreditCode") String useUnitCreditCode, @Param("records") List<String> records);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzsBaseIndividualityMapper.java

+package com.yeejoin.amos.boot.module.ymt.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzsBaseIndividuality;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-08-31
+ */
+public interface TzsBaseIndividualityMapper extends BaseMapper<TzsBaseIndividuality> {
+}

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/TzsUserInfoMapper.java

@@ -21,4 +21,6 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
     List<TzsUserInfoDto> selectUserPermission(@Param("operator") String operator, @Param("posts") List<String> posts);
 
     List<Map<String, String>> getUserInfoWithExport(@Param("isAdmin") String isAdmin, @Param("ids") List<String> userInfoSeqs);
+
+    void updateBatchUnitName(@Param("userInfoList") List<TzsUserInfo> userInfoList, @Param("unitName") String unitName);
 }

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

@@ -77,6 +77,16 @@
 		AND jui.DATA_SOURCE = #{dataSource}
 		AND jui.USE_UNIT_CREDIT_CODE = #{useUnitCreditCode}
     </select>
+
+	<update id="batchUpdateUseOrgCodeByRecord">
+		UPDATE idx_biz_jg_register_info
+		SET "USE_ORG_CODE" = #{useOrgCode}
+		WHERE "RECORD" IN
+		<foreach collection="records" item="item" open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+	</update>
+
 </mapper>
 
 

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

@@ -13,6 +13,18 @@
 		) AS temp_table("ORG_BRANCH_CODE", "ORG_BRANCH_NAME", "RECORD")
 		WHERE idx_biz_jg_supervision_info."RECORD" = temp_table."RECORD"
 	</update>
+
+	<update id="batchUpdateSupervisionInfo">
+		UPDATE idx_biz_jg_supervision_info
+		SET
+		"ORG_BRANCH_CODE" = #{orgBranchCode},
+		"ORG_BRANCH_NAME" = #{orgBranchName}
+		WHERE "RECORD" IN
+		<foreach collection="recordList" item="record" open="(" separator="," close=")">
+			#{record}
+		</foreach>
+	</update>
+
 </mapper>
 
 

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

@@ -336,4 +336,48 @@
             ABS(MOD(hashtext("RECORD"), #{slots})) = #{shard}
     </select>
 
+    <update id="batchUpdateUseInfoByRecords">
+        UPDATE IDX_BIZ_JG_USE_INFO
+        <set>
+            <if test="useInfo.estateUnitCreditCode != null">
+                ESTATE_UNIT_CREDIT_CODE = #{useInfo.estateUnitCreditCode},
+            </if>
+            <if test="useInfo.estateUnitName != null">
+                ESTATE_UNIT_NAME = #{useInfo.estateUnitName},
+            </if>
+            phone = #{useInfo.phone},
+            USE_UNIT_CREDIT_CODE = #{useInfo.useUnitCreditCode},
+            USE_UNIT_NAME = #{useInfo.useUnitName},
+            SAFETY_MANAGER = #{useInfo.safetyManager},
+            USE_PLACE = #{useInfo.usePlace},
+            PROVINCE_NAME = #{useInfo.provinceName},
+            PROVINCE = #{useInfo.province},
+            CITY = #{useInfo.city},
+            CITY_NAME = #{useInfo.cityName},
+            COUNTY = #{useInfo.county},
+            COUNTY_NAME = #{useInfo.countyName},
+            FACTORY_USE_SITE_STREET = #{useInfo.factoryUseSiteStreet},
+            STREET_NAME = #{useInfo.streetName},
+            ADDRESS = #{useInfo.address},
+            USE_DATE = #{useInfo.useDate}
+        </set>
+        WHERE RECORD IN
+        <foreach collection="records" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updateUseUnitNameByRecords">
+        UPDATE
+        idx_biz_jg_use_info
+        SET
+        USE_UNIT_NAME = #{useUnitName}
+        WHERE
+        USE_UNIT_CREDIT_CODE = #{useUnitCreditCode}
+        and RECORD in
+        <foreach item="item" collection="records" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
 </mapper>

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

@@ -129,4 +129,13 @@
             </if>
         </where>
     </select>
+
+    <update id="updateBatchUnitName">
+        UPDATE tzs_user_info
+        SET unit_name = #{unitName}
+        WHERE sequence_nbr IN
+        <foreach item="item" collection="userInfoList" separator="," close=")" open="(">
+            #{item.sequenceNbr}
+        </foreach>
+    </update>
 </mapper>
\ No newline at end of file