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

@@ -10,7 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -143,8 +142,9 @@ public class JgScrapCancelDto extends BaseDto {
     @ApiModelProperty(value = "申请日期，接收查询参数")
     private String applicationDate;
 
-
     @ApiModelProperty(value = "使用登记证id，多个逗号分割")
     private String registrationManageId;
 
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
 }

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

@@ -184,4 +184,10 @@ public class JgScrapCancel extends BaseEntity {
     @TableField(value = "other_accessories")
     private String otherAccessories;
 
+    /**
+     * 创建人
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
 }

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

@@ -168,7 +168,5 @@ public class JgInstallationNoticeController extends BaseController {
     @GetMapping(value = "/historyDataRepair")
     public ResponseModel<Boolean> historyDataRepair() {
         return ResponseHelper.buildResponse(iJgInstallationNoticeService.historyDataRepair());
-
     }
-
 }

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

@@ -2712,6 +2712,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             if ("his".equals(equipInfoDto.getDataSource()) && "1".equals(data.getWhetherVehicleCylinder())) {
                 throw new BadRequest("车用气瓶历史设备不能批量导入!");
             }
+            if ("1".equals(data.getWhetherVehicleCylinder()) && !SPECIAL_CYLINDER.getCode().equals(equipInfoDto.getEquDefineCode())){
+                throw new BadRequest("车用气瓶只能选择特种气瓶进行导入!");
+            }
             String record = UUID.randomUUID().toString();
             List<Map<String, Object>> fileDataList = (List<Map<String, Object>>) (data.getFileData());
             String productPhoto = getUrlByKey(fileDataList, "PRODUCT_PHOTO");

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

@@ -270,6 +270,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                     reginParams.getCompany().getCompanyCode());
             jgScrapCancel.setUseUnitName(reginParams.getCompany().getCompanyName());
             jgScrapCancel.setCreateUserId(RequestContext.getExeUserId());
+            jgScrapCancel.setCreateUserName(reginParams.getUserModel().getRealName());
             this.setUseRegisterInfo(jgScrapCancel, noticeParams);
             this.save(jgScrapCancel);
             // 新增代办
@@ -1021,7 +1022,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         List<String> useRegistrationCodes = jgScrapCancelEqList.stream().map(JgScrapCancelEq::getUseRegistrationCode).collect(Collectors.toList());
         LambdaQueryWrapper<JgUseRegistrationManage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.in(JgUseRegistrationManage::getUseRegistrationCode, useRegistrationCodes);
-        lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquCategoryCode, JgUseRegistrationManage::getRegType, BaseEntity::getSequenceNbr);
+        lambdaQueryWrapper.select(JgUseRegistrationManage::getUseRegistrationCode, JgUseRegistrationManage::getEquCategoryCode,
+                JgUseRegistrationManage::getRegType, BaseEntity::getSequenceNbr, JgUseRegistrationManage::getCertificateNo);
         return jgUseRegistrationManageMapper.selectList(lambdaQueryWrapper);
     }
 
@@ -1042,8 +1044,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
 
 
     private void saveRecord(JgScrapCancel jgScrapCancel, List<JgScrapCancelEq> jgScrapCancelEqList, String routePath, List<JgUseRegistrationManage> jgUseRegistrationManageList) {
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        String userName = reginParams.getUserModel().getRealName();
+        String userName = jgScrapCancel.getCreateUserName();
         String content = userName + "办理了【" + CancelTypeEnum.getNameByType(jgScrapCancel.getCancelType()) + "】" +
                 "单号【" + jgScrapCancel.getApplyNo() + "】，办理日期" + DateUtils.getDateNowShortStr();
         List<JgCertificateChangeRecord> certificateChangeRecords = new ArrayList<>();
@@ -1062,10 +1063,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             changeRecord.setReceiveCompanyCode(jgScrapCancel.getReceiveOrgCode());
             changeRecord.setUseUnitCreditCode(jgScrapCancel.getUseUnitCode());
             changeRecord.setUseUnitName(jgScrapCancel.getUseUnitName());
-            changeRecord.setEquCategory(jgUseRegistrationManage.getEquCategory());
+            changeRecord.setEquCategory(jgUseRegistrationManage.getEquCategoryCode());
             changeRecord.setCreateDate(new Date());
-            changeRecord.setCreateUserId(reginParams.getUserModel().getUserId());
             changeRecord.setRoutePath(routePath);
+            changeRecord.setCreateUserId(jgScrapCancel.getCreateUserId());
+            changeRecord.setCertificateNo(jgUseRegistrationManage.getCertificateNo());
             certificateChangeRecords.add(changeRecord);
             jgScrapCancelEqList.stream().filter(eq -> eq.getUseRegistrationCode().equals(jgUseRegistrationManage.getUseRegistrationCode())).forEach(e -> {
                 JgCertificateChangeRecordEq changeRecordEq = new JgCertificateChangeRecordEq();
@@ -1075,12 +1077,11 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
                 changeRecordEqList.add(changeRecordEq);
             });
         }
-        if (certificateChangeRecords.size() > 0) {
+        if (!certificateChangeRecords.isEmpty()) {
             certificateChangeRecordService.saveBatch(certificateChangeRecords);
         }
-        if (changeRecordEqList.size() > 0) {
+        if (!changeRecordEqList.isEmpty()) {
             jgCertificateChangeRecordEqServiceImpl.saveBatch(changeRecordEqList);
         }
     }
-
 }
\ 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/JgUseRegistrationServiceImpl.java

@@ -1024,7 +1024,11 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         changeRecord.setChangeContent(this.buildRecordContent(jgUseRegistration, BusinessTypeEnum.JG_USAGE_REGISTRATION.getName(), flag));//变更内容
         changeRecord.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());//使用登记编号
         changeRecord.setReceiveCompanyCode(jgUseRegistration.getReceiveCompanyOrgCode());//接收机构公司代码
-        changeRecord.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, new Date(), jgUseRegistration.getReceiveCompanyCode()));//登记证书唯一码
+        // 流水表不需要再次生成唯一编号，使用证管理表对应值
+        if (!ObjectUtils.isEmpty(jgUseRegistration.getUseRegistrationCode())){
+            JgUseRegistrationManage manage = jgUseRegistrationManageService.lambdaQuery().eq(JgUseRegistrationManage::getUseRegistrationCode, jgUseRegistration.getUseRegistrationCode()).one();
+            changeRecord.setCertificateNo(manage.getCertificateNo());//登记证书唯一码
+        }
         changeRecord.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());//使用单位统一信用代码
         changeRecord.setUseUnitName(jgUseRegistration.getUseUnitName());//使用单位名称
         changeRecord.setEquCategory(registerInfo.getEquCategory());//设备类别编码