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

@@ -109,6 +109,21 @@ public class JgChangeRegistrationUnitDto  extends BaseDto {
   @ApiModelProperty(value = "设备类别")
   private String equType;
 
- private List<String> roleIds;
+  private List<String> roleIds;
+
+  @ApiModelProperty(value = "设备名称")
+  private String productNameB;
+
+  @ApiModelProperty(value = "设备注册代码")
+  private String equCodeB;
+
+  @ApiModelProperty(value = "设备内部编号")
+  private String useInnerCode;
+
+  @ApiModelProperty(value = "设备使用登记注册编号")
+  private String useRegistCode;
+
+  @ApiModelProperty(value = "设备地址")
+  private String equAddress;
 
 }

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

@@ -178,7 +178,34 @@ public class JgChangeRegistrationUnit extends BaseEntity {
     @TableField("equ_type")
     private String equType;
 
+    /**
+     * 设备名称
+     */
+    @TableField("product_name_b")
+    private String productNameB;
+
+    /**
+     * 设备注册代码
+     */
+    @TableField("equ_code_b")
+    private String equCodeB;
+
+    /**
+     * 设备内部编号
+     */
+    @TableField("use_inner_code")
+    private String useInnerCode;
 
+    /**
+     * 设备使用登记注册编号
+     */
+    @TableField("use_regist_code")
+    private String useRegistCode;
 
+    /**
+     * 设备地址
+     */
+    @TableField("equ_address")
+    private String equAddress;
 
 }

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/enums/WorkFlowStatusEnum.java

@@ -54,7 +54,15 @@ public enum WorkFlowStatusEnum {
     TRANSFER_SUBMIT("使用单位提交", "transferSubmit", "使用单位待提交", "一级受理已驳回", "使用单位已撤回"),
     TRANSFER_RECEIVE("一级受理", "transferReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
     TRANSFER_PRELIMINARY("二级受理", "transferPreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
-    TRANSFER_REEXAMINE("三级受理", "transferReexamine", "三级待受理","","");
+    TRANSFER_REEXAMINE("三级受理", "transferReexamine", "三级待受理","",""),
+
+    /**
+     * 使用单位更登记流程
+     */
+    UNITCHANGE_SUBMIT("使用单位提交", "unitChangeSubmit", "使用单位待提交", "一级受理已驳回", "使用单位提交已撤回"),
+    UNITCHANGE_RECEIVE("一级受理", "unitChangeReceive", "一级待受理", "二级受理已驳回", "一级受理已撤回"),
+    UNITCHANGE_PRELIMINARY("二级受理", "unitChangePreliminary", "二级待受理", "三级受理已驳回", "二级受理已撤回"),
+    UNITCHANGE_REEXAMINE("三级受理", "unitChangeReexamine", "三级待受理","","");
 
 
     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/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/JgChangeRegistrationUnitEqMapper.java

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 单位变更登记设备关系表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-22
+ */
+public interface JgChangeRegistrationUnitEqMapper extends CustomBaseMapper<JgChangeRegistrationUnitEq> {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
+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 2023-12-22
+ */
+public interface JgChangeRegistrationUnitMapper extends CustomBaseMapper<JgChangeRegistrationUnit> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param model 查询参数
+     * @param type  类型：enterprise-企业端、supervision-监管端
+     * @return 安装告知列表
+     */
+    Page<JgChangeRegistrationUnit> queryForPage(Page<JgChangeRegistrationUnit> page, @Param("param") JgChangeRegistrationUnitDto model, @Param("type") String type, @Param("orgCode") String orgCode , @Param("roleIds") List<String> roleIds);
+
+    /**
+     * 根据安装告知编号查询设备、设计、制造等信息
+     *
+     * @param sequenceNbr 安装告知编号
+     */
+    @MapKey("sequenceNbr")
+    List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 单位变更登记设备关系表接口类
+ *
+ * @author system_generator
+ * @date 2023-12-22
+ */
+public interface IJgChangeRegistrationUnitEqService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
+
+import java.util.Map;
+
+/**
+ * 单位变更登记接口类
+ *
+ * @author system_generator
+ * @date 2023-12-22
+ */
+public interface IJgChangeRegistrationUnitService {
+
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return 安装告知
+     */
+    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
+
+    /**
+     * 更新安装告知
+     *
+     * @param noticeDto 安装告知
+     * @param op        操作类型
+     */
+    JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op);
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param model 查询参数
+     * @param type  类型：enterprise-企业端、supervision-监管端
+     * @return 安装告知列表
+     */
+    Page<JgChangeRegistrationUnitDto> queryForJgChangeRegistrationUnitPage(Page<JgChangeRegistrationUnit> page, JgChangeRegistrationUnitDto model, String type, ReginParams reginParams);
+
+    /**
+     * 批量删除
+     *
+     * @param sequenceNbrs 主键
+     * @return 是否删除成功
+     */
+    Boolean deleteForBatch(Long[] sequenceNbrs);
+
+    /**
+     * 保存安装告知单
+     *
+     * @param model      数据
+     * @param submitType 保存类型
+     */
+    void saveNotice(String submitType, JgChangeRegistrationUnitDto model, ReginParams reginParams);
+
+    /**
+     * 打印告知单
+     *
+     * @param sequenceNbr 主键
+     * @return pdf文件路径
+     */
+    String generateInstallationNoticeReport(Long sequenceNbr);
+}

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/JgChangeRegistrationUnitEqMapper.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.JgChangeRegistrationUnitEqMapper">
+
+</mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationUnitMapper.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.JgChangeRegistrationUnitMapper">
+
+    <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit">
+        select
+        isn.sequence_nbr AS sequenceNbr,
+        isn.apply_no AS applyNo,
+        isn.apply_date AS applyDate,
+        isn.use_unit_name AS useUnitName,
+        isn.receive_org_name AS receiveOrgName,
+        isn.new_use_unit_name AS newUseUnitName,
+        isn.apply_date AS applyDate,
+        isn.status AS status,
+        isn.instance_id AS instanceId,
+        isn.promoter,
+        isn.next_execute_ids AS nextExecuteIds,
+        isn.instance_status AS instanceStatus,
+        isn.audit_pass_date AS auditPassDate,
+        isn.equ_type AS equType
+        FROM
+        tzs_jg_change_registration_unit isn
+        <where>
+            isn.is_delete = false
+            <if test="param != null ">
+                <if test="param.applyNo != null and param.applyNo != ''">
+                    AND isn.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
+                </if>
+                <if test="param.receiveOrgCode != null and param.receiveOrgCode != ''">
+                    AND isn.receive_org_credit_code = #{param.receiveOrgCreditCode}
+                </if>
+                <if test="param.useUnitName != null and param.useUnitName != ''">
+                    AND isn.use_unit_credit_code = #{param.useUnitName}
+                </if>
+                <if test="param.status != null and param.status != ''">
+                    AND isn.status = #{param.status}
+                </if>
+            </if>
+            <if test="type == 'supervision'">
+                AND isn.receive_org_credit_code = #{orgCode}
+                AND isn.instance_id  is not null
+            </if>
+            <if test="type == 'enterprise'">
+                AND isn.new_use_unit_credit_code = #{orgCode}
+            </if>
+            <if test="roleIds != null and type == 'supervision'">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
+        </where>
+        ORDER BY
+        isn.create_date DESC
+    </select>
+
+    <select id="queryEquipInformation" resultType="java.util.Map">
+        select
+            isn.sequence_nbr AS sequenceNbr,
+            isn.apply_no AS applyNo,
+            isn.use_unit_name AS useUnitName,
+            isn.use_unit_credit_code AS useUnitName,
+            isn.new_use_unit_credit_code AS useUnitName,
+            isn.new_use_unit_name AS useUnitName,
+            isn.receive_org_name AS receiveOrgName,
+            isn.receive_org_code AS receiveOrgCode,
+            isn.change_certificate AS changeCertificate,
+            isn.remark AS remark,
+            isn.equ_register_code AS equRegisterCode,
+            ri.equ_list AS equList,
+            ri.equ_category AS equCategory,
+            ri.EQU_DEFINE AS equDefine,
+            ri.product_name AS productName,
+            ri.brand_name AS brandName,
+            ri.equ_type AS equType,
+            ri.equ_price AS equPrice,
+            ri.product_photo AS productPhoto,
+            di.design_unit_credit_code AS designUnitCreditCode,
+            di.design_unit_name AS designUnitName,
+            di.design_license_num AS designLicenseNum,
+            di.design_use_date AS designUseDate,
+            di.design_date AS designDate,
+            di.drawing_do AS drawingDo,
+            di.appraisal_unit AS appraisalUnit,
+            di.appraisal_date AS appraisalDate,
+            di.design_doc AS designDoc,
+            di.design_standard AS designStandard,
+            fi.produce_unit_credit_code AS produceUnitCreditCode,
+            fi.produce_unit_name AS produceUnitName,
+            fi.produce_license_num AS produceLicenseNum,
+            fi.factory_num AS factoryNum,
+            fi.produce_date AS produceDate,
+            fi.imported AS imported,
+            fi.produce_country AS produceCountry,
+            fi.factory_standard AS factoryStandard,
+            fi.product_quality_yield_prove AS productQualityYieldProve,
+            fi.ins_use_maintain_explain AS insUseMaintainExplain,
+            ei.legal_person AS safetyManager,
+            ei.legal_phone AS safetyManagerPhone,
+            ei.address AS address
+        FROM
+            tzs_jg_change_registration_unit isn
+                LEFT JOIN tzs_jg_change_registration_unit_eq re ON re.equip_transfer_id = isn.sequence_nbr
+                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+                LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = isn.use_unit_credit_code
+        WHERE
+            isn.sequence_nbr = #{sequenceNbr}
+            LIMIT 1
+    </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-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml

@@ -103,8 +103,8 @@
         sequence_nbr,
         apply_no,
         status,
+        apply_status,
         apply_date,
-        equ_type,
         use_unit_code,
         use_unit_name,
         receive_org_code,
@@ -113,20 +113,9 @@
         maintenance_unit_name,
         date_format(IFNULL(inform_start, null),'%Y-%m-%d') informStart,
         date_format(IFNULL(inform_end, null),'%Y-%m-%d') informEnd,
-        maintenance_manager_one_id,
-        maintenance_manager_two_id,
         emergency_call,
         maintenance_24_tel,
-        remark,
-        is_delete,
-        input_unit_no,
-        maintenance_contract,
-        maintenance_cycle,
-        overhaul_cycle,
         equ_num,
-        rec_user_id,
-        rec_date,
-        create_user_id,
         create_date,
         instance_id,
         promoter,
@@ -144,8 +133,8 @@
             <if test="contractDto.useUnitName != '' and contractDto.useUnitName != null">
                 and use_unit_name like concat('%',#{contractDto.useUnitName},'%')
             </if>
-            <if test="contractDto.applyStatus != '' and contractDto.applyStatus != null">
-                and apply_status like concat('%',#{contractDto.applyStatus},'%')
+            <if test="contractDto.status != '' and contractDto.status != null">
+                and status not like concat('%',#{contractDto.status},'%')
             </if>
             <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
                 and use_unit_code = #{contractDto.useUnitCode}

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
+import io.swagger.annotations.ApiParam;
+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.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
+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.JgChangeRegistrationUnitDto;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 单位变更登记
+ *
+ * @author system_generator
+ * @date 2023-12-22
+ */
+@RestController
+@Api(tags = "单位变更登记Api")
+@RequestMapping(value = "/jg-change-registration-unit")
+public class JgChangeRegistrationUnitController extends BaseController {
+
+    @Autowired
+    JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
+
+	/**
+	 * 新增
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
+	public ResponseModel<String> save(@RequestParam String submitType, @RequestBody Map<String, Object> model) {
+		JgChangeRegistrationUnitDto jgChangeRegistrationUnitDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+		ReginParams reginParams = getSelectedOrgInfo();
+
+		jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, jgChangeRegistrationUnitDto, reginParams);
+		return ResponseHelper.buildResponse("");
+	}
+
+	/**
+	 * 根据sequenceNbr更新
+	 *
+	 * @param model 单位变更
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PutMapping(value = "/update")
+	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新单位变更", notes = "根据sequenceNbr更新单位变更")
+	public ResponseModel<JgChangeRegistrationUnitDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
+		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+		if (Objects.isNull(installationInfo)) {
+			throw new IllegalArgumentException("参数installationInfo不能为空");
+		}
+//		Object o = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("proxyStatementAttachment");
+//		Object o1 = ((LinkedHashMap<?, ?>) model.get("installationInfo")).get("installContractAttachment");
+//		installationInfo.setProxyStatementAttachmentList((List<Map<String, Object>>) o);
+//		installationInfo.setInstallContractAttachmentList((List<Map<String, Object>>) o1);
+		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType,installationInfo, op));
+	}
+
+	/**
+	 * 根据sequenceNbr删除
+	 *
+	 * @param sequenceNbr 主键
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/delete")
+	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除单位变更", notes = "根据sequenceNbr删除单位变更")
+	public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.removeById(sequenceNbr));
+	}
+
+	/**
+	 * 根据sequenceNbr批量删除
+	 *
+	 * @param sequenceNbrs 主键
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@DeleteMapping(value = "/batchDelete")
+	@ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
+	public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
+		try {
+			return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.deleteForBatch(sequenceNbrs));
+		} catch (Exception e) {
+			return CommonResponseUtil.failure(e.getMessage());
+		}
+	}
+
+	/**
+	 * 根据sequenceNbr查询
+	 *
+	 * @param sequenceNbr 主键
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/details")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
+	public ResponseModel<Map<String,
+			Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
+	}
+
+
+	/**
+	 * 列表分页查询
+	 *
+	 * @param current 当前页
+	 * @param current 每页大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/page")
+	@ApiOperation(httpMethod = "GET", value = "单位变更分页查询", notes = "单位变更分页查询")
+	public ResponseModel<Page<JgChangeRegistrationUnitDto>> queryForPage(
+			@ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
+			@ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int size,
+			@ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
+			@RequestBody(required = false) JgChangeRegistrationUnitDto model
+	) {
+		Page<JgChangeRegistrationUnit> page = new Page<>(current, size);
+		ReginParams reginParams = getSelectedOrgInfo();
+		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page, model, type, reginParams));
+	}
+
+	/**
+	 * 生成告知单
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "单位变更列表全部数据查询", notes = "单位变更列表全部数据查询")
+	@GetMapping(value = "/generate-report")
+	public ResponseModel<String> generateReport(@RequestParam("sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.generateInstallationNoticeReport(sequenceNbr));
+	}
+
+	/**
+	 * 撤销
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/cancel")
+	@ApiOperation(httpMethod = "POST", value = "单位变更撤销", notes = "单位变更撤销")
+	public ResponseModel<JgChangeRegistrationUnitDto> cancel(@RequestBody Map<String, Object> model) {
+		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("installationInfo")), JgChangeRegistrationUnitDto.class, true);
+		if (Objects.isNull(installationInfo)) {
+			throw new IllegalArgumentException("参数installationInfo不能为空");
+		}
+		jgChangeRegistrationUnitServiceImpl.cancel(installationInfo);
+		return ResponseHelper.buildResponse(installationInfo);
+	}
+
+	/**
+	 * 受理
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/accept")
+	@ApiOperation(httpMethod = "POST", value = "单位变更受理", notes = "单位变更受理")
+	public ResponseModel<JgChangeRegistrationUnitDto> accept(@RequestBody Map<String, Object> model, String op) {
+		// TODO 受理单位变更流程
+		LinkedHashMap model1 = (LinkedHashMap)model.get("model");
+		String opinion = (String)model.get("opinion");
+		LinkedHashMap installationInfo = (LinkedHashMap)model1.get("installationInfo");
+		JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
+		jgInstallationNoticeDto.setProcessAdvice(opinion);
+		jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto,op);
+		return ResponseHelper.buildResponse(null);
+	}
+}

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

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

@@ -219,9 +219,17 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             Map<String, Object> useInfoMap = null;
             if(!ValidationUtil.isEmpty(fieldType)){
                 useInfoMap = Bean.BeantoMap(useInfo);
+                useInfoMap.put("province", useInfo.getProvince()+"_"+useInfo.getProvinceName());
+                useInfoMap.put("city", useInfo.getCity()+"_"+useInfo.getCityName());
+                useInfoMap.put("county", useInfo.getCounty()+"_"+useInfo.getCountyName());
+                useInfoMap.put("street", useInfo.getFactoryUseSiteStreet()+"_"+useInfo.getStreetName());
                 useInfoMap.put("useinfoSeq", useInfo.getSequenceNbr());
             }else {
                 useInfoMap = convertCamelToUnderscore(useInfo, null);
+                useInfoMap.put("PROVINCE", useInfo.getProvince()+"_"+useInfo.getProvinceName());
+                useInfoMap.put("CITY", useInfo.getCity()+"_"+useInfo.getCityName());
+                useInfoMap.put("COUNTY", useInfo.getCounty()+"_"+useInfo.getCountyName());
+                useInfoMap.put("STREET", useInfo.getFactoryUseSiteStreet()+"_"+useInfo.getStreetName());
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
             }
             if(!useInfoMap.isEmpty()){
@@ -622,6 +630,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE"))) {
             BoolQueryBuilder uuccBuilder = QueryBuilders.boolQuery();
             String param = QueryParser.escape(map.getString("USE_UNIT_CREDIT_CODE"));
+            param = param.contains("_") ? param.split("_")[0] : param;
             uuccBuilder.must(QueryBuilders.matchPhraseQuery("USE_UNIT_CREDIT_CODE", param));
             boolMust.must(uuccBuilder);
         }

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

@@ -25,7 +25,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.UseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -40,7 +39,6 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.util.*;
 
 /**

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnitEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationUnitEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationUnitEqService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitEqDto;
+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-22
+ */
+@Service
+public class JgChangeRegistrationUnitEqServiceImpl extends BaseService<JgChangeRegistrationUnitEqDto,JgChangeRegistrationUnitEq,JgChangeRegistrationUnitEqMapper> implements IJgChangeRegistrationUnitEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgChangeRegistrationUnitEqDto> queryForJgChangeRegistrationUnitEqPage(Page<JgChangeRegistrationUnitEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgChangeRegistrationUnitEqDto> queryForJgChangeRegistrationUnitEqList()   {
+        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-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintainNoticeServiceImpl.java

@@ -29,7 +29,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -49,6 +48,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -78,8 +78,9 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     JgMaintainNoticeEqMapper jgMaintainNoticeEqMapper;
     @Autowired
     private JgMaintainNoticeMapper jgMaintainNoticeMapper;
+
     @Autowired
-    private ICreateCodeService iCreateCodeService;
+    TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
     RegistrationInfoMapper tzsJgRegistrationInfoMapper;
 
@@ -87,9 +88,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     OtherInfoMapper tzsJgOtherInfoMapper;
 
     @Autowired
-    TzsServiceFeignClient tzsServiceFeignClient;
-
-    @Autowired
     SupervisoryCodeInfoMapper supervisoryCodeInfoMapper;
 
     @Autowired
@@ -386,13 +384,18 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         // 获取告知设备列表
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
-            return;
+            log.error(" 获取告知设备列表");
+            throw new RuntimeException();
         }
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());
-        if (CollectionUtils.isEmpty(applyNoList)) {
-            return;
+//        List<String> applyNoList = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());
+        ResponseModel<List<String>> applyNoResult =tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), deviceList.size());
+
+        if (CollectionUtils.isEmpty(applyNoResult.getResult())) {
+            log.error(" 获取告知单号失败");
+            throw new RuntimeException();
         }
+        List<String> applyNoList = applyNoResult.getResult();
         ArrayList<String> roleListFirst = new ArrayList<>();
         ArrayList<String> roleListSecond = new ArrayList<>();
         // 判断当前是否为提交
@@ -411,7 +414,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
-
             try {
                 FeignClientResult result = Workflow.taskV2Client.startByVariableBatch(actWorkflowBatchDTO);
                 List<Object> returnList = (List<Object>) result.getResult();
@@ -453,7 +455,6 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 log.error("提交失败：{}", e);
             }
         }
-
         List<JgMaintainNotice> list = new ArrayList<>();
         List<JgMaintainNoticeEq> equipList = new ArrayList<>();
         deviceList.forEach(obj -> {
@@ -486,17 +487,13 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             list.add(dto);
             equipList.add(jgRelationEquip);
         });
-
         jgMaintainNoticeMapper.insertBatchSomeColumn(list);
-
         List<JgMaintainNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
             List<JgMaintainNotice> collect = list.stream().filter(JgMaintainNotice -> jgRelationEquip.getEquipTransferId().equals(JgMaintainNotice.getApplyNo())).collect(Collectors.toList());
             Long sequenceNbr = collect.get(0).getSequenceNbr();
             return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
         }).collect(Collectors.toList());
-
         jgMaintainNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-
     }
 
     void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -9,24 +8,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
-import com.yeejoin.amos.boot.module.jg.api.vo.EquipMessageVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
+import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -35,14 +31,14 @@ import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.awt.print.Book;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -59,14 +55,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     public static final String SUBMIT_TYPE_FLOW = "1";
     public static final String WB_PROCESS_DEFINITION_KEY = "maintenanceFiling";
     private static final String HANDLING_STATUS_DICTIONARY = "JGGZZZ";
+    private static final String USE = "使用";
+
+    @Autowired
+    TzsServiceFeignClient tzsServiceFeignClient;
+
     @Autowired
     RestHighLevelClient restHighLevelClient;
     @Autowired
     WorkFlowFeignService workFlowFeginService;
     @Autowired
-    @SuppressWarnings("all")
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
     private JgMaintenanceContractMapper maintenanceContractMapper;
     @Autowired
     private JgMaintenanceContractEqMapper maintenanceContractEqMapper;
@@ -96,10 +94,12 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             //使用单位用"使用单位统一信用代码"匹配数据
             dto.setUseUnitCode(company.getCompanyCode());
             dto.setRoleIds(null);
+            dto.setStatus(null);
             contractList = maintenanceContractMapper.getContractList(page, dto);
         } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
             //维保单位用"维保单位统一信用代码"匹配数据
             dto.setMaintenanceUnitCode(company.getCompanyCode());
+            dto.setStatus(dto.getStatus().contains(USE) ? USE : null);
             contractList = maintenanceContractMapper.getContractList(page, dto);
         } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
             //监管单位用"接收机构统一使用代码"匹配
@@ -356,15 +356,21 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     /**
      * 新增维保合同
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public Boolean saveOrSubmit(String submit, Map<String, Object> map, ReginParams reginParams) {
         JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(map), JgMaintenanceContractDto.class);
         List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) map.get("equipmentLists");
         CompanyBo company = reginParams.getCompany();
         JgMaintenanceContract contract = new JgMaintenanceContract();
         BeanUtils.copyProperties(dto, contract);
+        contract.setCreateDate(new Date());
         //获取维保备案编号
-        String wbApplyNo = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.WBBA.getCode(), 1).get(0);
+        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.AZGZ.getCode(), 1);
+        if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
+            log.error("告知单获取失败");
+            return false;
+        }
+        String wbApplyNo = listResponseModel.getResult().get(0);
         contract.setApplyNo(wbApplyNo);
         contract.setUseUnitCode(company.getCompanyCode());
         contract.setUseUnitName(company.getCompanyName());
@@ -457,6 +463,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             jgMaintenanceContract.setNextExecuteIds(role);
             jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
             jgMaintenanceContract.setInstanceId(instanceId);
+            jgMaintenanceContract.setApplyDate(new Date());
             if (!ObjectUtils.isEmpty(jgMaintenanceContract.getInstanceStatus())) {
                 jgMaintenanceContract.setInstanceStatus(jgMaintenanceContract.getInstanceStatus() + "," + role);
             } else {

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

@@ -27,7 +27,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -47,6 +46,8 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -85,8 +86,6 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
     @Autowired
     private JgReformNoticeMapper jgReformNoticeMapper;
-    @Autowired
-    private ICreateCodeService iCreateCodeService;
     //    @Autowired
 //    private EquipmentCategoryServiceImpl equipmentCategoryService;
     @Autowired
@@ -404,13 +403,18 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         // 获取告知设备列表
         List<Map<String, Object>> deviceList = model.getDeviceList();
         if (CollectionUtils.isEmpty(deviceList)) {
-            return;
+            throw  new BadRequest("请选择设备!");
         }
 
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), deviceList.size());
+        ResponseModel<List<String>> codeResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), deviceList.size());
+        List<String> applyNoList = null;
+        if(codeResult != null && !ValidationUtil.isEmpty(codeResult.getResult())) {
+            applyNoList = codeResult.getResult();
+        }
+        // List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), deviceList.size());
         if (CollectionUtils.isEmpty(applyNoList)) {
-            return;
+            throw new BadRequest("申请单编号生成失败,请稍后重试!");
         }
 
         ArrayList<String> roleListFirst = new ArrayList<>();
@@ -476,12 +480,13 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
 
         List<JgReformNotice> list = new ArrayList<>();
         List<JgReformNoticeEq> equipList = new ArrayList<>();
+        List<String> finalApplyNoList = applyNoList;
         deviceList.forEach(obj -> {
             JgReformNoticeEq jgRelationEquip = new JgReformNoticeEq();
             JgReformNotice dto = new JgReformNotice();
             BeanUtils.copyProperties(model, dto);
             int i = deviceList.indexOf(obj);
-            String applyNo = applyNoList.get(i);
+            String applyNo = finalApplyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
             dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));

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

@@ -33,7 +33,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgOtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgUseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SuperviseInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
@@ -42,6 +41,7 @@ import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -72,8 +72,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     private JgScrapCancelEqMapper jgScrapCancelEqMapper;
     @Autowired
     WorkFlowFeignService workFlowFeginService;
-    @Autowired
-    private ICreateCodeService iCreateCodeService;
+
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
 
@@ -145,7 +144,12 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         deviceList.add(map1);
 
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SBZX.getCode(), deviceList.size());
+        ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.SBZX.getCode(), deviceList.size());
+        if (!ObjectUtils.isEmpty(listResponseModel) && listResponseModel.getStatus() != HttpStatus.OK.value()) {
+            log.error(" 获取告知单号失败");
+            throw new RuntimeException();
+        }
+        List<String> applyNoList = listResponseModel.getResult();
         if (CollectionUtils.isEmpty(applyNoList)) {
             return;
         }

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

@@ -28,7 +28,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -48,6 +47,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -78,8 +78,6 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @Autowired
     private JgTransferNoticeMapper jgTransferNoticeMapper;
     @Autowired
-    private ICreateCodeService iCreateCodeService;
-    @Autowired
     RegistrationInfoMapper tzsJgRegistrationInfoMapper;
     @Autowired
     OtherInfoMapper tzsJgOtherInfoMapper;
@@ -390,8 +388,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
 
         // 获取告知单号
-        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), deviceList.size());
-        if (CollectionUtils.isEmpty(applyNoList)) {
+        ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), deviceList.size());
+        if (CollectionUtils.isEmpty(responseModel.getResult())) {
             return;
         }
 
@@ -463,7 +461,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             JgTransferNotice dto = new JgTransferNotice();
             BeanUtils.copyProperties(model, dto);
             int i = deviceList.indexOf(obj);
-            String applyNo = applyNoList.get(i);
+            String applyNo = responseModel.getResult().get(i);
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());

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

@@ -428,7 +428,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             lambda.eq(JgRegistrationHistory::getEquId, id);
             JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getBaseMapper().selectOne(lambda);
             JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
-            jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode()+"-"+jgUseRegistration.getReceiveOrgName());
+            jsonObject.put("receiveOrgCode", jgUseRegistration.getReceiveCompanyCode()+"_"+jgUseRegistration.getReceiveOrgName());
             return jsonObject;
         }
         Map<String, Object> detail = this.baseMapper.getDetail(id);

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcOpeningApplicationController.java

@@ -76,9 +76,11 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@ApiOperation(httpMethod = "PUT", value = "保存并提交", notes = "保存并提交")
 	public ResponseModel<JyjcOpeningApplicationModel> updateBySequenceNbrAndStartFlow(@RequestBody JyjcOpeningApplicationModel model, @RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
 		model.setSequenceNbr(sequenceNbr);
-		JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr);
-		if (jyjcOpeningApplicationModel == null || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getBaseUnitLicences()) || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getUserInfos())) {
-			throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
+		if (sequenceNbr != null) {
+			JyjcOpeningApplicationModel jyjcOpeningApplicationModel = jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr);
+			if (jyjcOpeningApplicationModel == null || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getBaseUnitLicences()) || ValidationUtil.isEmpty(jyjcOpeningApplicationModel.getUserInfos())) {
+				throw new BadRequest("企业资质信息和检验人员信息为空，无法提交！");
+			}
 		}
 		return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.saveOrUpdateModel(model,true));
 	}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -27,7 +27,6 @@ import com.yeejoin.amos.boot.module.jyjc.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -65,8 +64,6 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     private JyjcInspectionResultServiceImpl inspectionResultService;
     @Autowired
     private JyjcInspectionApplicationEquipServiceImpl applicationEquipService;
-  //  @Autowired
-  // private ICreateCodeService createCodeService;
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -31,7 +31,6 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseUnitLicenceMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -70,8 +69,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     CommonserviceImpl commonserviceImpl;
     @Autowired
-    private ICreateCodeService createCodeService;
-    @Autowired
     private TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
     JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application.properties

-spring.application.name=TZS-JYJC
+spring.application.name=TZS-JYJC-YY
 server.servlet.context-path=/jyjc
 server.port=12000
 spring.profiles.active=dev

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/logback-dev.xml

@@ -50,7 +50,7 @@
     <logger name="com.yeejoin" level="INFO"/>
 
     <!-- 日志输出级别 -->
-    <root level="DEBUG">
+    <root level="INFO">
         <!-- <appender-ref ref="FILE" /> -->
         <appender-ref ref="STDOUT" />
 <!--        <appender-ref ref="ELK" />-->

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"),//更名变更
     ;
 
     /**

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/service/ICreateCodeService.java

-package com.yeejoin.amos.boot.module.ymt.api.service;
-
-import java.util.List;
-
-/**
- * 生成码服务类
- * @author LiuLin
- * @date 2023-12-14
- */
-public interface ICreateCodeService {
-
-    /**
-     * 生成申请单编号(13位，GZ20231214000)
-     * @param type 枚举类型
-     * @param batchSize 生成个数
-     * @return List
-     */
-    List<String> createApplicationFormCode(String type, int batchSize);
-
-    /**
-     * 生成设备注册编码(20位)
-     * @param key key
-     * @return 顺序编号
-     */
-    String createDeviceRegistrationCode(String key);
-
-    /**
-     * 生成使用登记证编号(13位，起11陕C00001(23))
-     * @param key key
-     * @return 顺序编号
-     */
-    String createUseRegistrationCode(String key);
-
-    /**
-     * 96333编码生成(7位)
-     * @param key key
-     * @return 96333顺序码
-     */
-    String createElevatorCode(String key);
-
-    /**
-     * 回退顺序码
-     * @param key redisKey
-     * @return bool
-     */
-    boolean reduceElevatorCode(String key);
-
-    /**
-     * 监管编码生成(7位)
-     * @param key key
-     * @return 7位监管编码生成
-     */
-    String createSupervisoryCode(String key);
-}