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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgVehicleInformationDto", description="")
+public class JgVehicleInformationDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备监管码")
+    private String supervisoryCode;
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "办理状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "接收机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "检验单位")
+    private String inspectUnitName;
+
+    @ApiModelProperty(value = "检验结果照片")
+    private String inspectResultPhoto;
+
+    @ApiModelProperty(value = "检验结果")
+    private String inspectResult;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "登记类别")
+    private String regType;
+
+    @ApiModelProperty(value = "注册登记日期")
+    private Date regDate;
+
+    @ApiModelProperty(value = "注册登记人员ID")
+    private String regPersonId;
+
+    @ApiModelProperty(value = "注册登记人员")
+    private String regPersonName;
+
+    @ApiModelProperty(value = "安装单位名称")
+    private String installUnitName;
+
+    @ApiModelProperty(value = "安装单位代码")
+    private String installUnitCode;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建人名称")
+    private String createUserName;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "录入单位ID")
+    private String inputUnitNo;
+
+    @ApiModelProperty(value = "使用登记编号")
+    private String useRegistrationCode;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "检验机构代码")
+    private String inspectUnitCreditCode;
+
+    @ApiModelProperty(value = "流程状态")
+    private String instanceStatus;
+
+    @ApiModelProperty(value = "接收机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "接收机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecuteIds;
+
+    @ApiModelProperty(value = "发起人id用于撤回操作")
+    private String promoter;
+
+    @ApiModelProperty(value = "使用登记证书附件")
+    private String useRegistrationCertificate;
+
+    @ApiModelProperty(value = "工作流下一节点任务id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "是否西咸，1是 0否")
+    private String isXixian;
+
+    @ApiModelProperty(value = "使用单位地点")
+    private String useUnitAddress;
+
+    @ApiModelProperty(value = "转办后执行人的Id逗号分割")
+    private String transferToUserIds;
+
+    @ApiModelProperty(value = "其他附件")
+    private String otherAccessories;
+
+    @ApiModelProperty(value = "安装日期")
+    private Date installationData;
+
+    @ApiModelProperty(value = "车辆属性")
+    private String vehicleAttribute;
+
+    @ApiModelProperty(value = "车辆属地")
+    private String vehicleApanage;
+
+    @ApiModelProperty(value = "气瓶数量")
+    private Integer gasNum;
+
+    @ApiModelProperty(value = "号牌号码")
+    private String carNumber;
+
+    @ApiModelProperty(value = "识别代码")
+    private String identificationCode;
+
+    @ApiModelProperty(value = "发动机号")
+    private String engineNumber;
+
+    @ApiModelProperty(value = "车辆品牌型号")
+    private String carBrandModel;
+
+    @ApiModelProperty(value = "车主姓名")
+    private String ownerName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String contactNumber;
+
+    @ApiModelProperty(value = "充装介质")
+    private String fillingMedium;
+
+    @ApiModelProperty(value = "设备品种(特种气瓶)")
+    private String equipmentVariety;
+
+    @ApiModelProperty(value = "容积")
+    private String volume;
+
+    @ApiModelProperty(value = "加装方式")
+    private String installationMode;
+
+    @ApiModelProperty(value = "车辆年审日期")
+    private Date vehicleReviewDate;
+
+    @ApiModelProperty(value = "身份证正面附件")
+    private String idCardFront;
+
+    @ApiModelProperty(value = "身份证背面附件")
+    private String idCardBack;
+
+    @ApiModelProperty(value = "行驶证正面附件")
+    private String driveLicenseFront;
+
+    @ApiModelProperty(value = "行驶证背面附件")
+    private String driveLicenseBack;
+
+    @ApiModelProperty(value = "机动车登记证书附件")
+    private String vehicleRegistrationCertificate;
+
+    @ApiModelProperty(value = "监督检验证书附件")
+    private String inspectionCertificate;
+
+    @ApiModelProperty(value = "备案通知单附件")
+    private String filingNotice;
+
+    private List<String> roleIds;
+
+    private String dataType;
+
+    private String currentUserId;
+
+    @ApiModelProperty(value = "属地监管部门code")
+    private String orgBranchCode;
+
+    @ApiModelProperty(value = "属地监管部门name")
+    private String orgBranchName;
+
+    @ApiModelProperty(value = "下次检验日期")
+    private Date nextInspectionDate;
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgVehicleInformationEqDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgVehicleInformationEqDto", description="")
+public class JgVehicleInformationEqDto extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "车辆信息申请id")
+    private String vehicleId;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人id")
+    private String createUserId;
+
+    @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/JgVehicleInformation.java

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 车用气瓶业务
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_vehicle_information")
+public class JgVehicleInformation extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备监管码
+     */
+	@TableField("supervisory_code")
+    private String supervisoryCode;
+
+    /**
+     * 使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 办理状态
+     */
+	@TableField("audit_status")
+    private String auditStatus;
+
+    /**
+     * 接收机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 检验单位
+     */
+	@TableField("inspect_unit_name")
+    private String inspectUnitName;
+
+    /**
+     * 检验结果照片
+     */
+	@TableField("inspect_result_photo")
+    private String inspectResultPhoto;
+
+    /**
+     * 检验结果
+     */
+	@TableField("inspect_result")
+    private String inspectResult;
+
+    /**
+     * 终审通过时间
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+    /**
+     * 登记类别
+     */
+	@TableField("reg_type")
+    private String regType;
+
+    /**
+     * 注册登记日期
+     */
+	@TableField("reg_date")
+    private Date regDate;
+
+    /**
+     * 注册登记人员ID
+     */
+	@TableField("reg_person_id")
+    private String regPersonId;
+
+    /**
+     * 注册登记人员
+     */
+	@TableField("reg_person_name")
+    private String regPersonName;
+
+    /**
+     * 安装单位名称
+     */
+	@TableField("install_unit_name")
+    private String installUnitName;
+
+    /**
+     * 安装单位代码
+     */
+    @TableField("install_unit_code")
+    private String installUnitCode;
+
+    /**
+     * 状态
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建人名称
+     */
+    @TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 录入单位ID
+     */
+	@TableField("input_unit_no")
+    private String inputUnitNo;
+
+    /**
+     * 使用登记编号
+     */
+	@TableField("use_registration_code")
+    private String useRegistrationCode;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 检验机构代码
+     */
+	@TableField("inspect_unit_credit_code")
+    private String inspectUnitCreditCode;
+
+    /**
+     * 流程状态
+     */
+	@TableField("instance_status")
+    private String instanceStatus;
+
+    /**
+     * 接收机构代码
+     */
+	@TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    /**
+     * 接收机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    /**
+     * 下一执行节点ids
+     */
+	@TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+    /**
+     * 发起人id用于撤回操作
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 使用登记证书附件
+     */
+	@TableField("use_registration_certificate")
+    private String useRegistrationCertificate;
+
+    /**
+     * 工作流下一节点任务id
+     */
+	@TableField("next_task_id")
+    private String nextTaskId;
+
+    /**
+     * 下一节点可执行人逗号分割
+     */
+	@TableField("next_execute_user_ids")
+    private String nextExecuteUserIds;
+
+    /**
+     * 是否西咸，1是 0否
+     */
+	@TableField("is_xixian")
+    private String isXixian;
+
+    /**
+     * 使用单位地点
+     */
+	@TableField("use_unit_address")
+    private String useUnitAddress;
+
+    /**
+     * 转办后执行人的Id逗号分割
+     */
+	@TableField("transfer_to_user_ids")
+    private String transferToUserIds;
+
+    /**
+     * 其他附件
+     */
+	@TableField("other_accessories")
+    private String otherAccessories;
+
+    /**
+     * 安装日期
+     */
+	@TableField("installation_data")
+    private Date installationData;
+
+    /**
+     * 车辆属性
+     */
+	@TableField("vehicle_attribute")
+    private String vehicleAttribute;
+
+    /**
+     * 车辆属地
+     */
+	@TableField("vehicle_apanage")
+    private String vehicleApanage;
+
+    /**
+     * 气瓶数量
+     */
+	@TableField("gas_num")
+    private Integer gasNum;
+
+    /**
+     * 号牌号码
+     */
+	@TableField("car_number")
+    private String carNumber;
+
+    /**
+     * 识别代码
+     */
+	@TableField("identification_code")
+    private String identificationCode;
+
+    /**
+     * 发动机号
+     */
+	@TableField("engine_number")
+    private String engineNumber;
+
+    /**
+     * 车辆品牌型号
+     */
+	@TableField("car_brand_model")
+    private String carBrandModel;
+
+    /**
+     * 车主姓名
+     */
+	@TableField("owner_name")
+    private String ownerName;
+
+    /**
+     * 联系电话
+     */
+	@TableField("contact_number")
+    private String contactNumber;
+
+    /**
+     * 充装介质
+     */
+	@TableField("filling_medium")
+    private String fillingMedium;
+
+    /**
+     * 设备品种(特种气瓶)
+     */
+	@TableField("equipment_variety")
+    private String equipmentVariety;
+
+    /**
+     * 容积
+     */
+	@TableField("volume")
+    private String volume;
+
+    /**
+     * 加装方式
+     */
+	@TableField("installation_mode")
+    private String installationMode;
+
+    /**
+     * 车辆年审日期
+     */
+	@TableField("vehicle_review_date")
+    private Date vehicleReviewDate;
+
+    /**
+     * 身份证正面附件
+     */
+	@TableField("id_card_front")
+    private String idCardFront;
+
+    /**
+     * 身份证背面附件
+     */
+	@TableField("id_card_back")
+    private String idCardBack;
+
+    /**
+     * 行驶证正面附件
+     */
+	@TableField("drive_license_front")
+    private String driveLicenseFront;
+
+    /**
+     * 行驶证背面附件
+     */
+	@TableField("drive_license_back")
+    private String driveLicenseBack;
+
+    /**
+     * 机动车登记证书附件
+     */
+	@TableField("vehicle_registration_certificate")
+    private String vehicleRegistrationCertificate;
+
+    /**
+     * 监督检验证书附件
+     */
+	@TableField("inspection_certificate")
+    private String inspectionCertificate;
+
+    /**
+     * 备案通知单附件
+     */
+	@TableField("filing_notice")
+    private String filingNotice;
+
+    /**
+     * 属地监管部门code
+     */
+    @TableField(value = "org_branch_code")
+    private String orgBranchCode;
+
+    /**
+     * 属地监管部门name
+     */
+    @TableField(value = "org_branch_name")
+    private String orgBranchName;
+
+    /**
+     * 下次检验日期
+     */
+    @TableField("next_inspection_date")
+    private Date nextInspectionDate;
+}

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

+package com.yeejoin.amos.boot.module.jg.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_vehicle_information_eq")
+public class JgVehicleInformationEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 车辆信息申请id
+     */
+	@TableField("vehicle_id")
+    private String vehicleId;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人id
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    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/enums/BusinessTypeEnum.java

@@ -20,7 +20,7 @@ public enum BusinessTypeEnum {
 
     JG_ADVICE_REMOVAL("105", "移装告知"),
 
-                  JG_MAINTENANCE_RECORD("106", "维保备案"),
+    JG_MAINTENANCE_RECORD("106", "维保备案"),
 
     JG_USAGE_REGISTRATION("107", "使用登记"),
 
@@ -44,7 +44,9 @@ public enum BusinessTypeEnum {
 
     JY_INSPECTION_APPLICATION_DS("116", "定（首）检验"),
 
-    JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）");
+    JY_INSPECTION_APPLICATION_CHECK("117", "检验（含安全阀效验）"),
+
+    JG_VEHICLE_GAS_APPLICATION("118", "车用气瓶登记");
     private final String code;
 
     private final String name;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/VehicleApanageEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author LiuLin
+ *
+ */
+@Getter
+@AllArgsConstructor
+public enum VehicleApanageEnum {
+
+    /**
+     * 属性机构枚举
+     */
+    XIAN("陕A","XIAN"),
+    TONG_CHUAN("陕B","TONG_CHUAN"),
+    BAO_JI("陕C","BAO_JI"),
+    XIAN_YANG("陕D","XIAN_YANG"),
+    WEI_NAN("陕E","WEI_NAN"),
+    YAN_AN("陕J","YAN_AN"),
+    HAN_ZHONG("陕F","HAN_ZHONG"),
+    YU_LIN("陕K","YU_LIN"),
+    AN_KANG("陕G","AN_KANG"),
+    SHANG_LUO("陕H","SHANG_LUO"),
+    XI_XIAN("陕U","XI_XIAN"),
+    YANG_LING("陕V","YANG_LING"),
+    HAN_CHENG("陕Y","HAN_CHENG");
+
+    private final String code;
+
+    private final String city;
+
+    public static String of(String city){
+        for(VehicleApanageEnum e : VehicleApanageEnum.values()){
+            if(e.getCity().equals(city)){
+                return e.getCode();
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgVehicleInformationEqMapper.java

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformationEq;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+public interface JgVehicleInformationEqMapper extends BaseMapper<JgVehicleInformationEq> {
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgVehicleInformationMapper.java

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformation;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+public interface JgVehicleInformationMapper extends BaseMapper<JgVehicleInformation> {
+
+    @MapKey("roleIds")
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgVehicleInformationDto dto , @Param("roleIds") List<String> roleIds);
+
+    @MapKey("sequenceNbr")
+    JgVehicleInformationDto queryBySequenceNbr(@Param("sequenceNbr") Long sequenceNbr);
+
+    @MapKey("id")
+    List<Map<String, Object>> selectEquipList(@Param("id")Long id);
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgVehicleInformationEqService.java

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+public interface IJgVehicleInformationEqService {}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgVehicleInformationService.java

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+public interface IJgVehicleInformationService {}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/vo/JgVehicleInformationVo.java

+package com.yeejoin.amos.boot.module.jg.api.vo;
+
+import com.alibaba.fastjson.JSONArray;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+@Data
+@ApiModel(value="JgVehicleInformationVo", description="")
+public class JgVehicleInformationVo implements Serializable {
+
+   private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设备监管码")
+    private String supervisoryCode;
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "办理状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "接收机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "检验单位")
+    private String inspectUnitName;
+
+    @ApiModelProperty(value = "检验结果照片")
+    private String inspectResultPhoto;
+
+    @ApiModelProperty(value = "检验结果")
+    private String inspectResult;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "登记类别")
+    private String regType;
+
+    @ApiModelProperty(value = "注册登记日期")
+    private Date regDate;
+
+    @ApiModelProperty(value = "注册登记人员ID")
+    private String regPersonId;
+
+    @ApiModelProperty(value = "注册登记人员")
+    private String regPersonName;
+
+    @ApiModelProperty(value = "安装单位名称")
+    private String installUnitName;
+
+    @ApiModelProperty(value = "安装单位代码")
+    private String installUnitCode;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "录入单位ID")
+    private String inputUnitNo;
+
+    @ApiModelProperty(value = "使用登记编号")
+    private String useRegistrationCode;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "检验机构代码")
+    private String inspectUnitCreditCode;
+
+    @ApiModelProperty(value = "流程状态")
+    private String instanceStatus;
+
+    @ApiModelProperty(value = "接收机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "接收机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecuteIds;
+
+    @ApiModelProperty(value = "发起人id用于撤回操作")
+    private String promoter;
+
+    @ApiModelProperty(value = "使用登记证书附件")
+    private String useRegistrationCertificate;
+
+    @ApiModelProperty(value = "下一节点可执行人逗号分割")
+    private String nextExecuteUserIds;
+
+    @ApiModelProperty(value = "是否西咸，1是 0否")
+    private String isXixian;
+
+    @ApiModelProperty(value = "使用单位地点")
+    private String useUnitAddress;
+
+    @ApiModelProperty(value = "转办后执行人的Id逗号分割")
+    private String transferToUserIds;
+
+    @ApiModelProperty(value = "安装日期")
+    private Date installationData;
+
+    @ApiModelProperty(value = "车辆属性")
+    private String vehicleAttribute;
+
+    @ApiModelProperty(value = "车辆属地")
+    private String vehicleApanage;
+
+    @ApiModelProperty(value = "气瓶数量")
+    private Integer gasNum;
+
+    @ApiModelProperty(value = "号牌号码")
+    private String carNumber;
+
+    @ApiModelProperty(value = "识别代码")
+    private String identificationCode;
+
+    @ApiModelProperty(value = "发动机号")
+    private String engineNumber;
+
+    @ApiModelProperty(value = "车辆品牌型号")
+    private String carBrandModel;
+
+    @ApiModelProperty(value = "车主姓名")
+    private String ownerName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String contactNumber;
+
+    @ApiModelProperty(value = "充装介质")
+    private String fillingMedium;
+
+    @ApiModelProperty(value = "设备品种(特种气瓶)")
+    private String equipmentVariety;
+
+    @ApiModelProperty(value = "容积")
+    private String volume;
+
+    @ApiModelProperty(value = "加装方式")
+    private String installationMode;
+
+    @ApiModelProperty(value = "车辆年审日期")
+    private Date vehicleReviewDate;
+
+    @ApiModelProperty(value = "身份证正面附件")
+    private JSONArray idCardFront;
+
+    @ApiModelProperty(value = "身份证背面附件")
+    private JSONArray idCardBack;
+
+    @ApiModelProperty(value = "行驶证正面附件")
+    private JSONArray driveLicenseFront;
+
+    @ApiModelProperty(value = "行驶证背面附件")
+    private JSONArray driveLicenseBack;
+
+    @ApiModelProperty(value = "机动车登记证书附件")
+    private JSONArray vehicleRegistrationCertificate;
+
+    @ApiModelProperty(value = "监督检验证书附件")
+    private JSONArray inspectionCertificate;
+
+    @ApiModelProperty(value = "备案通知单附件")
+
+    private JSONArray filingNotice;
+
+    private List<String> roleIds;
+
+    private String dataType;
+
+    private String unitCode;
+
+    private String currentUserId;
+
+    private List<Map<String, Object>> equipmentLists;
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "更新时间")
+    protected Date recDate;
+
+    @ApiModelProperty(value = "更新人id")
+    protected String recUserId;
+
+    @ApiModelProperty(value = "更新人")
+    protected String recUserName;
+
+    @ApiModelProperty(value = "是否删除")
+    private Boolean isDelete = false;
+
+    @ApiModelProperty("工作流下一节点任务id")
+    private String nextTaskId;
+
+    @ApiModelProperty(value = "属地监管部门code")
+    private String orgBranchCode;
+
+    @ApiModelProperty(value = "下次检验日期")
+    private Date nextInspectionDate;
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationEqMapper">
+
+</mapper>

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.vo.JgVehicleInformationVo;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgVehicleInformationServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 车用气瓶控制类
+ *
+ * @author LiuLin
+ * @date 2024-03-18
+ */
+@RestController
+@Api(tags = "车用气瓶控制类Api")
+@RequestMapping(value = "/jg-vehicle-information")
+public class JgVehicleInformationController extends BaseController {
+
+    @Autowired
+    JgVehicleInformationServiceImpl jgVehicleInformationServiceImpl;
+
+    /**
+     * 新增(提交)车用气瓶控制类
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增车用气瓶控制类", notes = "新增车用气瓶控制类")
+    public ResponseModel<Object> saveOrSubmit(@RequestBody JSONObject map, @RequestParam(value = "submit") String submit) {
+        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.save(submit, map));
+    }
+
+    /**
+     * 执行流程
+     *
+     * @param map map
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/flowExecute")
+    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+        jgVehicleInformationServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),
+                String.valueOf(map.get("instanceId")),
+                String.valueOf(map.get("operate")),
+                String.valueOf(map.get("comment")),
+                String.valueOf(map.get("nextTaskId")));
+        return ResponseHelper.buildResponse("ok");
+    }
+
+    /**
+     * 车用气瓶撤回
+     *
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/cancel")
+    @ApiOperation(httpMethod = "POST", value = "车用气瓶撤回", notes = "车用气瓶撤回")
+    public ResponseModel<Object> cancel(@RequestBody JSONObject map) {
+        jgVehicleInformationServiceImpl.cancel(String.valueOf(map.get("instanceId")), String.valueOf(map.get("nextTaskId")));
+        return ResponseHelper.buildResponse("ok");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param map map
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/deleteBatch")
+    @ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+    public ResponseModel<Object> deleteBatch(@RequestBody JSONObject map) {
+        List<Long> ids = (List<Long>) map.get("ids");
+        jgVehicleInformationServiceImpl.deleteBatch(ids);
+        return ResponseHelper.buildResponse("ok");
+    }
+
+    /**
+     * 根据id进行删除
+     *
+     * @param id id
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/deleteMessage")
+    @ApiOperation(httpMethod = "POST", value = "删除", notes = "删除")
+    public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
+        Long[] ids = {id};
+        jgVehicleInformationServiceImpl.deleteBatch(Arrays.asList(ids));
+        return ResponseHelper.buildResponse("ok");
+    }
+
+    /**
+     * 车用气瓶查询列表接口
+     *
+     * @param dto     dto
+     * @param current current
+     * @param size    size
+     * @return Page
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "车用气瓶列表全部数据查询", notes = "车用气瓶列表全部数据查询")
+    @GetMapping(value = "/getPageList")
+    public ResponseModel<Page<Map<String, Object>>> getPageList(JgVehicleInformationDto dto,
+                                                                @RequestParam(value = "current") int current,
+                                                                @RequestParam(value = "size") int size) {
+        Page<Map<String, Object>> page = new Page<>(current, size);
+        ReginParams info = getSelectedOrgInfo();
+        dto.setCurrentUserId(info.getUserModel().getUserId());
+        dto.setUseUnitCreditCode(info.getCompany().getCompanyCode());
+        if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
+            dto.setDataType(BaseController.COMPANY_TYPE_COMPANY);
+        } else {
+            dto.setDataType(BaseController.COMPANY_TYPE_SUPERVISION);
+        }
+        Page<Map<String, Object>> list = jgVehicleInformationServiceImpl.getPageList(dto, page, dto.getRoleIds());
+        list.getRecords().forEach(x -> x.put("companyType", info.getCompany().getCompanyType()));
+        return ResponseHelper.buildResponse(list);
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除车用气瓶控制类", notes = "根据sequenceNbr删除车用气瓶控制类")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询详情
+     *
+     * @param sequenceNbr 主键
+     * @return ResponseModel
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/details")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个车用气瓶控制类", notes = "根据sequenceNbr查询单个车用气瓶控制类")
+    public ResponseModel<JgVehicleInformationVo> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgVehicleInformationServiceImpl.queryBySequenceNbr(sequenceNbr));
+    }
+
+	/**
+	 *
+	 * @param response response
+	 * @param sequenceNbr 主键
+	 * @param printType 打印类型
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/export")
+	@ApiOperation(httpMethod = "GET", value = "导出车用气瓶使用登记证", notes = "导出车用气瓶使用登记证")
+	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
+							   @RequestParam(value = "printType", defaultValue = "0") String printType) {
+		jgVehicleInformationServiceImpl.exportVehicleUseRegistrationCertificate(sequenceNbr, response, printType);
+	}
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgVehicleInformationEqServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationEqDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+@RestController
+@Api(tags = "车用气瓶控制类Api")
+@RequestMapping(value = "/jg-vehicle-information-eq")
+public class JgVehicleInformationEqController extends BaseController {
+
+    @Autowired
+    JgVehicleInformationEqServiceImpl jgVehicleInformationEqServiceImpl;
+
+    /**
+     * 新增车用气瓶控制类
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增车用气瓶控制类", notes = "新增车用气瓶控制类")
+	public ResponseModel<JgVehicleInformationEqDto> save(@RequestBody JgVehicleInformationEqDto model) {
+	    model = jgVehicleInformationEqServiceImpl.createWithModel(model);
+	    return ResponseHelper.buildResponse(model);
+	}
+
+	/**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新车用气瓶控制类", notes = "根据sequenceNbr更新车用气瓶控制类")
+	public ResponseModel<JgVehicleInformationEqDto> updateBySequenceNbrJgVehicleInformationEq(@RequestBody JgVehicleInformationEqDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgVehicleInformationEqServiceImpl.updateWithModel(model));
+	}
+
+	/**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除车用气瓶控制类", notes = "根据sequenceNbr删除车用气瓶控制类")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(jgVehicleInformationEqServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个车用气瓶控制类",  notes = "根据sequenceNbr查询单个车用气瓶控制类")
+	public ResponseModel<JgVehicleInformationEqDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgVehicleInformationEqServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询车用气瓶控制类",  notes = "分页查询车用气瓶控制类")
+	public ResponseModel<Page<JgVehicleInformationEqDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
+                    (value = "size") int size) {
+	    Page<JgVehicleInformationEqDto> page = new Page<JgVehicleInformationEqDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(jgVehicleInformationEqServiceImpl.queryForJgVehicleInformationEqPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询车用气瓶控制类",   notes = "列表全部数据查询车用气瓶控制类")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<JgVehicleInformationEqDto>> selectForList() {
+	    return ResponseHelper.buildResponse(jgVehicleInformationEqServiceImpl.queryForJgVehicleInformationEqList());
+	}
+}

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

@@ -226,6 +226,8 @@ public class CommonServiceImpl implements ICommonService {
     private IJgMaintainNoticeService iJgMaintainNoticeService;
     @Autowired
     private IJgTransferNoticeService jgTransferNoticeService;
+    @Autowired
+    private JgVehicleInformationServiceImpl jgVehicleInformationService;
 
     @Autowired
     RedissonClient redissonClient;
@@ -419,6 +421,7 @@ public class CommonServiceImpl implements ICommonService {
         if (useFlagParamDto.getNextInspectionDate() != null) {
             paramMap.put("year", DateUtil.year(useFlagParamDto.getNextInspectionDate()) + "");
             paramMap.put("month", DateUtil.month(useFlagParamDto.getNextInspectionDate()) + 1);
+            paramMap.put("nextInspectionTime",paramMap.get("year") +"年" + paramMap.get("month") +"月");
         }
     }
 
@@ -924,13 +927,14 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = new JSONObject(provideMap);
             return jgTransferNoticeService.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.SYDJ.getBusinessCode())) {
-
+            String code = (String) basicObj.get("equDefineCode");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
             if (submitType.equals("1")) {
                 jsonObject.put("submit", Boolean.TRUE);
             }
-            return jgUseRegistrationServiceImpl.save(jsonObject);
+            //判断是否为车用气瓶使用登记或者设备使用登记
+            return code != null && code.equals("23T0") ? jgVehicleInformationService.save(submitType, jsonObject) : jgUseRegistrationServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
             // 兼容业务逻辑代码
             if (submitType.equals("1")) {
@@ -1666,7 +1670,7 @@ public class CommonServiceImpl implements ICommonService {
         setNextDate(useFlagParamDto, paramMap);
         setRegName(useFlagParamDto, paramMap);
         // 生成二维码,之前为设备监管码，调整为申请单号
-        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(useFlagParamDto.getApplyNo()).orElse(""), 100, 100);
+        String qrCode = ImageUtils.generateQRCode(Optional.ofNullable(useFlagParamDto.getApplyNo()).orElse(""), 180, 180);
         paramMap.put("supervisoryCode", qrCode);
 
         this.fillParamValueToPdf(paramMap, response, selectPdfTemplate(useFlagParamDto.getEquListCode()), printFileName);
@@ -1686,11 +1690,10 @@ public class CommonServiceImpl implements ICommonService {
         switch (equListCode) {
             case "3000":
                 return "templates/use-flag-model-elevator.pdf";
-            case "23T0":
+            case "0000":
                 return "templates/use-flag-model-vehicle.pdf";
             default:
                 return "templates/use-flag-model-other.pdf";
         }
     }
-
 }
\ 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/JgVehicleInformationEqServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgVehicleInformationEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgVehicleInformationEqDto;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgVehicleInformationEqService;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+/**
+ * 服务实现类
+ *
+ * @author system_generator
+ * @date 2024-03-18
+ */
+@Service
+public class JgVehicleInformationEqServiceImpl extends BaseService<JgVehicleInformationEqDto, JgVehicleInformationEq,JgVehicleInformationEqMapper> implements IJgVehicleInformationEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgVehicleInformationEqDto> queryForJgVehicleInformationEqPage(Page<JgVehicleInformationEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgVehicleInformationEqDto> queryForJgVehicleInformationEqList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -268,5 +268,23 @@
     "pageType": "edit",
     "name": "报废注销",
     "url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "118",
+    "pageType": "draft",
+    "name": "车用气瓶登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1770004458848153602&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "118",
+    "pageType": "edit",
+    "name": "车用气瓶登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1770004458848153602&roleIds={roleIds}&userId={userId}&pageType=edit"
+  },
+  {
+    "type": "118",
+    "pageType": "look",
+    "name": "车用气瓶登记",
+    "url": "/mixuap?appId=1742358052905971713&id=1770004751216308226&roleIds={roleIds}&userId={userId}&pageType=look"
   }
 ]
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/equipment-registration-certificate-report.ftl

@@ -700,11 +700,7 @@
 												<w:sz-cs w:val="24"/>
 												<w:lang w:val="EN-US" w:fareast="ZH-CN"/>
 											</w:rPr>
-                                            <#if equDefineCode?? && equDefineCode == '23T0'>
-                                            <w:t>${(useUnitAddress)!''}</w:t>
-                                            <#else>
                                             <w:t>${(fullAddress)!''}</w:t>
-                                            </#if>
 										</w:r>
 									</w:p>
 								</w:txbxContent>
@@ -1024,7 +1020,7 @@
 												<w:sz-cs w:val="36"/>
 												<w:lang w:val="EN-US" w:fareast="EN-US" w:bidi="AR-SA"/>
 											</w:rPr>
-                                            <#if equDefineCode?? && equDefineCode == '23T0'>
+                                            <#if equDefineCode?? && equDefineCode == '23T0' || equDefineCode == '2200'>
                                             <w:t>使用单位地址：</w:t>
                                             <#else>
                                             <w:t>设备使用地点：</w:t>