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/entity/JgCertificateChangeRecord.java

@@ -2,7 +2,8 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

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

@@ -174,6 +174,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
 
+    @Autowired
+    private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
+
     /**
      * 根据sequenceNbr查询
      *
@@ -1068,14 +1071,19 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
                     jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
                     jgCertificateChangeRecord.setCreateDate(new Date());
+                    jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
                     jgCertificateChangeRecord.setSequenceNbr(sequence.nextId());
                     certificateChangeRecordService.save(jgCertificateChangeRecord);
+                    // 查询设备制造信息
+                    LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
+                    factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
+                    IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
 
                     // 生成tzs_jg_certificate_change_record_eq记录
                     JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
                     changeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());//登记证记录主键
-                    changeRecordEq.setRecDate(new Date());
-                    changeRecordEq.setEquId(idxBizJgRegisterInfo.getRecord());//设备主键
+                    changeRecordEq.setEquId(jgRelationEquip.getEquId());//设备主键
+                    changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
                     certificateChangeRecordEqService.save(changeRecordEq);
 
                     jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()

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

@@ -874,21 +874,28 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             if (!CollectionUtils.isEmpty(equipmentLists)) {
                 for (int i = 0; i < equipmentLists.size(); i++) {
                     Map<String, Object> equipment = equipmentLists.get(i);
-                    mapData.put("equipId", equipment.get("record"));
+                    // 设备ID
+                    String equId = (String) equipment.get("record");
+                    mapData.put("equipId", equId);
                     mapData.put("isFirstEquip", i == 0);
 
                     // 注册信息
                     LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
-                    lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(mapData.get("equipId")));
+                    lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, equId);
                     IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
 
                     processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo);
 
+                    // 查询设备制造信息
+                    LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
+                    factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, equId);
+                    IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
+
                     // 生成tzs_jg_certificate_change_record_eq记录
                     JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
                     changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
-                    changeRecordEq.setRecDate(new Date());
                     changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
+                    changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());//产品编号
                     certificateChangeRecordEqService.save(changeRecordEq);
                 }
             }
@@ -1059,13 +1066,15 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             lambdaSelect.eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr));
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambdaSelect);
             JSONObject mapData = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
+            // 设备ID
+            String equId = String.valueOf(mapData.get("equipId"));
 
             // 登记证记录主键
             Long changeRecordId= sequence.nextId();
 
             // 注册信息
             LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
-            lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(mapData.get("equipId")));
+            lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, equId);
             IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
 
             processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo);
@@ -1076,11 +1085,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 生成一条tzs_jg_certificate_change_record记录
             generateCertificateChangeRecord(jgUseRegistration,registerInfo,changeRecordId);
 
+            // 查询设备制造信息
+            LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
+            factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, equId);
+            IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
+
             // 生成tzs_jg_certificate_change_record_eq记录
             JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
             changeRecordEq.setChangeRecordId(String.valueOf(changeRecordId));//登记证记录主键
-            changeRecordEq.setRecDate(new Date());
             changeRecordEq.setEquId(registerInfo.getRecord());//设备主键
+            changeRecordEq.setProductCode(idxBizJgFactoryInfo.getFactoryNum());
             certificateChangeRecordEqService.save(changeRecordEq);
         }
         this.getBaseMapper().updateById(jgUseRegistration);
@@ -1169,7 +1183,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         //张三办理了【单位变更】 ，单号【DWBG202407050001】，原恒星电梯单位变更为新恒星电梯有限公司，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
         return obj.getRecUserName() + "办理了【"+BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()+"】，" +
-                "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getCreateDate());
+                "单号【" + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getRecDate());
     }
 
     /**