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

@@ -177,4 +177,22 @@ public class JgUseRegistrationManage extends BaseEntity {
     @TableField("is_scrap")
     private String isScrap;
 
+    /**
+     * 气瓶数量
+     */
+    @TableField("gas_num")
+    private Integer gasNum;
+
+    /**
+     * 容积
+     */
+    @TableField("volume")
+    private String volume;
+
+    /**
+     * 充装介质
+     */
+    @TableField("filling_medium")
+    private String fillingMedium;
+
 }

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

@@ -46,8 +46,8 @@ public class JgUseRegistrationManageController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/brushHistoryCertificate")
     @ApiOperation(httpMethod = "GET", value = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中", notes = "将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中")
-    public ResponseModel<Boolean> brushHistoryCertificate() {
-        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.brushHistoryCertificate());
+    public ResponseModel<Boolean> brushHistoryCertificate(@RequestParam(value = "type") String type) {
+        return ResponseHelper.buildResponse(jgUseRegistrationManageServiceImpl.brushHistoryCertificate(type));
     }
 
 

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

@@ -113,9 +113,10 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
      * 将已经通过使用登记审批的证信息录入到 jg-use-registration-manage 表中
      */
     @Transactional(rollbackFor = Exception.class)
-    public Boolean brushHistoryCertificate() {
-        this.baseMapper.delete(new LambdaQueryWrapper<>());
+    public Boolean brushHistoryCertificate(String type) {
 
+        if (type.equals("1")){
+            this.baseMapper.delete(new LambdaQueryWrapper<JgUseRegistrationManage>().eq(JgUseRegistrationManage::getRegType, BusinessTypeEnum.JG_USAGE_REGISTRATION.getName()));
             // 使用登记表中已经审批通过的单子
             List<JgUseRegistration> jgUseRegistrations = jgUseRegistrationMapper.selectList(new LambdaQueryWrapper<JgUseRegistration>()
                     .eq(JgUseRegistration::getStatus, "已完成")
@@ -181,8 +182,9 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, useRegistration.getAuditPassDate(), useRegistration.getReceiveCompanyCode()));
                 this.baseMapper.insert(jgUseRegistrationManage);
             }
-
-
+        }
+        if (type.equals("2")){
+            this.baseMapper.delete(new LambdaQueryWrapper<JgUseRegistrationManage>().eq(JgUseRegistrationManage::getRegType, BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName()));
             // 车用气瓶使用登记表中已经审批通过的单子
             List<JgVehicleInformation> jgVehicleInformations = jgVehicleInformationMapper.selectList(new LambdaQueryWrapper<JgVehicleInformation>()
                     .eq(JgVehicleInformation::getStatus, "已完成")
@@ -220,9 +222,14 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
                 jgUseRegistrationManage.setUseRegistrationCode(vehicleInformation.getUseRegistrationCode());
                 jgUseRegistrationManage.setUseUnitCreditCode(vehicleInformation.getUseUnitCreditCode());
                 jgUseRegistrationManage.setReceiveCompanyCode(vehicleInformation.getReceiveCompanyCode());
+                jgUseRegistrationManage.setGasNum(vehicleInformation.getGasNum());
+                jgUseRegistrationManage.setFillingMedium(vehicleInformation.getFillingMedium());
+                jgUseRegistrationManage.setVolume(vehicleInformation.getVolume());
                 jgUseRegistrationManage.setCertificateNo(commonServiceImpl.generateCertificateNo(equType, vehicleInformation.getAuditPassDate(), vehicleInformation.getReceiveCompanyCode()));
                 this.baseMapper.insert(jgUseRegistrationManage);
             }
+        }
+
         return Boolean.TRUE;
     }
 
@@ -519,7 +526,6 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         exportParamsMap.put("useInnerCode", deviceList.get(0).get("USE_INNER_CODE"));
         exportParamsMap.put("carNumber", manage.getCarNumber());
 
-
         if ("0".equals(printType)) {
             // 调用生成使用登记证
             commonService.generateCertificateReport(exportParamsMap, response);
@@ -540,12 +546,17 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         UseFlagParamDto useFlagParamDto = new UseFlagParamDto();
         useFlagParamDto.setReceiveCompanyCode(manage.getReceiveCompanyCode());
         useFlagParamDto.setEquList(exportParamsMap.get("equList").toString());
+        if (BusinessTypeEnum.JG_VEHICLE_GAS_APPLICATION.getName().equals(manage.getRegType())){
+            useFlagParamDto.setEquListCode("0000");
+            useFlagParamDto.setEquipDefine("车用气瓶");
+        }else{
             useFlagParamDto.setEquListCode(manage.getEquListCode());
-        useFlagParamDto.setEquipCode(exportParamsMap.get("equCode").toString());
-        useFlagParamDto.setEquipCategory(manage.getEquCategory());
             useFlagParamDto.setEquipDefine(Optional.ofNullable(exportParamsMap.get("equDefine"))
                     .orElse(exportParamsMap.get("equCategory").toString())
                     .toString());
+        }
+        useFlagParamDto.setEquipCode(exportParamsMap.get("equCode").toString());
+        useFlagParamDto.setEquipCategory(manage.getEquCategory());
         useFlagParamDto.setUseUnitName(exportParamsMap.get("useUnitName").toString());
         useFlagParamDto.setUseInnerCode(exportParamsMap.get("useInnerCode").toString());
         useFlagParamDto.setReceiveOrgName(manage.getReceiveOrgName());
@@ -558,8 +569,8 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         // 电梯维保信息字段设置
         setMainInfoField((String) deviceList.get(0).get("SEQUENCE_NBR"), useFlagParamDto);
         // 车用气瓶专用字段 暂无数据源 需车用气瓶功能开发完成后进行
-        useFlagParamDto.setCylinderNumOrVolume("");
-        useFlagParamDto.setFillingMedium("");
+        useFlagParamDto.setCylinderNumOrVolume(manage.getGasNum() + "/" + manage.getVolume());
+        useFlagParamDto.setFillingMedium(manage.getFillingMedium());
         return useFlagParamDto;
     }
 
@@ -583,7 +594,6 @@ public class JgUseRegistrationManageServiceImpl extends BaseService<JgUseRegistr
         return StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMasterPhone()) ? idxBizJgMaintenanceRecordInfo.getMeMasterPhone() : StringUtil.isNotEmpty(idxBizJgMaintenanceRecordInfo.getMeMaster1Phone()) ? idxBizJgMaintenanceRecordInfo.getMeMaster1Phone() : "";
     }
 
-
     /**
      * 根据sequenceNbr查询---大屏使用
      *