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

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

@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
+import java.util.List;
 
 /**
  * 使用登记设备关系表 Mapper 接口
@@ -14,4 +15,8 @@ import org.apache.ibatis.annotations.Update;
 public interface JgUseRegistrationEqMapper extends BaseMapper<JgUseRegistrationEq> {
     @Update("update tzs_jg_use_registration_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
+
+
+    void batchInsert(@Param("equipTransferId") String equipTransferId, @Param("jgRelationEquipList") List<JgUseRegistrationEq> jgRelationEquipList);
+
 }

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

@@ -2,4 +2,11 @@
 <!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.JgUseRegistrationEqMapper">
 
+    <insert id="batchInsert">
+        INSERT INTO tzs_jg_use_registration_eq (sequence_nbr,equip_transfer_id, equ_id)
+        VALUES
+        <foreach collection="jgRelationEquipList" item="item" separator=",">
+            (#{item.sequenceNbr},#{equipTransferId}, #{item.equId})
+        </foreach>
+    </insert>
 </mapper>

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

@@ -977,32 +977,50 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                                 .collect(Collectors.toList())
                 ).list();
 
-        registrationList.forEach(registrationManage -> {
-            registrationManage.setReceiveOrgName(transfer.getReceiveOrgName());
-            registrationManage.setReceiveCompanyCode(transfer.getReceiveOrgCode());
-            registrationManage.setAuditPassDate(new Date());
-            registrationManage.setEquUseAddress(transfer.getFullAddress());
-            if (isUpdateRegistrationCode && !StringUtils.isEmpty(registrationManage.getUseRegistrationCode())
-                    && device.getUseRegistrationCode() != null && device.getUseRegistrationCode().equals(registrationManage.getUseRegistrationCode())) {
-                registrationManage.setUseRegistrationCode(useRegistrationCode);
-            }
-            registrationManage.setCertificateStatus("已登记");
-            registrationManage.setApplyNo(transfer.getApplyNo());
-        });
+        List<JgUseRegistrationManage> newRegistrationList = new ArrayList<>();
         List<JSONObject> updatedRegistrationList = registrationList.stream()
                 .map(registrationManage -> {
-                    JSONObject jsonObject = (JSONObject) JSON.toJSON(registrationManage);
+                    // 创建并设置新的 JgUseRegistrationManage 对象
+                    JgUseRegistrationManage registrationManageNew = new JgUseRegistrationManage();
+                    BeanUtils.copyProperties(registrationManage, registrationManageNew);
+                    registrationManageNew.setReceiveOrgName(transfer.getReceiveOrgName());
+                    registrationManageNew.setReceiveCompanyCode(transfer.getReceiveOrgCode());
+                    registrationManageNew.setAuditPassDate(new Date());
+                    registrationManageNew.setEquUseAddress(transfer.getFullAddress());
+
+                    // 更新使用登记码逻辑
+                    if (isUpdateRegistrationCode &&
+                            !StringUtils.isEmpty(registrationManageNew.getUseRegistrationCode()) &&
+                            device.getUseRegistrationCode() != null &&
+                            device.getUseRegistrationCode().equals(registrationManageNew.getUseRegistrationCode())) {
+                        registrationManageNew.setUseRegistrationCode(useRegistrationCode);
+                    }
+
+                    registrationManageNew.setCertificateStatus("已登记");
+                    registrationManageNew.setApplyNo(transfer.getApplyNo());
+                    registrationManageNew.setSequenceNbr(null);
+
+                    // 添加到新列表中
+                    newRegistrationList.add(registrationManageNew);
+
+                    // 创建并返回 JSON 对象
+                    JSONObject jsonObject = (JSONObject) JSON.toJSON(registrationManageNew);
                     jsonObject.put("auditPassDate", new SimpleDateFormat("yyyy-MM-dd").format(registrationManage.getAuditPassDate()));
-                    jsonObject.put("applyNo", transfer.getApplyNo());
-                    jsonObject.put("equUseAddress", registrationManage.getEquUseAddress());
-                    jsonObject.put("certificateStatus", registrationManage.getCertificateStatus());
-                    jsonObject.put("receiveCompanyCode", registrationManage.getReceiveCompanyCode());
-                    jsonObject.put("receiveOrgName", registrationManage.getReceiveOrgName());
-                    jsonObject.put("regType", registrationManage.getRegType());
+                    jsonObject.put("applyNo", registrationManageNew.getApplyNo());
+                    jsonObject.put("equUseAddress", registrationManageNew.getEquUseAddress());
+                    jsonObject.put("certificateStatus", registrationManageNew.getCertificateStatus());
+                    jsonObject.put("receiveCompanyCode", registrationManageNew.getReceiveCompanyCode());
+                    jsonObject.put("receiveOrgName", registrationManageNew.getReceiveOrgName());
+                    jsonObject.put("regType", registrationManageNew.getRegType());
+
                     return jsonObject;
                 })
                 .collect(Collectors.toList());
-        useRegistrationManageService.updateBatchById(registrationList);
+
+        // 批量保存新的注册管理对象
+        useRegistrationManageService.saveBatch(newRegistrationList);
+
+        // 保存历史数据
         historyJson.put("registrationList", updatedRegistrationList);
         historyData.setChangeData(JSONObject.toJSONString(historyJson));
     }

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

@@ -1054,7 +1054,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         JgUseRegistration jgUseRegistration = this.baseMapper.selectById(sequenceNbr);
 
         LambdaQueryWrapper<JgUseRegistrationManage> queryWrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
-                .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode());
+                .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode())
+                .eq(JgUseRegistrationManage::getIsDelete, 0);
         JgUseRegistrationManage jgUseRegistrationManage = jgUseRegistrationManageService.getBaseMapper().selectOne(queryWrapper);
 
         if (!ValidationUtil.isEmpty(jgUseRegistrationManage)) {
@@ -2541,6 +2542,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
         JgUseRegistrationManage registrationManage = new JgUseRegistrationManage();
         registrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
+        registrationManage.setIsDelete(true);
         LambdaQueryWrapper<JgUseRegistrationManage> wrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode());
         jgUseRegistrationManageMapper.update(registrationManage, wrapper);

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

@@ -1402,6 +1402,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             return;
         }
         JgUseRegistrationManage registrationManage = new JgUseRegistrationManage();
+        registrationManage.setIsDelete(true);
         registrationManage.setCertificateStatus(CertificateStatusEnum.YIZHUXIAO.getName());
         LambdaQueryWrapper<JgUseRegistrationManage> wrapper = new LambdaQueryWrapper<JgUseRegistrationManage>()
                 .eq(JgUseRegistrationManage::getUseRegistrationCode, jgVehicleInformation.getUseRegistrationCode());

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/InformationManageTypeEnum.java

@@ -13,7 +13,7 @@ public enum InformationManageTypeEnum {
      * 信息化管理情况枚举
      */
     TYPE_QR_CODE("1", "二维码"),
-    TYPE_STAMP("2", "二维码"),
+    TYPE_STAMP("2", "电子标签"),
     TYPE_NO("99", "无");
 
     private String code;