Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 更名变更登记
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "JgChangeRegistrationNameDto", description = "更名变更登记")
+public class JgChangeRegistrationNameDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "申请日期")
+    private Date applyDate;
+
+    @ApiModelProperty(value = "办理状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "登记机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "登记机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "登记机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "原使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "新使用单位名称")
+    private String newUseUnitName;
+
+    @ApiModelProperty(value = "证照图片（更名后证照）")
+    private String changeCertificate;
+
+    @ApiModelProperty(value = "证照图片（更名后证照）集合")
+    private List<Map<String, Object>> changeCertificateList;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "流程执行顺序标识")
+    private String executeSequence;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeRegistrationNameEqDto", description="")
+public class JgChangeRegistrationNameEqDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "更名变更登记申请id")
+    private String nameChangeRegistrationId;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+    @ApiModelProperty(value = "使用登记证是否作废（1作废，0在用）")
+    private String isInvalid;
+
+    @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/dto/JgEnableDisableDto.java

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgEnableDisableDto", description="")
+public class JgEnableDisableDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "申请日期")
+    private Date applyDate;
+
+    @ApiModelProperty(value = "办理状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "接受机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "接受机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "接受机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "备注（申请说明）")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "流程执行顺序标识")
+    private String executeSequence;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String promoter;
+
+    @ApiModelProperty(value = "申请类型（1启用，0停用）")
+    private String applyType;
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 启用停用设备关系表
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgEnableDisableEqDto", description="启用停用设备关系表")
+public class JgEnableDisableEqDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "启用停用申请id")
+    private String enableDisableApplyId;
+
+    @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/JgChangeRegistrationName.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 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_registration_name")
+public class JgChangeRegistrationName extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 申请日期
+     */
+	@TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 办理状态
+     */
+	@TableField("audit_status")
+    private String auditStatus;
+
+    /**
+     * 登记机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 登记机构代码
+     */
+	@TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    /**
+     * 登记机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    /**
+     * 终审通过时间
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 原使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 新使用单位名称
+     */
+	@TableField("new_use_unit_name")
+    private String newUseUnitName;
+
+    /**
+     * 证照图片（更名后证照）
+     */
+	@TableField("change_certificate")
+    private String changeCertificate;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 流程执行顺序标识
+     */
+	@TableField("execute_sequence")
+    private String executeSequence;
+
+    /**
+     * 下一执行节点ids
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationNameEq.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 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_registration_name_eq")
+public class JgChangeRegistrationNameEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 更名变更登记申请id
+     */
+	@TableField("name_change_registration_id")
+    private String nameChangeRegistrationId;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+    /**
+     * 使用登记证是否作废（1作废，0在用）
+     */
+	@TableField("is_invalid")
+    private String isInvalid;
+
+    /**
+     * 创建时间
+     */
+	@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/entity/JgEnableDisable.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 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_enable_disable")
+public class JgEnableDisable extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 申请日期
+     */
+	@TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 办理状态
+     */
+	@TableField("audit_status")
+    private String auditStatus;
+
+    /**
+     * 接受机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 接受机构代码
+     */
+	@TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    /**
+     * 接受机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    /**
+     * 终审通过时间
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+    /**
+     * 备注（申请说明）
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 流程执行顺序标识
+     */
+	@TableField("execute_sequence")
+    private String executeSequence;
+
+    /**
+     * 下一执行节点ids
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("promoter")
+    private String promoter;
+
+    /**
+     * 申请类型（1启用，0停用）
+     */
+	@TableField("apply_type")
+    private String applyType;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEnableDisableEq.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 2023-12-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_enable_disable_eq")
+public class JgEnableDisableEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 启用停用申请id
+     */
+	@TableField("enable_disable_apply_id")
+    private String enableDisableApplyId;
+
+    /**
+     * 设备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/mapper/JgChangeRegistrationNameEqMapper.java

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationNameEq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+public interface JgChangeRegistrationNameEqMapper extends BaseMapper<JgChangeRegistrationNameEq> {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationName;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 更名变更登记 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+public interface JgChangeRegistrationNameMapper extends BaseMapper<JgChangeRegistrationName> {
+
+    List<Map<String, Object>> getEquipInfoByOrgCode(@Param("code") String code);
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 启用停用设备关系表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+public interface JgEnableDisableEqMapper extends BaseMapper<JgEnableDisableEq> {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisable;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+public interface JgEnableDisableMapper extends BaseMapper<JgEnableDisable> {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+public interface IJgChangeRegistrationNameEqService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 启用停用设备关系表接口类
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+public interface IJgEnableDisableEqService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 接口类
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+public interface IJgEnableDisableService {
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationNameEqMapper.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.JgChangeRegistrationNameEqMapper">
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationNameMapper.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.JgChangeRegistrationNameMapper">
+
+<select id="getEquipInfoByOrgCode" resultType="java.util.Map">
+    SELECT
+        u.RECORD AS equipId,
+        o.SUPERVISORY_CODE AS supervisoryCode,
+        b.USE_ORG_CODE AS useOrgCode
+    FROM
+        idx_biz_jg_use_info u
+            LEFT JOIN idx_biz_jg_register_info b ON u.RECORD = b.RECORD
+            LEFT JOIN idx_biz_jg_other_info o ON u.RECORD = o.RECORD
+    WHERE
+        USE_UNIT_CREDIT_CODE = #{code}
+    </select>
+</mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableEqMapper.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.JgEnableDisableEqMapper">
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.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.JgEnableDisableMapper">
+
+</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/JgChangeRegistrationNameEqController.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.JgChangeRegistrationNameEqServiceImpl;
+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.JgChangeRegistrationNameEqDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jg-change-registration-name-eq")
+public class JgChangeRegistrationNameEqController extends BaseController {
+
+    @Autowired
+    JgChangeRegistrationNameEqServiceImpl jgChangeRegistrationNameEqServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<JgChangeRegistrationNameEqDto> save(@RequestBody JgChangeRegistrationNameEqDto model) {
+	    model = jgChangeRegistrationNameEqServiceImpl.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<JgChangeRegistrationNameEqDto> updateBySequenceNbrJgChangeRegistrationNameEq(@RequestBody JgChangeRegistrationNameEqDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgChangeRegistrationNameEqServiceImpl.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(jgChangeRegistrationNameEqServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<JgChangeRegistrationNameEqDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgChangeRegistrationNameEqServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<JgChangeRegistrationNameEqDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<JgChangeRegistrationNameEqDto> page = new Page<JgChangeRegistrationNameEqDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(jgChangeRegistrationNameEqServiceImpl.queryForJgChangeRegistrationNameEqPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<JgChangeRegistrationNameEqDto>> selectForList() {
+	    return ResponseHelper.buildResponse(jgChangeRegistrationNameEqServiceImpl.queryForJgChangeRegistrationNameEqList());
+	}
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEnableDisableController.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.JgEnableDisableServiceImpl;
+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.JgEnableDisableDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jg-enable-disable")
+public class JgEnableDisableController extends BaseController {
+
+    @Autowired
+    JgEnableDisableServiceImpl jgEnableDisableServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<JgEnableDisableDto> save(@RequestBody JgEnableDisableDto model) {
+	    model = jgEnableDisableServiceImpl.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<JgEnableDisableDto> updateBySequenceNbrJgEnableDisable(@RequestBody JgEnableDisableDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.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(jgEnableDisableServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<JgEnableDisableDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<JgEnableDisableDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<JgEnableDisableDto> page = new Page<JgEnableDisableDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.queryForJgEnableDisablePage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<JgEnableDisableDto>> selectForList() {
+	    return ResponseHelper.buildResponse(jgEnableDisableServiceImpl.queryForJgEnableDisableList());
+	}
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgEnableDisableEqController.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.JgEnableDisableEqServiceImpl;
+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.JgEnableDisableEqDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 
+ *
+ * @author system_generator
+ * @date 2023-12-25
+ */
+@RestController
+@Api(tags = "Api")
+@RequestMapping(value = "/jg-enable-disable-eq")
+public class JgEnableDisableEqController extends BaseController {
+
+    @Autowired
+    JgEnableDisableEqServiceImpl jgEnableDisableEqServiceImpl;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<JgEnableDisableEqDto> save(@RequestBody JgEnableDisableEqDto model) {
+	    model = jgEnableDisableEqServiceImpl.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<JgEnableDisableEqDto> updateBySequenceNbrJgEnableDisableEq(@RequestBody JgEnableDisableEqDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	    model.setSequenceNbr(sequenceNbr);
+	    return ResponseHelper.buildResponse(jgEnableDisableEqServiceImpl.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(jgEnableDisableEqServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+	 * @param sequenceNbr  主键
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/{sequenceNbr}")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+	public ResponseModel<JgEnableDisableEqDto> selectOne(@PathVariable Long sequenceNbr) {
+	    return ResponseHelper.buildResponse(jgEnableDisableEqServiceImpl.queryBySeq(sequenceNbr));
+	}
+
+	/**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+	public ResponseModel<Page<JgEnableDisableEqDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size) {
+	    Page<JgEnableDisableEqDto> page = new Page<JgEnableDisableEqDto>();
+	    page.setCurrent(current);
+	    page.setSize(size);
+	    return ResponseHelper.buildResponse(jgEnableDisableEqServiceImpl.queryForJgEnableDisableEqPage(page));
+	}
+
+	/**
+	 * 列表全部数据查询
+     *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+	@GetMapping(value = "/list")
+	public ResponseModel<List<JgEnableDisableEqDto>> selectForList() {
+	    return ResponseHelper.buildResponse(jgEnableDisableEqServiceImpl.queryForJgEnableDisableEqList());
+	}
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationNameEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationNameEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationNameEqService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationNameEqDto;
+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 2023-12-25
+ */
+@Service
+public class JgChangeRegistrationNameEqServiceImpl extends BaseService<JgChangeRegistrationNameEqDto,JgChangeRegistrationNameEq,JgChangeRegistrationNameEqMapper> implements IJgChangeRegistrationNameEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgChangeRegistrationNameEqDto> queryForJgChangeRegistrationNameEqPage(Page<JgChangeRegistrationNameEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgChangeRegistrationNameEqDto> queryForJgChangeRegistrationNameEqList()   {
+        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/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableEqServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisableEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgEnableDisableEqService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableEqDto;
+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 2023-12-25
+ */
+@Service
+public class JgEnableDisableEqServiceImpl extends BaseService<JgEnableDisableEqDto,JgEnableDisableEq,JgEnableDisableEqMapper> implements IJgEnableDisableEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgEnableDisableEqDto> queryForJgEnableDisableEqPage(Page<JgEnableDisableEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgEnableDisableEqDto> queryForJgEnableDisableEqList()   {
+        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/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEnableDisable;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgEnableDisableService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEnableDisableDto;
+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 2023-12-25
+ */
+@Service
+public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,JgEnableDisable,JgEnableDisableMapper> implements IJgEnableDisableService {
+    /**
+     * 分页查询
+     */
+    public Page<JgEnableDisableDto> queryForJgEnableDisablePage(Page<JgEnableDisableDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgEnableDisableDto> queryForJgEnableDisableList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/ApplicationFormTypeEnum.java

@@ -27,6 +27,7 @@ public enum ApplicationFormTypeEnum {
     JY("JY"),
     JG("JG"),// 检验结果
     SBZX("SBZX"),//电梯（设备）注销
+    GMBG("GMBG"),//更名变更
     ;
 
     /**