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/mapper/JgUseRegistrationMapper.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -69,5 +70,9 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
     List<CompanyEquipCountDto> queryForFlowingEquipList();
 
     Map<String,String> getEquTypeByUseRegSeq(@Param("sequenceNbr")String sequenceNbr);
+
     Map<String,String> getEquTypeByVehSeq(@Param("sequenceNbr")String sequenceNbr);
+
+    @Select("select name from tz_equipment_category where code=#{code}")
+    String getEquCategoryNameByCode(String code);
 }

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

@@ -2049,7 +2049,7 @@ public class CommonServiceImpl implements ICommonService {
         } catch (ParseException e) {
             log.error("日期转换失败：", e);
         }
-        String equCode = Optional.ofNullable(equType.get("equDefine")).orElse(equType.get("equCategory"));
+        String equCode = Optional.ofNullable(equType.get("equCategoryCode")).orElse(equType.get("equDefineCode"));
         String registrationCode = equCode + receiveCompanyCode + ym;
         ResponseModel<String> responseModel = tzsServiceFeignClient.deviceRegistrationCode(registrationCode);
         return responseModel.getResult();

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

@@ -7,6 +7,7 @@ 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.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.util.StringUtil;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
@@ -17,9 +18,7 @@ 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.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
@@ -76,6 +75,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -137,6 +137,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     AmosRequestContext amosRequestContext;
     @Autowired
+    private Sequence sequence;
+    @Autowired
     CodeUtil codeUtil;
     @Autowired
     CommonServiceImpl commonServiceImpl;
@@ -166,6 +168,11 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
     @Autowired
     private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
+    @Autowired
+    JgCertificateChangeRecordServiceImpl certificateChangeRecordService;
+
+    @Autowired
+    JgCertificateChangeRecordEqServiceImpl certificateChangeRecordEqService;
 
     /**
      * 根据sequenceNbr查询
@@ -1046,6 +1053,31 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     taskMap.put("model", taskMessageDto);
                     TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
 
+                    // 生成一条tzs_jg_certificate_change_record记录
+                    JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
+                    jgCertificateChangeRecord.setApplyNo(jgInstallationNotice.getApplyNo());
+                    jgCertificateChangeRecord.setReceiveOrgName(jgInstallationNotice.getReceiveOrgName());
+                    jgCertificateChangeRecord.setAuditPassDate(new Date());
+                    jgCertificateChangeRecord.setRegType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName());
+                    jgCertificateChangeRecord.setRegDate(jgInstallationNotice.getInstallStartDate());
+                    jgCertificateChangeRecord.setChangeContent(this.buildRecordContent(jgInstallationNotice));//变更内容
+                    jgCertificateChangeRecord.setUseRegistrationCode(registrationCode);//使用登记编号
+                    jgCertificateChangeRecord.setReceiveCompanyCode(jgInstallationNotice.getReceiveCompanyOrgCode());//接收机构公司代码
+                    jgCertificateChangeRecord.setCertificateNo("");//登记证书唯一码
+                    jgCertificateChangeRecord.setUseUnitCreditCode(jgInstallationNotice.getUseUnitCreditCode());//使用单位统一信用代码
+                    jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
+                    jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
+                    jgCertificateChangeRecord.setCreateDate(new Date());
+                    jgCertificateChangeRecord.setSequenceNbr(sequence.nextId());
+                    certificateChangeRecordService.save(jgCertificateChangeRecord);
+
+                    // 生成tzs_jg_certificate_change_record_eq记录
+                    JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
+                    changeRecordEq.setChangeRecordId(jgCertificateChangeRecord.getSequenceNbr().toString());//登记证记录主键
+                    changeRecordEq.setRecDate(new Date());
+                    changeRecordEq.setEquId(idxBizJgRegisterInfo.getRecord());//设备主键
+                    certificateChangeRecordEqService.save(changeRecordEq);
+
                     jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
                             .applyNo(jgInstallationNotice.getApplyNo())
                             .businessType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName())
@@ -1168,6 +1200,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
     }
 
+    private String buildRecordContent(JgInstallationNotice obj) {
+        //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
+        return obj.getCreateUserName() + "办理了【"+BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getName()+"】，单号【"
+                + obj.getApplyNo() + "】，申请日期" + simpleDateFormat.format(obj.getCreateDate());
+    }
 
     /**
      * 系统类型的code 自动生成设备代码