fix(jg):1，使用登记/安装告知/车用气瓶使用登记完成时证的变更记录表添加代办url，用来快捷跳转；2，使用登记证管理接口添加过滤条件和增加返回参数

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

@@ -19,7 +19,6 @@ public class JgUseRegistrationManageDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "使用单位名称")
     private String useUnitName;
 
@@ -92,4 +91,10 @@ public class JgUseRegistrationManageDto extends BaseDto {
     @ApiModelProperty(value = "使用单位统一信用代码-搜索使用")
     private String useUnitCreditCodeForSearch;
 
+    @ApiModelProperty(value = "是否车用气瓶--过滤数据使用")
+    private String whetherVehicleCylinder;
+
+    @ApiModelProperty(value = "是否气瓶--过滤数据使用   ---目前使用场景：注销报废业务 值为true 只过滤出气瓶的使用登记证）")
+    private boolean isCyl;
+
 }

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

@@ -56,6 +56,10 @@
             <if test="dto.certificateStatus != null and dto.certificateStatus != ''">
                 and tjurm.certificate_status = #{dto.certificateStatus}
             </if>
+            --- 注销报废业务 值为true时 过滤出气瓶（不包含车用气瓶）的使用登记证
+            <if test="dto.isCyl != null and dto.isCyl == 'true' ">
+                AND tjurm.reg_type != '车用气瓶登记'
+            </if>
             ORDER BY tjurm.rec_date DESC
         </where>
     </select>
@@ -114,6 +118,10 @@
             <if test="dto.dataType == 'supervision' ">
                 AND tjurm.receive_company_code = #{dto.receiveCompanyCode}
             </if>
+            -- 是否车用气瓶（whetherVehicleCylinder）= 1 ,过滤出车用气瓶使用登记证数据
+            <if test="dto.whetherVehicleCylinder != null and dto.whetherVehicleCylinder == '1' ">
+                AND tjurm.reg_type = '车用气瓶登记'
+            </if>
             ORDER BY
             <if test="sort != null">
                 tjurm.${sort.field} ${sort.sortType},

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

@@ -1083,6 +1083,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     jgCertificateChangeRecord.setUseUnitName(jgInstallationNotice.getUseUnitName());//使用单位名称
                     jgCertificateChangeRecord.setEquCategory(idxBizJgRegisterInfo.getEquCategory());//设备类别编码
                     jgCertificateChangeRecord.setCreateDate(new Date());
+                    jgCertificateChangeRecord.setRoutePath(taskV2Model1.getRoutePath());
                     jgCertificateChangeRecord.setCreateUserId(jgInstallationNotice.getCreateUserId());
                     jgCertificateChangeRecord.setSequenceNbr(sequence.nextId());
                     certificateChangeRecordService.save(jgCertificateChangeRecord);

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

@@ -223,12 +223,14 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         JgUseRegistrationManage jgUseRegistrationManage = this.baseMapper.selectById(sequenceNbr);
         List<JgCertificateChangeRecord> changeRecordList = jgCertificateChangeRecordService.list(new LambdaQueryWrapper<JgCertificateChangeRecord>()
-                .eq(JgCertificateChangeRecord::getUseRegistrationCode, jgUseRegistrationManage.getUseRegistrationCode()));
+                .eq(JgCertificateChangeRecord::getUseRegistrationCode, jgUseRegistrationManage.getUseRegistrationCode())
+                .orderByDesc(JgCertificateChangeRecord::getCreateDate));
         return changeRecordList.stream()
                 .map(x -> {
                     Map<String, String> map = new HashMap<>();
                     map.put("operatingTime", simpleDateFormat.format(x.getRecDate()));
                     map.put("content", x.getChangeContent());
+                    map.put("routePath", x.getRoutePath());
                     return map;
                 }).collect(Collectors.toList());
     }

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

@@ -859,6 +859,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgUseRegistration.setStatus(taskCode);
             jgUseRegistration.setNextExecuteUserIds("");
 
+            // 更新代办
+            TaskV2Model taskV2Model = updateAgency(jgUseRegistration);
+
             // 查询历史暂存表
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getOne(Wrappers.<JgRegistrationHistory>lambdaQuery()
                     .eq(JgRegistrationHistory::getCurrentDocumentId, String.valueOf(sequenceNbr)));
@@ -880,7 +883,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, equId);
                     IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
 
-                    processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo);
+                    // 更新设备信息 && 生成使用登记证编号 && 同步es
+                    processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo,taskV2Model);
 
                     // 查询设备制造信息
                     LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
@@ -905,13 +909,20 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             generateRegistrationManage(jgUseRegistration,registerInfo);
 
             // 生成一条tzs_jg_certificate_change_record记录
-            generateCertificateChangeRecord(jgUseRegistration,registerInfo,changeRecordId);
+            generateCertificateChangeRecord(jgUseRegistration,registerInfo,changeRecordId,taskV2Model);
         }
         this.getBaseMapper().updateById(jgUseRegistration);
         commonServiceImpl.saveExecuteFlowData2Redis(jgUseRegistration.getInstanceId(), this.buildInstanceRuntimeData(jgUseRegistration));
     }
 
-    private void generateCertificateChangeRecord(JgUseRegistration jgUseRegistration,IdxBizJgRegisterInfo registerInfo,Long changeRecordId) {
+    /**
+     * 生成使用登记证变更记录
+     * @param jgUseRegistration
+     * @param registerInfo
+     * @param changeRecordId
+     * @param taskV2Model
+     */
+    private void generateCertificateChangeRecord(JgUseRegistration jgUseRegistration,IdxBizJgRegisterInfo registerInfo,Long changeRecordId,TaskV2Model taskV2Model) {
         Map<String, String> equType = new HashMap<>();
         equType.put("equList",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
         equType.put("equListCode",registerInfo.getEquList());
@@ -933,10 +944,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         changeRecord.setUseUnitName(jgUseRegistration.getUseUnitName());//使用单位名称
         changeRecord.setEquCategory(registerInfo.getEquCategory());//设备类别编码
         changeRecord.setCreateDate(new Date());
+        changeRecord.setRoutePath(taskV2Model.getRoutePath());
         changeRecord.setSequenceNbr(changeRecordId);
         certificateChangeRecordService.save(changeRecord);
     }
 
+    /**
+     * 生成登记证数据
+     * @param jgUseRegistration 使用登记单
+     * @param registerInfo 一码通设备注册信息表
+     */
     private void generateRegistrationManage(JgUseRegistration jgUseRegistration,IdxBizJgRegisterInfo registerInfo) {
         // 使用单位信息
         Map<String, Object> enterpriseInfo = commonServiceImpl.getEnterpriseInfo(jgUseRegistration.getUseUnitCreditCode());
@@ -1073,13 +1090,16 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, equId);
             IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
 
-            processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo);
+            // 更新代办
+            TaskV2Model taskV2Model = updateAgency(jgUseRegistration);
+
+            processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory,registerInfo,taskV2Model);
 
             // 生成证书管理表记录
             generateRegistrationManage(jgUseRegistration,registerInfo);
 
-            // 生成一条tzs_jg_certificate_change_record记录
-            generateCertificateChangeRecord(jgUseRegistration,registerInfo,changeRecordId);
+            // 生成一条使用登记证变更记录
+            generateCertificateChangeRecord(jgUseRegistration,registerInfo,changeRecordId,taskV2Model);
 
             // 查询设备制造信息
             LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
@@ -1099,7 +1119,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     }
 
     private void processMapData(Long sequenceNbr, JSONObject mapData, JgUseRegistration jgUseRegistration,
-                                JgRegistrationHistory jgRegistrationHistory,IdxBizJgRegisterInfo registerInfo) {
+                                JgRegistrationHistory jgRegistrationHistory,IdxBizJgRegisterInfo registerInfo,TaskV2Model taskV2Model) {
         // 其他信息
         LambdaQueryWrapper<IdxBizJgOtherInfo> lambdaOth = new QueryWrapper<IdxBizJgOtherInfo>().lambda();
         lambdaOth.eq(IdxBizJgOtherInfo::getRecord, String.valueOf(mapData.get("equipId")));
@@ -1151,18 +1171,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName() + useInfo.getStreetName();
         // 更新es
         updateEsData(usePlace, mapData, otherInfo, jgUseRegistration);
-        // 更新代办状态
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("relationId", jgUseRegistration.getInstanceId());
-        params.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
-        params.put("flowStatusLabel", jgUseRegistration.getStatus());
-        params.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
-        params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
-        TaskMessageDto taskMessageDto = new TaskMessageDto();
-        BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
-        taskMessageDto.setEquipId(String.valueOf(mapData.get("equipId")));
-        params.put("model", taskMessageDto);
-        TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
         jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
                 .applyNo(jgUseRegistration.getApplyNo())
                 .businessType(BusinessTypeEnum.JG_USAGE_REGISTRATION.getName())
@@ -1175,6 +1183,24 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 .build());
     }
 
+    /**
+     * 流程结束更新代办
+     * @param jgUseRegistration 登记单信息
+     */
+    private TaskV2Model updateAgency(JgUseRegistration jgUseRegistration) {
+        // 更新代办状态
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("relationId", jgUseRegistration.getInstanceId());
+        params.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
+        params.put("flowStatusLabel", jgUseRegistration.getStatus());
+        params.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
+        params.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
+        params.put("model", taskMessageDto);
+        return commonServiceImpl.updateTaskModel(params);
+    }
+
     private String buildRecordContent(JgUseRegistration obj) {
         //张三办理了【单位变更】 ，单号【DWBG202407050001】，办理日期2024-07-05
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");

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

@@ -808,7 +808,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             TaskMessageDto taskMessageDto = new TaskMessageDto();
             BeanUtil.copyProperties(jgVehicleInformation, taskMessageDto);
             params.put("model", taskMessageDto);
-            commonService.updateTaskModel(params);
+            TaskV2Model taskV2Model = commonService.updateTaskModel(params);
 
             // 取第一条设备的注册消息--用来获取这一批设备的设备种类/类别/品种
             LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
@@ -819,7 +819,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
             generateRegistrationManage(jgVehicleInformation,registerInfo);
 
             // 生成一条tzs_jg_certificate_change_record记录
-            generateCertificateChangeRecord(jgVehicleInformation,registerInfo,changeRecordId);
+            generateCertificateChangeRecord(jgVehicleInformation,registerInfo,changeRecordId,taskV2Model);
         }
         this.getBaseMapper().updateById(jgVehicleInformation);
         commonService.saveExecuteFlowData2Redis(jgVehicleInformation.getInstanceId(), this.buildInstanceRuntimeData(jgVehicleInformation));
@@ -1400,7 +1400,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
 
     }
 
-    private void generateCertificateChangeRecord(JgVehicleInformation jgVehicleInformation, IdxBizJgRegisterInfo registerInfo, Long changeRecordId) {
+    private void generateCertificateChangeRecord(JgVehicleInformation jgVehicleInformation, IdxBizJgRegisterInfo registerInfo, Long changeRecordId,TaskV2Model taskV2Model) {
         Map<String, String> equType = new HashMap<>();
         equType.put("equList",this.baseMapper.getEquCategoryNameByCode(registerInfo.getEquList()));
         equType.put("equListCode",registerInfo.getEquList());
@@ -1421,6 +1421,7 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
         changeRecord.setUseUnitCreditCode(jgVehicleInformation.getUseUnitCreditCode());//使用单位统一信用代码
         changeRecord.setUseUnitName(jgVehicleInformation.getUseUnitName());//使用单位名称
         changeRecord.setEquCategory(registerInfo.getEquCategory());//设备类别编码
+        changeRecord.setRoutePath(taskV2Model.getRoutePath());
         changeRecord.setCreateDate(new Date());
         changeRecord.setSequenceNbr(changeRecordId);
         certificateChangeRecordService.save(changeRecord);