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/JgChangeRegistrationReformDto.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeRegistrationReformDto", description="改造变更登记")
+public class JgChangeRegistrationReformDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备监管码")
+    private String supervisoryCode;
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "办理状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "登记机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "检验单位")
+    private String inspectUnitName;
+
+    @ApiModelProperty(value = "检验结果照片")
+    private String inspectResultPhoto;
+
+    @ApiModelProperty(value = "检验结果")
+    private String inspectResult;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "登记类别")
+    private String regType;
+
+    @ApiModelProperty(value = "注册登记日期")
+    private Date regDate;
+
+    @ApiModelProperty(value = "注册登记人员ID")
+    private String regPersonId;
+
+    @ApiModelProperty(value = "注册登记人员")
+    private String regPersonName;
+
+    @ApiModelProperty(value = "安装单位名称")
+    private String installUnitName;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "录入单位统一信用代码")
+    private String inputUnitNo;
+
+    @ApiModelProperty(value = "使用登记编号")
+    private String useRegistrationCode;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "检验机构统一信用代码")
+    private String inspectUnitCreditCode;
+
+    @ApiModelProperty(value = "流程执行顺序标识")
+    private String executeSequence;
+
+    @ApiModelProperty(value = "登记机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "登记机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecuteIds;
+
+    @ApiModelProperty(value = "改造告知申请id")
+    private String reformNoticeId;
+
+    @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/JgChangeRegistrationReformEqDto.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeRegistrationReformEqDto", description="改造变更登记设备关系表")
+public class JgChangeRegistrationReformEqDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备移交申请id")
+    private String equipTransferId;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationTransferDto.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeRegistrationTransferDto", description="移装变更登记登记")
+public class JgChangeRegistrationTransferDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备监管码")
+    private String supervisoryCode;
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "办理状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "登记机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "检验单位")
+    private String inspectUnitName;
+
+    @ApiModelProperty(value = "检验结果照片")
+    private String inspectResultPhoto;
+
+    @ApiModelProperty(value = "检验结果")
+    private String inspectResult;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+    @ApiModelProperty(value = "登记类别")
+    private String regType;
+
+    @ApiModelProperty(value = "注册登记日期")
+    private Date regDate;
+
+    @ApiModelProperty(value = "注册登记人员ID")
+    private String regPersonId;
+
+    @ApiModelProperty(value = "注册登记人员")
+    private String regPersonName;
+
+    @ApiModelProperty(value = "安装单位名称")
+    private String installUnitName;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "录入单位统一信用代码")
+    private String inputUnitNo;
+
+    @ApiModelProperty(value = "使用登记编号")
+    private String useRegistrationCode;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "检验机构统一信用代码")
+    private String inspectUnitCreditCode;
+
+    @ApiModelProperty(value = "流程执行顺序标识")
+    private String executeSequence;
+
+    @ApiModelProperty(value = "登记机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "登记机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "移装告知申请id")
+    private String reformNoticeId;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String executorUserId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationTransferEqDto.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgChangeRegistrationTransferEqDto", description="移装变更登记设备关系表")
+public class JgChangeRegistrationTransferEqDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备移交申请id")
+    private String equipTransferId;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferDto.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgEquipTransferDto", description="设备移交")
+public class JgEquipTransferDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "使用单位统一信用代码")
+    private String useUnitCreditCode;
+
+    @ApiModelProperty(value = "使用单位名称")
+    private String useUnitName;
+
+    @ApiModelProperty(value = "申请状态")
+    private String applyStatus;
+
+    @ApiModelProperty(value = "申请日期")
+    private Date applyDate;
+
+    @ApiModelProperty(value = "施工单位统一信用代码")
+    private String installUnitCreditCode;
+
+    @ApiModelProperty(value = "施工单位名称")
+    private String installUnitName;
+
+    @ApiModelProperty(value = "设备数量")
+    private Integer equipNum;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "下步执行角色/人id")
+    private String nextExecutorIds;
+
+    @ApiModelProperty(value = "流程执行顺序标识")
+    private String executeSequence;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "创建人id ")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建人")
+    private String createUserName;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "流程状态")
+    private String instanceStatus;
+
+    @ApiModelProperty(value = "受理完成日期")
+    private Date acceptDate;
+
+    @ApiModelProperty(value = "任务发起人id")
+    private String executorUserId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgEquipTransferEqDto.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgEquipTransferEqDto", description="设备移交关系表")
+public class JgEquipTransferEqDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备移交申请id")
+    private String equipTransferId;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+}

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

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author system_generator
@@ -60,6 +62,13 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "维保合同结束日期")
     private Date informEnd;
 
+    @ApiModelProperty(value = "管理员id")
+    private String maintenanceManagerId;
+
+    @ApiModelProperty(value = "管理员姓名")
+    private String maintenanceManagerName;
+
+
     @ApiModelProperty(value = "维保负责人一id")
     private String maintenanceManagerOneId;
 
@@ -73,9 +82,6 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "24小时维保电话")
     private String maintenance24Tel;
 
-    @ApiModelProperty(value = "办理流程")
-    private String applyFlow;
-
     @ApiModelProperty(value = "备注")
     private String remark;
 
@@ -101,4 +107,18 @@ public class JgMaintenanceContractDto extends BaseDto {
     @ApiModelProperty(value = "创建时间")
     private Date createDate;
 
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+    @TableField("promoter")
+    private String promoter;
+
+    @TableField("status")
+    private String status;
+
+    private List<String> roleIds;
+
 }

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

+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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgScrapCancelDto", description="设备注销报废")
+public class JgScrapCancelDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "注销类型（1报废注销，2移装注销）")
+    private String type;
+
+    @ApiModelProperty(value = "申请编号")
+    private String applyNo;
+
+    @ApiModelProperty(value = "流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty(value = "办理状态")
+    private String auditStatus;
+
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人ID")
+    private String createUserId;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createDate;
+
+    @ApiModelProperty(value = "流程状态")
+    private String instanceStatus;
+
+    @ApiModelProperty(value = "下一执行节点ids")
+    private String nextExecuteIds;
+
+    @ApiModelProperty(value = "接收机构代码")
+    private String receiveOrgCode;
+
+    @ApiModelProperty(value = "接收机构")
+    private String receiveOrgName;
+
+    @ApiModelProperty(value = "接收机构公司代码")
+    private String receiveCompanyCode;
+
+    @ApiModelProperty(value = "注销证明")
+    private String cancelCertificate;
+
+    @ApiModelProperty(value = "终审通过时间")
+    private Date auditPassDate;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgScrapCancelEqDto.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JgScrapCancelEqDto", description="注销报废设备关系表")
+public class JgScrapCancelEqDto  extends BaseDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "设备移交申请id")
+    private String equipTransferId;
+
+    @ApiModelProperty(value = "设备id")
+    private String equId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationReform.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_registration_reform")
+public class JgChangeRegistrationReform extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备监管码
+     */
+	@TableField("supervisory_code")
+    private String supervisoryCode;
+
+    /**
+     * 使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 办理状态
+     */
+	@TableField("audit_status")
+    private String auditStatus;
+
+    /**
+     * 登记机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 检验单位
+     */
+	@TableField("inspect_unit_name")
+    private String inspectUnitName;
+
+    /**
+     * 检验结果照片
+     */
+	@TableField("inspect_result_photo")
+    private String inspectResultPhoto;
+
+    /**
+     * 检验结果
+     */
+	@TableField("inspect_result")
+    private String inspectResult;
+
+    /**
+     * 终审通过时间
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+    /**
+     * 登记类别
+     */
+	@TableField("reg_type")
+    private String regType;
+
+    /**
+     * 注册登记日期
+     */
+	@TableField("reg_date")
+    private Date regDate;
+
+    /**
+     * 注册登记人员ID
+     */
+	@TableField("reg_person_id")
+    private String regPersonId;
+
+    /**
+     * 注册登记人员
+     */
+	@TableField("reg_person_name")
+    private String regPersonName;
+
+    /**
+     * 安装单位名称
+     */
+	@TableField("install_unit_name")
+    private String installUnitName;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 录入单位统一信用代码
+     */
+	@TableField("input_unit_no")
+    private String inputUnitNo;
+
+    /**
+     * 使用登记编号
+     */
+	@TableField("use_registration_code")
+    private String useRegistrationCode;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 检验机构统一信用代码
+     */
+	@TableField("inspect_unit_credit_code")
+    private String inspectUnitCreditCode;
+
+    /**
+     * 流程执行顺序标识
+     */
+	@TableField("execute_sequence")
+    private String executeSequence;
+
+    /**
+     * 登记机构代码
+     */
+	@TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    /**
+     * 登记机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+
+    /**
+     * 改造告知申请id
+     */
+	@TableField("reform_notice_id")
+    private String reformNoticeId;
+
+
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    /**
+     * 下一执行节点ids
+     */
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+    /**
+     * 任务发起人id
+     */
+    @TableField(value = "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/JgChangeRegistrationReformEq.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_registration_reform_eq")
+public class JgChangeRegistrationReformEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备移交申请id
+     */
+	@TableField("equip_transfer_id")
+    private String equipTransferId;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationTransfer.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_registration_transfer")
+public class JgChangeRegistrationTransfer extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备监管码
+     */
+	@TableField("supervisory_code")
+    private String supervisoryCode;
+
+    /**
+     * 使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 办理状态
+     */
+	@TableField("audit_status")
+    private String auditStatus;
+
+    /**
+     * 登记机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 检验单位
+     */
+	@TableField("inspect_unit_name")
+    private String inspectUnitName;
+
+    /**
+     * 检验结果照片
+     */
+	@TableField("inspect_result_photo")
+    private String inspectResultPhoto;
+
+    /**
+     * 检验结果
+     */
+	@TableField("inspect_result")
+    private String inspectResult;
+
+    /**
+     * 终审通过时间
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+    /**
+     * 登记类别
+     */
+	@TableField("reg_type")
+    private String regType;
+
+    /**
+     * 注册登记日期
+     */
+	@TableField("reg_date")
+    private Date regDate;
+
+    /**
+     * 注册登记人员ID
+     */
+	@TableField("reg_person_id")
+    private String regPersonId;
+
+    /**
+     * 注册登记人员
+     */
+	@TableField("reg_person_name")
+    private String regPersonName;
+
+    /**
+     * 安装单位名称
+     */
+	@TableField("install_unit_name")
+    private String installUnitName;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 录入单位统一信用代码
+     */
+	@TableField("input_unit_no")
+    private String inputUnitNo;
+
+    /**
+     * 使用登记编号
+     */
+	@TableField("use_registration_code")
+    private String useRegistrationCode;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 检验机构统一信用代码
+     */
+	@TableField("inspect_unit_credit_code")
+    private String inspectUnitCreditCode;
+
+    /**
+     * 流程执行顺序标识
+     */
+	@TableField("execute_sequence")
+    private String executeSequence;
+
+    /**
+     * 登记机构代码
+     */
+	@TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    /**
+     * 登记机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    /**
+     * 下一执行节点ids
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 移装告知申请id
+     */
+	@TableField("reform_notice_id")
+    private String reformNoticeId;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("executor_user_id")
+    private String executorUserId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationTransferEq.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_change_registration_transfer_eq")
+public class JgChangeRegistrationTransferEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备移交申请id
+     */
+	@TableField("equip_transfer_id")
+    private String equipTransferId;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEquipTransfer.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_equip_transfer")
+public class JgEquipTransfer extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 使用单位统一信用代码
+     */
+	@TableField("use_unit_credit_code")
+    private String useUnitCreditCode;
+
+    /**
+     * 使用单位名称
+     */
+	@TableField("use_unit_name")
+    private String useUnitName;
+
+    /**
+     * 申请状态
+     */
+	@TableField("apply_status")
+    private String applyStatus;
+
+    /**
+     * 申请日期
+     */
+	@TableField("apply_date")
+    private Date applyDate;
+
+    /**
+     * 施工单位统一信用代码
+     */
+	@TableField("install_unit_credit_code")
+    private String installUnitCreditCode;
+
+    /**
+     * 施工单位名称
+     */
+	@TableField("install_unit_name")
+    private String installUnitName;
+
+    /**
+     * 设备数量
+     */
+	@TableField("equip_num")
+    private Integer equipNum;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 下步执行角色/人id
+     */
+	@TableField("next_executor_ids")
+    private String nextExecutorIds;
+
+    /**
+     * 流程执行顺序标识
+     */
+	@TableField("execute_sequence")
+    private String executeSequence;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 创建人id 
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建人
+     */
+	@TableField("create_user_name")
+    private String createUserName;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 流程状态
+     */
+	@TableField("instance_status")
+    private String instanceStatus;
+
+    /**
+     * 受理完成日期
+     */
+	@TableField("accept_date")
+    private Date acceptDate;
+
+    /**
+     * 任务发起人id
+     */
+	@TableField("executor_user_id")
+    private String executorUserId;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgEquipTransferEq.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_equip_transfer_eq")
+public class JgEquipTransferEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备移交申请id
+     */
+	@TableField("equip_transfer_id")
+    private String equipTransferId;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+}

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

@@ -101,6 +101,19 @@ public class JgMaintenanceContract extends BaseEntity {
     private Date informEnd;
 
     /**
+     * 管理员id
+     */
+    @TableField("maintenance_manager_id")
+    private String maintenanceManagerId;
+
+    /**
+     * 管理员id
+     */
+    @TableField("maintenance_manager_name")
+    private String maintenanceManagerName;
+
+
+    /**
      * 维保负责人一id
      */
 	@TableField("maintenance_manager_one_id")
@@ -126,12 +139,6 @@ public class JgMaintenanceContract extends BaseEntity {
     private String maintenance24Tel;
 
     /**
-     * 办理流程
-     */
-	@TableField("apply_flow")
-    private String applyFlow;
-
-    /**
      * 备注
      */
 	@TableField("remark")
@@ -180,4 +187,19 @@ public class JgMaintenanceContract extends BaseEntity {
 	@TableField("create_date")
     private Date createDate;
 
+    @TableField("instance_status")
+    private String instanceStatus;
+
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+    @TableField("promoter")
+    private String promoter;
+
+    /**
+     * 状态
+     */
+    @TableField("status")
+    private String status;
+
 }

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

+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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_scrap_cancel")
+public class JgScrapCancel extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 注销类型（1报废注销，2移装注销）
+     */
+	@TableField("type")
+    private String type;
+
+    /**
+     * 申请编号
+     */
+	@TableField("apply_no")
+    private String applyNo;
+
+    /**
+     * 流程实例id
+     */
+	@TableField("instance_id")
+    private String instanceId;
+
+    /**
+     * 办理状态
+     */
+	@TableField("audit_status")
+    private String auditStatus;
+
+    /**
+     * 状态
+     */
+	@TableField("status")
+    private String status;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+	@TableField("create_user_id")
+    private String createUserId;
+
+    /**
+     * 创建时间
+     */
+	@TableField("create_date")
+    private Date createDate;
+
+    /**
+     * 流程状态
+     */
+	@TableField("instance_status")
+    private String instanceStatus;
+
+    /**
+     * 下一执行节点ids
+     */
+	@TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+    /**
+     * 接收机构代码
+     */
+	@TableField("receive_org_code")
+    private String receiveOrgCode;
+
+    /**
+     * 接收机构
+     */
+	@TableField("receive_org_name")
+    private String receiveOrgName;
+
+    /**
+     * 接收机构公司代码
+     */
+	@TableField("receive_company_code")
+    private String receiveCompanyCode;
+
+    /**
+     * 注销证明
+     */
+	@TableField("cancel_certificate")
+    private String cancelCertificate;
+
+    /**
+     * 终审通过时间
+     */
+	@TableField("audit_pass_date")
+    private Date auditPassDate;
+
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgScrapCancelEq.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-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("tzs_jg_scrap_cancel_eq")
+public class JgScrapCancelEq extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备移交申请id
+     */
+	@TableField("equip_transfer_id")
+    private String equipTransferId;
+
+    /**
+     * 设备id
+     */
+	@TableField("equ_id")
+    private String equId;
+
+}

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

@@ -8,7 +8,8 @@ import io.swagger.models.auth.In;
 public enum MaintenanceEnum {
     SHIYONG(0,"使用单位"),
     WEIBAO(1,"维保单位"),
-    JIANGUAN(2,"监管单位");
+    JIANGUAN(2,"监管单位"),
+    OVER(3,"维保结束");
 
     private Integer code;
     private String msg;

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

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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgChangeRegistrationReformMapper.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.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
+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-20
+ */
+public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeRegistrationReform> {
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgUseRegistrationDto dto , @Param("roleIds") List<String> roleIds);
+
+    Map<String, Object> getDetail(@Param("id")String id);
+
+    Map<String, Object> getInspectDetail(@Param("id")String id);
+
+    Map<String, Object> getUseDetail(@Param("id")String id);
+
+    Page<Map<String, Object>> getEquipListPage(@Param("page")Page<Map<String, Object>> page,@Param("factoryNum") String factoryNum,@Param("equList")String equList,@Param("equCategory")String equCategory);
+
+    void updatePromoter(@Param("id")Long id);
+}

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

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

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 移装变更登记登记 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface JgChangeRegistrationTransferMapper extends BaseMapper<JgChangeRegistrationTransfer> {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 设备移交关系表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface JgEquipTransferEqMapper extends BaseMapper<JgEquipTransferEq> {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 设备移交 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface JgEquipTransferMapper extends BaseMapper<JgEquipTransfer> {
+
+}

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  *  Mapper 接口
@@ -10,4 +13,6 @@ import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
  */
 public interface JgMaintenanceContractEqMapper extends CustomBaseMapper<JgMaintenanceContractEq> {
 
+    Boolean deleteForBatch(@Param("ids") List<Long> ids);
+
 }

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

@@ -24,4 +24,6 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
 
     Boolean deleteForBatch(@Param("ids") List<Long> ids);
 
+    void updatePromoter(@Param("id")Long id);
+
 }

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 注销报废设备关系表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface JgScrapCancelEqMapper extends BaseMapper<JgScrapCancelEq> {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 设备注销报废 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> {
+
+}

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

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

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 改造变更登记接口类
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface IJgChangeRegistrationReformService {
+
+}

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

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

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 移装变更登记登记接口类
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface IJgChangeRegistrationTransferService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 设备移交关系表接口类
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface IJgEquipTransferEqService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 设备移交接口类
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface IJgEquipTransferService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 注销报废设备关系表接口类
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface IJgScrapCancelEqService {
+
+}

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

+package com.yeejoin.amos.boot.module.jg.api.service;
+
+
+/**
+ * 设备注销报废接口类
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+public interface IJgScrapCancelService {
+
+}

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

 package com.yeejoin.amos.boot.module.jg.api.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -20,6 +22,9 @@ public class JgMaintenanceContractVo {
     @TableField("维保单位-驳回-是否可操作")
     private Boolean rejectedIsFlag;
 
+    @TableField("使用:0,维保:1,监管:2")
+    private String phase;
+
     @TableField("维保备案编号")
     private String applyNo;
 
@@ -83,9 +88,6 @@ public class JgMaintenanceContractVo {
     @TableField("24小时维保电话")
     private String maintenance24Tel;
 
-    @TableField("办理流程")
-    private String applyFlow;
-
     @TableField("备注")
     private String remark;
 
@@ -110,4 +112,37 @@ public class JgMaintenanceContractVo {
 
     @TableField("创建时间")
     private Date createDate;
+
+    @TableField("管理员id")
+    private String maintenanceManagerId;
+
+    @ApiModelProperty(value = "管理员姓名")
+    private String maintenanceManagerName;
+
+    @ApiModelProperty(value = "主键ID")
+    protected Long sequenceNbr;
+
+    @ApiModelProperty(value = "更新时间")
+    protected Date recDate;
+
+    @ApiModelProperty(value = "更新人id")
+    protected String recUserId;
+
+    @ApiModelProperty(value = "更新人")
+    protected String recUserName;
+
+    @ApiModelProperty(value = "是否删除")
+    private Boolean isDelete=false;
+
+    @ApiModelProperty("instance_status")
+    private String instanceStatus;
+
+    @ApiModelProperty("next_execute_ids")
+    private String nextExecuteIds;
+
+    @ApiModelProperty("promoter")
+    private String promoter;
+
+    @ApiModelProperty("status")
+    private String status;
 }

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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationReformMapper.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.JgChangeRegistrationReformMapper">
+    <update id="updatePromoter">
+        UPDATE tzs_jg_change_registration_reform set promoter = null
+        where sequence_nbr = #{id}
+    </update>
+
+
+    <select id="getListPage" resultType="java.util.Map">
+        select ur.sequence_nbr as sequenceNbr,
+        ur.audit_status as auditStatus,
+        ur.reg_date as regDate,
+        ur.use_unit_name as useUnitName,
+        ur.status,
+        ur.receive_org_name as receiveOrgName,
+        (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
+        jri.PRODUCT_NAME as productName,
+        jri.EQU_CODE as equCode,
+        use.USE_INNER_CODE as innerCode,
+        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
+        ur.instance_id as instanceId,
+        re.equ_id as equipId,
+        ur.apply_no as applyNo,
+        ifnull(ur.next_execute_ids,'') as nextExecuteIds,
+        ur.promoter
+        from tzs_jg_change_registration_reform ur
+        LEFT JOIN tzs_jg_change_registration_reform_eq re  on ur.sequence_nbr = re.equip_transfer_id
+        LEFT JOIN idx_biz_jg_register_info jri  on re.equ_id = jri.RECORD
+        LEFT JOIN idx_biz_jg_use_info  use   on re.equ_id = use.RECORD
+
+        <where>
+            and  ur.is_delete = 0
+            <if test="dto.equCategory != null and dto.equCategory != ''">
+                and jri.EQU_CATEGORY = #{dto.equCategory}
+            </if>
+            <if test="dto.auditStatus != null and dto.auditStatus != ''">
+                and ur.audit_status = #{dto.auditStatus}
+            </if>
+            <if test="dto.equCode != null and dto.equCode != ''">
+                and jri.EQU_CODE like concat('%',#{dto.equCode},'%')
+            </if>
+            <if test="dto.useUnitName != null and dto.useUnitName != ''">
+                and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
+            </if>
+            <if test="roleIds != null and dto.dataType == 'jg'">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
+            <if test="dto.dataType == 'jg' ">
+                and  ur.receive_company_code = #{dto.unitCode}
+            </if>
+            <if test="dto.dataType == 'company' ">
+                and  ur.use_unit_credit_code = #{dto.unitCode}
+            </if>
+        </where>
+        order by ur.rec_date desc
+    </select>
+    <select id="getDetail" resultType="java.util.Map">
+        SELECT jri.EQU_CODE                                                           as equCode,
+        --                      (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+        --                      (SELECT name from tz_equipment_category where code = jri.EQU_LIST)     as equList,
+        --                      (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)   as equDefine,
+        jri.EQU_CATEGORY  as equCategory,
+        jri.EQU_LIST as equList,
+        jri.EQU_DEFINE as equDefine,
+        jri.PRODUCT_NAME                                                       as productName,
+        jri.EQU_TYPE                                                           as equType,
+        jri.PRODUCT_PHOTO                                                      as proDuctPhoto,
+        jfi.FACTORY_NUM                                                        as factoryNum,
+        jfi.PRODUCE_UNIT_NAME                                                  as produceUnitName,
+        jfi.PRODUCE_DATE                                                       as produceDate,
+        jfi.FACTORY_STANDARD                                                   as factoryStandard,
+        jfi.PRODUCT_QUALITY_YIELD_PROVE                                        as productQualityYieldProve,
+        jfi.INS_USE_MAINTAIN_EXPLAIN                                           as insUseMaintainExplanin,
+        jci.USC_UNIT_NAME                                                      as uscUnitName,
+        jci.USC_UNIT_CREDIT_CODE                                               as uscUnitCreditCode
+
+        from idx_biz_jg_register_info jri
+        LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
+        LEFT JOIN idx_biz_jg_construction_info jci on jri.RECORD = jci.RECORD
+        where jri.RECORD = #{id}
+
+
+
+    </select>
+    <select id="getInspectDetail" resultType="java.util.Map">
+        SELECT INSPECT_TYPE       as inspectType,
+        INSPECT_STAFF      as inspctStaff,
+        INSPECT_CONCLUSION as inspectConclusion,
+        INSPECT_ORG_NAME   as inspectOrgName,
+        INSPECT_DATE       as inspectDate,
+        NEXT_INSPECT_DATE  as nextInspectDate,
+        INSPECT_REPORT     as inspectReport
+        from idx_biz_jg_inspection_detection_info
+        where RECORD = #{id}
+        ORDER BY INSPECT_DATE desc LIMIT 1
+    </select>
+    <select id="getUseDetail" resultType="java.util.Map">
+        SELECT USE_UNIT_NAME as useUnitName,
+        USE_UNIT_CREDIT_CODE as useUnitCreditCode,
+        USE_PLACE as usePlace,
+        SAFETY_MANAGER as safetyManager,
+        PHONE as phone,
+        ESTATE_UNIT_NAME as estateUnitName,
+        ESTATE_UNIT_CREDIT_CODE as estateUnitCreditCode,
+        ADDRESS as address,
+        PROVINCE as province,
+        CITY as city,
+        COUNTY as county,
+        USE_INNER_CODE as useInnerCode
+        FROM "idx_biz_jg_use_info"  where RECORD = #{id}
+    </select>
+    <select id="getEquipListPage" resultType="java.util.Map">
+        SELECT jri.EQU_CODE as equCode,
+        jri.RECORD  as id,
+        (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+        (SELECT name from tz_equipment_category where code = jri.EQU_LIST) as equList,
+        jfi.FACTORY_NUM as factoryNum,
+        jui.ADDRESS as address,
+        jui.USE_INNER_CODE as useInnerCode,
+        jfi.PRODUCE_UNIT_NAME as produceUnitName
+        from idx_biz_jg_register_info jri
+        LEFT JOIN idx_biz_jg_factory_info jfi on jri.RECORD = jfi.RECORD
+        LEFT JOIN idx_biz_jg_use_info jui on jri.RECORD = jui.RECORD
+        <where>
+            <if test="factoryNum != null and factoryNum != ''">
+                and jfi.FACTORY_NUM like concat('%',#{factoryNum},'%')
+            </if>
+            <if test="equList != null and equList != ''">
+                and jri.EQU_LIST like concat('%',#{equList},'%')
+            </if>
+            <if test="equCategory != null and equCategory != ''">
+                and jri.EQU_CATEGORY like concat('%',#{equCategory},'%')
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

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

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

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

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

@@ -2,4 +2,12 @@
 <!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.JgMaintenanceContractEqMapper">
 
+    <delete id="deleteForBatch">
+        UPDATE amos_tzs_biz.tzs_jg_maintenance_contract_eq tjmce
+        set tjmce.is_delete = 1
+        WHERE tjmce.sequence_nbr in
+        <foreach collection="ids" separator="," item="id" open="(" close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

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

@@ -40,6 +40,9 @@
             <if test="dto.informEnd != null">
                 inform_end = #{dto.informEnd},
             </if>
+            <if test="dto.maintenanceManagerId != null">
+                maintenance_manager_id = #{dto.maintenanceManagerId},
+            </if>
             <if test="dto.maintenanceManagerOneId != null">
                 maintenance_manager_one_id = #{dto.maintenanceManagerOneId},
             </if>
@@ -52,9 +55,6 @@
             <if test="dto.maintenance24Tel != null">
                 maintenance_24_tel = #{dto.maintenance24Tel},
             </if>
-            <if test="dto.applyFlow != null">
-                apply_flow = #{dto.applyFlow},
-            </if>
             <if test="dto.remark != null">
                 remark = #{dto.remark},
             </if>
@@ -79,12 +79,19 @@
             <if test="dto.instanceId != null">
                 instance_id = #{dto.instanceId},
             </if>
-
+            <if test="dto.promoter != null">
+                promoter = #{dto.promoter}
+            </if>
         </set>
         WHERE sequence_nbr = #{dto.sequenceNbr}
     </update>
+    <update id="updatePromoter">
+        UPDATE amos_tzs_biz.tzs_jg_maintenance_contract set promoter = null
+        where sequence_nbr = #{id}
+    </update>
     <delete id="deleteForBatch">
-        delete from amos_tzs_biz.tzs_jg_maintenance_contract tjmc
+        UPDATE amos_tzs_biz.tzs_jg_maintenance_contract tjmc
+        set tjmc.is_delete = 1
         WHERE tjmc.sequence_nbr in
         <foreach collection="ids" separator="," item="id" open="(" close=")">
             #{id}
@@ -110,7 +117,6 @@
         maintenance_manager_two_id,
         emergency_call,
         maintenance_24_tel,
-        apply_flow,
         remark,
         is_delete,
         input_unit_no,
@@ -126,6 +132,7 @@
         FROM
         amos_tzs_biz.tzs_jg_maintenance_contract
         <where>
+            is_delete = 0
             <if test="contractDto.applyNo != '' and contractDto.applyNo != null">
                 and apply_no like concat('%',#{contractDto.applyNo},'%')
             </if>
@@ -138,9 +145,6 @@
             <if test="contractDto.applyStatus != '' and contractDto.applyStatus != null">
                 and apply_status like concat('%',#{contractDto.applyStatus},'%')
             </if>
-            <if test="contractDto.applyFlow != '' and contractDto.applyFlow != null">
-                and apply_flow like concat('%',#{contractDto.applyFlow},'%')
-            </if>
             <if test="contractDto.useUnitCode != '' and contractDto.useUnitCode != null">
                 and use_unit_code = #{contractDto.useUnitCode}
             </if>
@@ -150,6 +154,11 @@
             <if test="contractDto.receiveOrgCode != '' and contractDto.receiveOrgCode != null">
                 and receive_org_code = #{contractDto.receiveOrgCode}
             </if>
+            <if test="contractDto.roleIds != null">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    instance_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="queryBySequenceNbr"

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

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

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

@@ -22,7 +22,7 @@
         ur.instance_id as instanceId,
         re.equ_id as equipId,
         ur.apply_no as applyNo,
-        ur.next_execute_ids as nextExecuteIds,
+       ifnull(ur.next_execute_ids,'') as nextExecuteIds,
         ur.promoter
         from tzs_jg_use_registration ur
         LEFT JOIN tzs_jg_use_registration_eq re  on ur.sequence_nbr = re.equip_transfer_id
@@ -43,7 +43,7 @@
             <if test="dto.useUnitName != null and dto.useUnitName != ''">
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
-            <if test="roleIds != null">
+            <if test="roleIds != null and dto.dataType == 'jg'">
                 <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
                     instance_status like concat('%',#{role},'%')
                 </foreach>

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -117,7 +119,8 @@ public class CommonController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getEnterpriseEmployee")
 	@ApiOperation(httpMethod = "GET", value = "查询企业的下面的人员", notes = "查询企业的下面的人员")
-	public ResponseModel<List<Map<String,Object>>> getEnterpriseEmployee(@RequestParam(value = "unitCode") String unitCode) {
-		return ResponseHelper.buildResponse(commonService.getEnterpriseEmployee(unitCode));
+	public ResponseModel<List<Map<String,Object>>> getEnterpriseEmployee(@RequestParam String unitCode) {
+		String companyCode = unitCode.split("_")[0];
+		return ResponseHelper.buildResponse(commonService.getEnterpriseEmployee(companyCode));
 	}
 }

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

+package com.yeejoin.amos.boot.module.jg.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationReformServiceImpl;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 改造变更登记
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+@RestController
+@Api(tags = "改造变更登记Api")
+@RequestMapping(value = "/jg-change-registration-reform")
+public class JgChangeRegistrationReformController extends BaseController {
+
+    @Autowired
+    JgChangeRegistrationReformServiceImpl jgChangeRegistrationReformServiceImpl;
+
+    /**
+     * 新增改造变更登记
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/save")
+	@ApiOperation(httpMethod = "POST", value = "新增改造变更登记", notes = "新增改造变更登记")
+	public ResponseModel<Object> save(@RequestBody JSONObject map) {
+		jgChangeRegistrationReformServiceImpl.save(map);
+	    return ResponseHelper.buildResponse("ok");
+	}
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/flowExecute")
+	@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+	public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+		jgChangeRegistrationReformServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+		return ResponseHelper.buildResponse("ok");
+	}
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/withdraw")
+	@ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+	public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
+		jgChangeRegistrationReformServiceImpl.withdraw(String.valueOf(map.get("instanceId")));
+		return ResponseHelper.buildResponse("ok");
+	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/deleteBatch")
+	@ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+	public ResponseModel<Object> deleteBatch(@RequestBody JSONObject map) {
+		List<Long> ids = (List<Long>) map.get("ids");
+		jgChangeRegistrationReformServiceImpl.deleteBatch(ids);
+		return ResponseHelper.buildResponse("ok");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/deleteMessage")
+	@ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+	public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
+		ArrayList<Long> ids = new ArrayList<>();
+		ids.add(id);
+		jgChangeRegistrationReformServiceImpl.deleteBatch(ids);
+		return ResponseHelper.buildResponse("ok");
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@GetMapping(value = "/getList")
+	public ResponseModel<Page<Map<String, Object>>> getList(JgUseRegistrationDto dto,
+															@RequestParam(value = "current") int current,
+															@RequestParam(value = "size") int size) {
+		Page<Map<String, Object>> page = new Page<>(current, size);
+		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getList(dto, page,  dto.getRoleIds()));
+	}
+
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@GetMapping(value = "/getEquipList")
+	public ResponseModel<Page<Map<String, Object>>> getEquipList(
+			@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size,
+			@RequestParam(value = "factoryNum", required = false) String factoryNum,
+			@RequestParam(value = "equList", required = false) String equList,
+			@RequestParam(value = "equCategory", required = false) String equCategory) {
+		Page<Map<String, Object>> page = new Page<>(current, size);
+		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getEquipList(page, factoryNum, equList, equCategory));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@GetMapping(value = "/getDetail")
+	public ResponseModel<Map<String, Object>> getDetail(@RequestParam("id") String id) {
+		return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getDetail(id));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@GetMapping(value = "/getMessage")
+	public ResponseModel<Map<String, Object>> getMessage() {
+		ReginParams selectedOrgInfo = getSelectedOrgInfo();
+		HashMap<String, Object> map = new HashMap<>();
+		map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
+		map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+		return ResponseHelper.buildResponse(map);
+	}
+}

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

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

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

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

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

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -16,8 +18,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 维保合同备案
@@ -55,9 +56,11 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/updateMaintenanceAndEquipment")
     @ApiOperation(httpMethod = "POST", value = "更新维保合同和设备对应关系", notes = "更新维保合同和设备对应关系")
-    public ResponseModel<Object> updateMaintenanceAndEquipment(@RequestBody JgMaintenanceContractDto model,
-                                        List<Integer> equipmentLists) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateMaintenanceAndEquipment(model, equipmentLists));
+    public ResponseModel<Object> updateMaintenanceAndEquipment(@RequestBody Map<String , Object> model,
+                                                               @RequestParam(value = "submit",required = false,defaultValue = "0") String submit) {
+        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model), JgMaintenanceContractDto.class);
+        List<Map<String, Object>> list = (List<Map<String, Object>>) model.get("equipmentLists");
+        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.updateMaintenanceAndEquipment(submit,dto,list));
     }
 
     /**
@@ -68,43 +71,40 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/submit")
     @ApiOperation(httpMethod = "POST", value = "维保合同提交", notes = "维保合同提交")
-    public ResponseModel<Object> submit(@RequestBody JgMaintenanceContractDto model) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.submit(model));
+    public ResponseModel<Object> submit(@RequestBody Map<String , Object> model) {
+        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model), JgMaintenanceContractDto.class);
+        String comment = String.valueOf(model.get("comment"));
+        String operate = String.valueOf(model.get("operate"));
+        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.submit(dto,comment,operate));
     }
 
     /**
-     * 撤回
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/revocation")
-    @ApiOperation(httpMethod = "POST", value = "维保合同撤回", notes = "维保合同撤回")
-    public ResponseModel<Object> revocation(@RequestBody JgMaintenanceContractDto model) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.revocation(model));
-    }
-    /**
-     * 维保合同驳回
+     * 审批
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/rejected")
-    @ApiOperation(httpMethod = "POST", value = "维保合同驳回", notes = "维保合同驳回")
-    public ResponseModel<Object> rejected(@RequestBody JgMaintenanceContractDto model) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.rejected(model));
+    @PostMapping(value = "/approval")
+    @ApiOperation(httpMethod = "POST", value = "审批", notes = "审批")
+    public ResponseModel<Object> approval(@RequestBody Map<String , Object> model) {
+        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(model.get("formData")), JgMaintenanceContractDto.class);
+        String comment = String.valueOf(model.get("comment"));
+        String operate = String.valueOf(model.get("operate"));
+        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.approval(dto,comment,operate));
     }
 
+
     /**
-     * 维保合同受理
+     * 撤回
      *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @PostMapping(value = "/accepted")
-    @ApiOperation(httpMethod = "POST", value = "维保合同受理", notes = "维保合同受理")
-    public ResponseModel<Object> accepted(@RequestBody JgMaintenanceContractDto model) {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.accepted(model));
+    @PostMapping(value = "/revocation")
+    @ApiOperation(httpMethod = "POST", value = "维保合同撤回", notes = "维保合同撤回")
+    public ResponseModel<Object> revocation(@RequestBody JSONObject map) {
+        jgMaintenanceContractServiceImpl.revocation(String.valueOf(map.get("instanceId")));
+        return ResponseHelper.buildResponse("ok");
     }
 
     /**
@@ -163,6 +163,14 @@ public class JgMaintenanceContractController extends BaseController {
         return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryBySequenceNbr(sequenceNbr));
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/flowExecute")
+    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+        jgMaintenanceContractServiceImpl.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+        return ResponseHelper.buildResponse("ok");
+    }
+
     /**
      * 列表分页查询
      *
@@ -185,16 +193,4 @@ public class JgMaintenanceContractController extends BaseController {
         return ResponseHelper.buildResponse(contractDtoPage);
     }
 
-    /**
-     * 列表全部数据查询
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询维保合同备案", notes = "列表全部数据查询维保合同备案")
-    @GetMapping(value = "/list")
-    public ResponseModel<List<JgMaintenanceContractDto>> selectForList() {
-        return ResponseHelper.buildResponse(jgMaintenanceContractServiceImpl.queryForJgMaintenanceContractList());
-    }
-
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractEqDto;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -13,7 +14,6 @@ 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.JgMaintenanceContractEqDto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 

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

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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/TzsServiceFeignClient.java

@@ -24,4 +24,13 @@ public interface TzsServiceFeignClient {
     @RequestMapping(value = "/equipment-category/createSupervisorCode", method = RequestMethod.POST)
     ResponseModel<Map<String, Object>> createCode(@RequestBody Map<String, Object> map);
 
+    /**
+     * 创建监管码及96333
+     *
+     * @param paramMap 请求体
+     * @return
+     */
+    @RequestMapping(value = "/equipment-category/commonUpdateEsData", method = RequestMethod.POST)
+    ResponseModel<Map<String, Object>> commonUpdateEsDataByIds(@RequestBody Map<String, Map<String, Object>> paramMap);
+
 }

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

@@ -163,7 +163,7 @@ public class CommonServiceImpl implements ICommonService {
         if (type.equals("use")) {
             type = "使用单位";
         } else if (type.equals("maintenance")) {
-            type = "维保单位";
+            type = "安装改造维修单位";
         } else if (type.equals("inspection")) {
             type = "检验检测机构";
         }
@@ -190,7 +190,7 @@ public class CommonServiceImpl implements ICommonService {
 
     @Override
     public Map<String, Object> getUserInfo(String sequenceNbr) {
-        return commonMapper.getUserInfo(sequenceNbr);
+        return commonMapper.getUserInfo(sequenceNbr.split("_")[0]);
     }
 
     @Override

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReformEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformEqService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformEqDto;
+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-20
+ */
+@Service
+public class JgChangeRegistrationReformEqServiceImpl extends BaseService<JgChangeRegistrationReformEqDto,JgChangeRegistrationReformEq,JgChangeRegistrationReformEqMapper> implements IJgChangeRegistrationReformEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgChangeRegistrationReformEqDto> queryForJgChangeRegistrationReformEqPage(Page<JgChangeRegistrationReformEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgChangeRegistrationReformEqDto> queryForJgChangeRegistrationReformEqList()   {
+        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

+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;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+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.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationEq;
+import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
+import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
+import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
+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.mapper.InspectionDetectionInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
+import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
+import com.yeejoin.amos.feign.workflow.model.AjaxResult;
+import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 改造变更登记服务实现类
+ *
+ * @author system_generator
+ * @date 2023-12-20
+ */
+@Service
+public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeRegistrationReformDto,JgChangeRegistrationReform,JgChangeRegistrationReformMapper> implements IJgChangeRegistrationReformService {
+    @Autowired
+    private UseInfoMapper useInfoMapper;
+    @Autowired
+    private InspectionDetectionInfoMapper inspectionDetectionInfoMapper;
+    @Autowired
+    private OtherInfoMapper otherInfoMapper;
+    @Autowired
+    private JgChangeRegistrationReformMapper jgChangeRegistrationReformMapper;
+    @Autowired
+    WorkFlowFeignService workFlowFeginService;
+    @Autowired
+    private ICreateCodeService iCreateCodeService;
+    @Autowired
+    RedisUtils redisUtils;
+
+    /**
+     * 分页查询
+     */
+    public Page<Map<String, Object>> getList(JgUseRegistrationDto dto, Page<Map<String, Object>> page , List<String> roleIds) {
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
+        return listPage;
+    }
+
+    public Page<Map<String, Object>> getEquipList(Page<Map<String, Object>> page, String factoryNum, String equList, String equCategory) {
+        return this.baseMapper.getEquipListPage(page, factoryNum, equList, equCategory);
+    }
+    @Transactional
+    public void save(JSONObject map) {
+        UseInfo useInfo = new UseInfo();
+        BeanUtil.copyProperties(map, useInfo);
+        LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
+        lambda.eq(UseInfo::getRecord, map.get("equipId"));
+        // 更新使用信息
+        useInfoMapper.update(useInfo, lambda);
+        InspectionDetectionInfo inspectionDetectionInfo = new InspectionDetectionInfo();
+        BeanUtil.copyProperties(map, inspectionDetectionInfo);
+        LambdaQueryWrapper<InspectionDetectionInfo> inspectionLambda = new QueryWrapper<InspectionDetectionInfo>().lambda();
+        inspectionLambda.eq(InspectionDetectionInfo::getRecord, map.get("equipId"));
+        // 更新检验检测信息
+        inspectionDetectionInfoMapper.update(inspectionDetectionInfo, inspectionLambda);
+        // 使用登记信息
+        JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
+        LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
+        otherLambda.eq(OtherInfo::getRecord, map.get("equipId"));
+        OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
+        String supervisoryCode = otherInfo.getSupervisoryCode();
+        jgChangeRegistrationReform.setSupervisoryCode(supervisoryCode);
+        jgChangeRegistrationReform.setUseUnitName(useInfo.getUseUnitName());
+        jgChangeRegistrationReform.setUseUnitCreditCode(useInfo.getUseUnitCreditCode());
+        jgChangeRegistrationReform.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
+        jgChangeRegistrationReform.setInspectUnitName(map.get("inspectOrgName").toString());
+
+
+        if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
+            jgChangeRegistrationReform.setUseUnitCreditCode(null);
+            jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
+            this.getBaseMapper().updateById(jgChangeRegistrationReform);
+        } else {
+
+            // 业务管理设备信息保存
+            JgUseRegistrationEq jgRelationEquip = new JgUseRegistrationEq();
+            jgRelationEquip.setEquId(map.get("equipId").toString());
+//            jgRelationEquip.setBusinessType(String.valueOf(BusinessTypeEnum.USAGE_REGISTRATION.getCode()));
+            List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
+            jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
+            jgChangeRegistrationReform.setAuditStatus("待提交");
+            jgChangeRegistrationReform.setStatus(UseStatusEnum.SUBMIT.getPass());
+            this.save(jgChangeRegistrationReform);
+            jgRelationEquip.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
+            jgChangeRegistrationReformMapper.insert(jgChangeRegistrationReform);
+        }
+
+        if (!ObjectUtils.isEmpty(map.get("submit"))) {
+            String instanceId = "";
+            if (map.containsKey("instanceId")) {
+                instanceId = map.get("instanceId").toString();
+            } else {
+                // 启动并执行流程
+                instanceId = startByVariable();
+                jgChangeRegistrationReform.setInstanceStatus("1460532889249755137");
+                jgChangeRegistrationReform.setUseUnitCreditCode("91610131628001738N");
+                jgChangeRegistrationReform.setReceiveCompanyCode("610000");
+            }
+
+            if (!ObjectUtils.isEmpty(instanceId)) {
+                // 执行流程
+                String status = flowExecute(jgChangeRegistrationReform.getSequenceNbr(), instanceId, "0", "", true);
+                jgChangeRegistrationReform.setAuditStatus("已提交");
+                jgChangeRegistrationReform.setStatus(UseStatusEnum.RECEIVE.getPass());
+            }
+            jgChangeRegistrationReform.setInstanceId(instanceId);
+
+            this.getBaseMapper().updateById(jgChangeRegistrationReform);
+        }
+    }
+
+    public String startByVariable() {
+        String instanceId = "";
+        //启动流程
+        try {
+            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            dto.setProcessDefinitionKey("useRegistration");
+            dto.setBusinessKey("submit");
+            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
+            instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return instanceId;
+    }
+
+    public String flowExecute(Long id, String instanceId, String operate, String comment, Boolean update) {
+        String role = "";
+        String taskName = "流程结束";
+        ArrayList<String> roleList = new ArrayList<>();
+        try {
+            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
+            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
+            String taskId = taskMessage.getString("id");
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+            dto.setResultCode("approvalStatus");
+            dto.setTaskId(taskId);
+            dto.setComment(comment);
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("approvalStatus", operate);
+            dto.setVariable(map);
+            //执行流程
+            Workflow.taskClient.completeByTask(taskId, dto);
+            // 查询下节点任务
+            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
+                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
+                String nextTaskId = nextTask.getString("id");
+                taskName = nextTask.getString("name");
+                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+                for (Object datum : data) {
+                    if (((Map) datum).containsKey("groupId")) {
+                        roleList.add(((Map) datum).get("groupId").toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        role = String.join(",", roleList);
+        if (update) {
+            Boolean rollBack = "1".equals(operate) ? true : false;
+            updateStatus(id, instanceId, taskName, role, rollBack);
+        }
+        return role;
+    }
+
+    public void updateStatus(Long id, String instanceId, String taskName, String role, Boolean rollBack) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        LambdaQueryWrapper<JgChangeRegistrationReform> lambda = new QueryWrapper<JgChangeRegistrationReform>().lambda();
+        lambda.eq(JgChangeRegistrationReform::getSequenceNbr, id);
+        JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(lambda);
+        if ("流程结束".equals(taskName)) {
+            jgChangeRegistrationReform.setStatus(taskName);
+            jgChangeRegistrationReform.setAuditStatus("已完成");
+        } else {
+            jgChangeRegistrationReform.setNextExecuteIds(role);
+            jgChangeRegistrationReform.setPromoter(reginParams.getUserModel().getUserId());
+            if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceStatus())) {
+                jgChangeRegistrationReform.setInstanceStatus(jgChangeRegistrationReform.getInstanceStatus() + "," + role);
+            } else {
+                jgChangeRegistrationReform.setInstanceStatus(role);
+            }
+            UseStatusEnum message = UseStatusEnum.getMessage(taskName);
+            jgChangeRegistrationReform.setStatus(message.getPass());
+        }
+        if (rollBack) {
+            this.getBaseMapper().update(jgChangeRegistrationReform, lambda);
+            this.getBaseMapper().updatePromoter(jgChangeRegistrationReform.getSequenceNbr());
+        } else {
+            this.getBaseMapper().update(jgChangeRegistrationReform, lambda);
+        }
+    }
+
+    public void withdraw(String instanceId) {
+        String taskName = "";
+        JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
+        LambdaQueryWrapper<JgChangeRegistrationReform> lambda = new QueryWrapper<JgChangeRegistrationReform>().lambda();
+        lambda.eq(JgChangeRegistrationReform::getInstanceId, instanceId);
+        ArrayList<String> roleList = new ArrayList<>();
+        try {
+            workFlowFeginService.rollBack(instanceId);
+            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+            JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
+            taskName = nextTask.getString("name");
+            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
+                String nextTaskId = nextTask.getString("id");
+                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+                for (Object datum : data) {
+                    if (((Map) datum).containsKey("groupId")) {
+                        roleList.add(((Map) datum).get("groupId").toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (!ObjectUtils.isEmpty(taskName)) {
+            UseStatusEnum message = UseStatusEnum.getMessage(taskName);
+            jgChangeRegistrationReform.setStatus(message.getPass());
+        }
+
+        String join = String.join(",", roleList);
+        JgChangeRegistrationReform jgChangeRegistrationReform1 = this.getBaseMapper().selectOne(lambda);
+        this.updateStatus(jgChangeRegistrationReform1.getSequenceNbr(), instanceId, taskName, join, true);
+    }
+
+    public void deleteBatch(List<Long> ids) {
+        JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
+        jgChangeRegistrationReform.setIsDelete(true);
+        LambdaQueryWrapper<JgChangeRegistrationReform> lambda = new QueryWrapper<JgChangeRegistrationReform>().lambda();
+        lambda.in(JgChangeRegistrationReform::getSequenceNbr, ids);
+        this.update(jgChangeRegistrationReform, lambda);
+    }
+    public Map<String, Object> getDetail(String id) {
+        Map<String, Object> detail = this.baseMapper.getDetail(id);
+        Map<String, Object> inspectDetail = this.baseMapper.getInspectDetail(id);
+        Map<String, Object> useDetail = this.baseMapper.getUseDetail(id);
+        detail.putAll(inspectDetail);
+        detail.putAll(useDetail);
+        detail.putAll(useDetail);
+        detail.put("proDuctPhoto", JSON.parse(String.valueOf(detail.get("proDuctPhoto"))));
+        detail.put("factoryStandard", JSON.parse(String.valueOf(detail.get("factoryStandard"))));
+        detail.put("productQualityYieldProve", JSON.parse(String.valueOf(detail.get("productQualityYieldProve"))));
+        detail.put("insUseMaintainExplanin", JSON.parse(String.valueOf(detail.get("insUseMaintainExplanin"))));
+        detail.put("inspectReport", JSON.parse(String.valueOf(detail.get("inspectReport"))));
+        return detail;
+    }
+}
\ 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/JgChangeRegistrationTransferEqServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransferEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationTransferEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferEqService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferEqDto;
+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-20
+ */
+@Service
+public class JgChangeRegistrationTransferEqServiceImpl extends BaseService<JgChangeRegistrationTransferEqDto,JgChangeRegistrationTransferEq,JgChangeRegistrationTransferEqMapper> implements IJgChangeRegistrationTransferEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgChangeRegistrationTransferEqDto> queryForJgChangeRegistrationTransferEqPage(Page<JgChangeRegistrationTransferEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgChangeRegistrationTransferEqDto> queryForJgChangeRegistrationTransferEqList()   {
+        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/JgChangeRegistrationTransferServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationTransfer;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationTransferMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationTransferDto;
+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-20
+ */
+@Service
+public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChangeRegistrationTransferDto,JgChangeRegistrationTransfer,JgChangeRegistrationTransferMapper> implements IJgChangeRegistrationTransferService {
+    /**
+     * 分页查询
+     */
+    public Page<JgChangeRegistrationTransferDto> queryForJgChangeRegistrationTransferPage(Page<JgChangeRegistrationTransferDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgChangeRegistrationTransferDto> queryForJgChangeRegistrationTransferList()   {
+        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/JgEquipTransferEqServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferEqService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferEqDto;
+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-20
+ */
+@Service
+public class JgEquipTransferEqServiceImpl extends BaseService<JgEquipTransferEqDto,JgEquipTransferEq,JgEquipTransferEqMapper> implements IJgEquipTransferEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgEquipTransferEqDto> queryForJgEquipTransferEqPage(Page<JgEquipTransferEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgEquipTransferEqDto> queryForJgEquipTransferEqList()   {
+        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/JgEquipTransferServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
+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-20
+ */
+@Service
+public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,JgEquipTransfer,JgEquipTransferMapper> implements IJgEquipTransferService {
+    /**
+     * 分页查询
+     */
+    public Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransferDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgEquipTransferDto> queryForJgEquipTransferList()   {
+        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/JgInstallationNoticeServiceImpl.java

@@ -240,7 +240,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     public Page<JgInstallationNoticeDto> queryForJgInstallationNoticePage(Page<JgInstallationNotice> page, JgInstallationNoticeDto model, String type , ReginParams reginParams) {
 
         String orgCode;
-        orgCode = reginParams.getCompany().getOrgCode();
+        orgCode = reginParams.getCompany().getCompanyCode();
 
         Page<JgInstallationNotice> noticePage = jgInstallationNoticeMapper.queryForPage(page, model, type, orgCode);
 
@@ -660,6 +660,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 tzsJgRegistrationInfo.setEquCode(deviceRegistrationCode);
                 jgInstallationNotice.setEquRegisterCode(deviceRegistrationCode);
                 jgInstallationNotice.setSupervisoryCode(mapCode.get("superviseCode").toString());
+                Map<String,Map<String,Object>> objMap = new HashMap<>();
+                Map<String,Object> map1 =new HashMap<>();
+                map1.put("CODE96333",tzsJgOtherInfo.getCode96333() );
+                map1.put("EQU_CODE",tzsJgRegistrationInfo.getEquCode() );
+                map1.put("SUPERVISORY_CODE",tzsJgOtherInfo.getSupervisoryCode());
+                objMap.put(tzsJgOtherInfo.getRecord(),map1);
+                tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
                 tzsJgOtherInfoMapper.updateById(tzsJgOtherInfo);
                 tzsJgRegistrationInfoMapper.updateById(tzsJgRegistrationInfo);
             } else {
@@ -669,6 +676,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             jgInstallationNoticeMapper.updateById(jgInstallationNotice);
         }
 
+
+
+
+
 //        // 组装监管码
 //        String division = "";
 //        if (((XIAN.equals(dto.getCity()) || XIAN_YANG.equals(dto.getCity())) && "1".equals(dto.getIsXixian()))) {

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractEqDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContractEq;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractEqService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractEqDto;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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 com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.MaintenanceEnum;
+import com.yeejoin.amos.boot.module.jg.api.enums.UseStatusEnum;
+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.JgMaintenanceContractVo;
@@ -30,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.util.*;
@@ -57,43 +65,36 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     @Autowired
     private JgMaintenanceContractMapper maintenanceContractMapper;
     @Autowired
+    private JgMaintenanceContractEqMapper maintenanceContractEqMapper;
+    @Autowired
     private JgMaintenanceContractEqServiceImpl jgMaintenanceContractEqService;
     @Autowired
     private DataDictionaryServiceImpl iDataDictionaryService;
-
-    /**
-     * 监管-根据字典type,code获取字典值
-     */
-    private DataDictionary getDict(String dictType, String dictCode) {
-        HashMap<String, String> dictMap = new HashMap<>();
-        LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>()
-                        .eq(DataDictionary::getType, dictType)
-                        .eq(DataDictionary::getCode, dictCode);
-        return iDataDictionaryService.getOne(queryWrapper);
-    }
+    @Autowired
+    RedisUtils redisUtils;
 
     /**
      * 分页查询
      */
     public Page<JgMaintenanceContractVo> queryForPage(Page<JgMaintenanceContract> page,
-                                                      int phase, JgMaintenanceContractDto dto, ReginParams reginParams) {
+                                                      int phase,
+                                                      JgMaintenanceContractDto dto,
+                                                      ReginParams reginParams) {
         Page<JgMaintenanceContractDto> contractList = new Page<>();
         Page<JgMaintenanceContractVo> result = new Page<>();
         CompanyBo company = reginParams.getCompany();
         if (MaintenanceEnum.SHIYONG.getCode().equals(phase)) {
             //使用单位用"使用单位统一信用代码"匹配数据
             dto.setUseUnitCode(company.getCompanyCode());
-            dto.setApplyFlow(MaintenanceEnum.SHIYONG.getMsg());
+            dto.setRoleIds(null);
             contractList = maintenanceContractMapper.getContractList(page, dto);
         } else if (MaintenanceEnum.WEIBAO.getCode().equals(phase)) {
             //维保单位用"维保单位统一信用代码"匹配数据
-            dto.setMaintenanceUnitCode(company.getCompanyCode());
-            dto.setApplyFlow(MaintenanceEnum.WEIBAO.getMsg());
+            dto.setMaintenanceUnitCode(company.getCompanyCode()+"_"+company.getCompanyName());
             contractList = maintenanceContractMapper.getContractList(page, dto);
         } else if (MaintenanceEnum.JIANGUAN.getCode().equals(phase)) {
             //监管单位用"接收机构统一使用代码"匹配
             dto.setReceiveOrgCode(company.getOrgCode());
-            dto.setApplyFlow(MaintenanceEnum.JIANGUAN.getMsg());
             contractList = maintenanceContractMapper.getContractList(page, dto);
         }
         BeanUtils.copyProperties(contractList, result);
@@ -108,6 +109,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         JgMaintenanceContractVo vo = new JgMaintenanceContractVo();
         BeanUtils.copyProperties(dto, vo);
         vo.setMaintenanceContract(ObjectUtils.isEmpty(dto.getMaintenanceContract()) ? null : JSON.parseArray(dto.getMaintenanceContract()));
+        vo.setMaintenanceManagerOneName(ObjectUtils.isEmpty(dto.getMaintenanceManagerOneId()) ? null : dto.getMaintenanceManagerOneId().split("_")[1]);
+        vo.setMaintenanceManagerTwoName(ObjectUtils.isEmpty(dto.getMaintenanceManagerTwoId()) ? null : dto.getMaintenanceManagerTwoId().split("_")[1]);
         return vo;
     }
 
@@ -121,28 +124,124 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         return maintenanceContractMapper.updateBySequenceNbr(dto);
     }
 
+    public String flowExecute(Long id,String instanceId, String operate, String comment, Boolean update) {
+        String role = "";
+        String taskName = "流程结束";
+        ArrayList<String> roleList = new ArrayList<>();
+        try {
+            JSONObject task = workFlowFeginService.getTaskNoAuth(instanceId);
+            JSONObject taskMessage = JSON.parseObject(JSON.toJSONString(task.get("data")));
+            String taskId = taskMessage.getString("id");
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+            dto.setResultCode("approvalStatus");
+            dto.setTaskId(taskId);
+            dto.setComment(comment);
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("approvalStatus", operate);
+            dto.setVariable(map);
+            //执行流程
+            Workflow.taskClient.completeByTask(taskId, dto);
+            // 查询下节点任务
+            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
+                JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
+                String nextTaskId = nextTask.getString("id");
+                taskName = nextTask.getString("name");
+                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+                for (Object datum : data) {
+                    if (((Map) datum).containsKey("groupId")) {
+                        roleList.add(((Map) datum).get("groupId").toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        role= String.join(",", roleList);
+        if (update) {
+            Boolean rollBack = "1".equals(operate) ? true : false;
+            updateStatus(id, taskName, role, rollBack);
+        }
+        return role;
+    }
+
+    public void updateStatus(Long id , String taskName, String role, Boolean rollBack) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
+        lambda.eq(JgMaintenanceContract::getSequenceNbr, id);
+        JgMaintenanceContract jgMaintenanceContract = this.getBaseMapper().selectOne(lambda);
+        if ("流程结束".equals(taskName)) {
+            jgMaintenanceContract.setStatus(taskName);
+            jgMaintenanceContract.setApplyStatus("已完成");
+        } else {
+            jgMaintenanceContract.setNextExecuteIds(role);
+            jgMaintenanceContract.setPromoter(reginParams.getUserModel().getUserId());
+            if (!ObjectUtils.isEmpty(jgMaintenanceContract.getInstanceStatus())) {
+                jgMaintenanceContract.setInstanceStatus(jgMaintenanceContract.getInstanceStatus() + "," + role);
+            } else {
+                jgMaintenanceContract.setInstanceStatus(role);
+            }
+            UseStatusEnum message = UseStatusEnum.getMessage(taskName);
+            jgMaintenanceContract.setStatus(message.getPass());
+        }
+        if (rollBack){
+            this.getBaseMapper().update(jgMaintenanceContract, lambda);
+            this.getBaseMapper().updatePromoter(jgMaintenanceContract.getSequenceNbr());
+        }else {
+            this.getBaseMapper().update(jgMaintenanceContract, lambda);
+        }
+    }
+
     /**
      * 批量删除
      */
+    @Transactional
     public Boolean deleteForBatch(Long[] ids) {
-        return maintenanceContractMapper.deleteForBatch(Arrays.asList(ids));
+        List<Long> list = Arrays.asList(ids);
+        list.forEach(x->{
+            QueryWrapper<JgMaintenanceContract> wrapper = new QueryWrapper<>();
+            wrapper.eq("sequence_nbr", x);
+            JgMaintenanceContract jgMaintenanceContract = maintenanceContractMapper.selectOne(wrapper);
+            LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>()
+                    .eq(JgMaintenanceContractEq::getEquipTransferId,jgMaintenanceContract.getApplyNo())
+                    .eq(JgMaintenanceContractEq::getIsDelete, false);
+            List<Long> listSeq = jgMaintenanceContractEqService.list(queryWrapper).stream()
+                    .map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
+            maintenanceContractEqMapper.deleteForBatch(listSeq);
+        });
+        maintenanceContractMapper.deleteForBatch(list);
+        return true;
+    }
+
+    public String startByVariable() {
+        String instanceId = "";
+        //启动流程
+        try {
+            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            dto.setProcessDefinitionKey("maintenanceContract");
+            dto.setBusinessKey("submit");
+            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
+            instanceId = ((Map<?, ?>) ajaxResult.get("data")).get("id").toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return instanceId;
     }
 
     /**
      * 维保合同提交
      */
     @Transactional
-    public Boolean submit(JgMaintenanceContractDto dto) {
+    public Boolean submit(JgMaintenanceContractDto dto,String comment,String operate) {
         String instanceId = "";
-        //启动流程
         try {
+            AjaxResult ajaxResult;
             ActWorkflowStartDTO flowDto = new ActWorkflowStartDTO();
             flowDto.setProcessDefinitionKey(WB_PROCESS_DEFINITION_KEY);
             flowDto.setBusinessKey("1");
-            HashMap<String, Object> dtoMap = new HashMap<>();
-            dtoMap.put("condition", "ces");
-            flowDto.setVariables(dtoMap);
-            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(flowDto);
+            ajaxResult = Workflow.taskClient.startByVariable(flowDto);
             instanceId = ((Map<?, ?>) ajaxResult.get("data")).get("id").toString();
             ajaxResult = Workflow.taskClient.getTask(instanceId);
             // 执行一步
@@ -152,65 +251,110 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             TaskResultDTO taskResultDTO = new TaskResultDTO();
             taskResultDTO.setResultCode("approvalStatus");
             taskResultDTO.setTaskId(taskId);
-            taskResultDTO.setComment("提交流程");
+            taskResultDTO.setComment(comment);
             HashMap<String, Object> map = new HashMap<>();
-            map.put("approvalStatus", "1");
+            map.put("approvalStatus", operate);
             taskResultDTO.setVariable(map);
             //执行流程
             Workflow.taskClient.completeByTask(taskId, taskResultDTO);
+            Workflow.taskClient.completeByTask(taskId, taskResultDTO);
         } catch (Exception e) {
             e.printStackTrace();
         }
 
-        String[] split = dto.getApplyFlow().split("-");
-        String lastFlowName = split[split.length - 1];
-        String applyFlow = dto.getApplyFlow() + "-" +
-                MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() + 1);
-        dto.setApplyFlow(applyFlow);
         dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
         dto.setInstanceId(instanceId);
+        dto.setReceiveOrgCode(null);
         return this.updateBySequenceNbr(dto);
     }
 
-    /**
-     * 维保合同撤回
-     */
     @Transactional
-    public Boolean revocation(JgMaintenanceContractDto dto) {
-        String[] split = dto.getApplyFlow().split("-");
-        String lastFlowName = split[split.length - 1];
-        String applyFlow = dto.getApplyFlow() + "-" +
-                MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() - 1);
-        dto.setApplyFlow(applyFlow);
-        dto.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
-        workFlowFeginService.rollBack(dto.getInstanceId());
-        return this.updateBySequenceNbr(dto);
+    public Boolean approval(JgMaintenanceContractDto dto,String comment,String operate) {
+        String instanceId = dto.getInstanceId();
+        try {
+            AjaxResult ajaxResult;
+            ajaxResult = Workflow.taskClient.getTask(instanceId);
+            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+            String taskId = dataObject.getString("id");
+            //组装信息
+            TaskResultDTO taskResultDTO = new TaskResultDTO();
+            taskResultDTO.setResultCode("approvalStatus");
+            taskResultDTO.setTaskId(taskId);
+            taskResultDTO.setComment(comment);
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("approvalStatus", operate);
+            taskResultDTO.setVariable(map);
+            //执行流程
+            Workflow.taskClient.completeByTask(taskId, taskResultDTO);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
-    /**
-     * 维保合同驳回
-     */
-    @Transactional
-    public Boolean rejected(JgMaintenanceContractDto dto) {
-        String[] split = dto.getApplyFlow().split("-");
-        String lastFlowName = split[split.length - 1];
-        String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() - 1);
-        dto.setApplyFlow(applyFlow);
-        dto.setApplyStatus(FlowStatusEnum.REJECTED.getName());
+//        if("tongguo"){
+//            if("weibao"){
+//                dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
+//            }else {
+//                dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
+//            }
+//        }else {
+//            if("weibao"){
+//                dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
+//            }else {
+//                dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
+//            }
+//        }
+
+
+
+        if ("1".equals(operate)){
+
+        }
+        //审批通过
+        if ("0".equals(operate)){
+
+        }
+        dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
+        dto.setInstanceId(instanceId);
+        dto.setReceiveOrgCode(null);
         return this.updateBySequenceNbr(dto);
     }
 
     /**
-     * 维保合同受理
+     * 维保合同撤回
      */
     @Transactional
-    public Boolean accepted(JgMaintenanceContractDto dto) {
-        String[] split = dto.getApplyFlow().split("-");
-        String lastFlowName = split[split.length - 1];
-        String applyFlow = dto.getApplyFlow() + "-" + MaintenanceEnum.getMsgByCode(Objects.requireNonNull(MaintenanceEnum.getEnumByMsg(lastFlowName)).getCode() + 1);
-        dto.setApplyFlow(applyFlow);
-        dto.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
-        return this.updateBySequenceNbr(dto);
+    public void revocation(String instanceId) {
+        String taskName = "";
+        JgMaintenanceContract jgMaintenanceContract = new JgMaintenanceContract();
+        LambdaQueryWrapper<JgMaintenanceContract> lambda = new QueryWrapper<JgMaintenanceContract>().lambda();
+        lambda.eq(JgMaintenanceContract::getInstanceId, instanceId);
+        ArrayList<String> roleList = new ArrayList<>();
+        try {
+            workFlowFeginService.rollBack(instanceId);
+            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+            JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
+            taskName = nextTask.getString("name");
+            if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
+                String nextTaskId = nextTask.getString("id");
+                AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+                JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+                for (Object datum : data) {
+                    if (((Map<?, ?>) datum).containsKey("groupId")) {
+                        roleList.add(((Map<?, ?>) datum).get("groupId").toString());
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (!ObjectUtils.isEmpty(taskName)) {
+            UseStatusEnum message = UseStatusEnum.getMessage(taskName);
+            jgMaintenanceContract.setStatus(message.getPass());
+        }
+
+        String join = String.join(",", roleList);
+        JgMaintenanceContract jgMaintenanceContract1 = this.getBaseMapper().selectOne(lambda);
+        this.updateStatus(jgMaintenanceContract1.getSequenceNbr(), taskName, join, true);
     }
 
     /**
@@ -218,24 +362,49 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
      */
     @Transactional
     public Boolean saveOrSubmit(String submit, Map<String, Object> map, ReginParams reginParams) {
-        // 判断当前是否为提交
         String instanceId = null;
+        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);
+        //获取维保备案编号
+        String wbApplyNo = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.WBBA.getCode(), 1).get(0);
+        contract.setApplyNo(wbApplyNo);
+        contract.setInstanceId(instanceId);
+        contract.setUseUnitCode(company.getCompanyCode());
+        contract.setUseUnitName(company.getCompanyName());
+        //管理员信息
+        String[] MaintenanceManager = dto.getMaintenanceManagerId().split("_");
+        contract.setMaintenanceManagerId(dto.getMaintenanceManagerId());
+        contract.setMaintenanceManagerName(MaintenanceManager[1]);
+        //接收机构信息
+        String[] splitReceiveOrgCode = dto.getReceiveOrgCode().split("_");
+        contract.setReceiveOrgCode(splitReceiveOrgCode[0]);
+        contract.setReceiveOrgName(splitReceiveOrgCode[1]);
+        //维保单位信息
+        String[] splitMaintenanceUnitCode = dto.getMaintenanceUnitCode().split("_");
+        contract.setMaintenanceUnitCode(dto.getMaintenanceUnitCode());
+        contract.setMaintenanceUnitName(splitMaintenanceUnitCode[1]);
+
+        contract.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
+        contract.setEquNum(equipmentLists.size());
+        contract.setInstanceId(instanceId);
+        // 判断当前是否为提交
         if (SUBMIT_TYPE_FLOW.equals(submit)) {
             // 发起流程
             try {
+                ArrayList<String> roleList = new ArrayList<>();
                 ActWorkflowStartDTO flowDto = new ActWorkflowStartDTO();
                 flowDto.setProcessDefinitionKey(WB_PROCESS_DEFINITION_KEY);
-                flowDto.setBusinessKey("1");
-                HashMap<String, Object> dtoMap = new HashMap<>();
-                dtoMap.put("condition", "ces");
-                flowDto.setVariables(dtoMap);
                 AjaxResult ajaxResult = Workflow.taskClient.startByVariable(flowDto);
                 instanceId = ((Map<?, ?>) ajaxResult.get("data")).get("id").toString();
                 ajaxResult = Workflow.taskClient.getTask(instanceId);
+                // 查询下节点任务
+                extracted(instanceId, roleList, contract);
                 // 执行一步
                 JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
                 String taskId = dataObject.getString("id");
-                //组装信息
                 TaskResultDTO taskResultDTO = new TaskResultDTO();
                 taskResultDTO.setResultCode("approvalStatus");
                 taskResultDTO.setTaskId(taskId);
@@ -245,71 +414,109 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 taskResultDTO.setVariable(hashMap);
                 //执行流程
                 Workflow.taskClient.completeByTask(taskId, taskResultDTO);
+                extracted(instanceId, roleList, contract);
+                contract.setInstanceId(instanceId);
+                contract.setApplyStatus(FlowStatusEnum.SUBMITTED.getName());
+                contract.setStatus(FlowStatusEnum.SUBMITTED.getName());
             } catch (Exception e) {
                 log.error("维保使用单位提交流程启动失败：{}", e);
             }
         }
-        JgMaintenanceContractDto dto = JSON.parseObject(JSON.toJSONString(map), JgMaintenanceContractDto.class);
-        Object o = map.get("equipmentLists");
-        List<Object> equipmentLists = Collections.singletonList(o);
-        CompanyBo company = reginParams.getCompany();
-        JgMaintenanceContract contract = new JgMaintenanceContract();
-        BeanUtils.copyProperties(dto, contract);
-        //获取维保备案编号
-        String wbApplyNo = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.WBBA.getCode(), 1).get(0);
-        contract.setApplyNo(wbApplyNo);
-        contract.setInstanceId(instanceId);
-        contract.setUseUnitCode(company.getCompanyCode());
-        contract.setUseUnitName(company.getCompanyName());
-        contract.setApplyFlow(MaintenanceEnum.SHIYONG.getMsg());
-        contract.setApplyStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
-        contract.setEquNum(equipmentLists.size());
-        contract.setInstanceId(instanceId);
         this.save(contract);
+        //关联设备
         List<JgMaintenanceContractEq> equipList = new ArrayList<>();
         equipmentLists.forEach(x -> {
             JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
-            equip.setEquId(String.valueOf(x));
-
+            equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
+            equip.setEquipTransferId(wbApplyNo);
             equipList.add(equip);
         });
         return jgMaintenanceContractEqService.saveBatch(equipList);
     }
 
+    private void extracted(String instanceId, ArrayList<String> roleList, JgMaintenanceContract contract) {
+        JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
+        if (!ObjectUtils.isEmpty(taskNoAuth.get("data"))) {
+            JSONObject nextTask = JSON.parseObject(JSON.toJSONString(taskNoAuth.get("data")));
+            String nextTaskId = nextTask.getString("id");
+            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+            JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+            for (Object datum : data) {
+                if (((Map<?, ?>) datum).containsKey("groupId")) {
+                    roleList.add(((Map<?, ?>) datum).get("groupId").toString());
+                }
+            }
+        }
+        contract.setInstanceStatus(String.join(",", roleList));
+    }
+
     /**
      * 更新维保合同和设备对应关系
      */
     @Transactional
-    public Boolean updateMaintenanceAndEquipment(JgMaintenanceContractDto dto, List<Integer> EquipmentLists) {
+    public Boolean updateMaintenanceAndEquipment(String submit,JgMaintenanceContractDto dto, List<Map<String, Object>> list) {
+        String instanceId = null;
+
         //更新维保合同表
-        this.updateBySequenceNbr(dto);
+        String[] MaintenanceManager = dto.getMaintenanceManagerId().split("_");
+        dto.setMaintenanceManagerId(dto.getMaintenanceManagerId());
+        dto.setMaintenanceManagerName(MaintenanceManager[1]);
 
-        List<Integer> collect = EquipmentLists.stream().filter(Objects::nonNull).collect(Collectors.toList());
-        if (!collect.isEmpty()) {
+        String[] splitReceiveOrgCode = dto.getReceiveOrgCode().split("_");
+        dto.setReceiveOrgCode(splitReceiveOrgCode[0]);
+        dto.setReceiveOrgName(splitReceiveOrgCode[1]);
+
+        String[] splitMaintenanceUnitCode = dto.getMaintenanceUnitCode().split("_");
+        dto.setMaintenanceUnitCode(dto.getMaintenanceUnitCode());
+        dto.setMaintenanceUnitName(splitMaintenanceUnitCode[1]);
+        // 判断当前是否为提交
+        if (SUBMIT_TYPE_FLOW.equals(submit)) {
+            // 发起流程
+            try {
+                ActWorkflowStartDTO flowDto = new ActWorkflowStartDTO();
+                flowDto.setProcessDefinitionKey(WB_PROCESS_DEFINITION_KEY);
+                flowDto.setBusinessKey("1");
+                AjaxResult ajaxResult = Workflow.taskClient.startByVariable(flowDto);
+                instanceId = ((Map<?, ?>) ajaxResult.get("data")).get("id").toString();
+                ajaxResult = Workflow.taskClient.getTask(instanceId);
+                // 执行一步
+                JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+                String taskId = dataObject.getString("id");
+                TaskResultDTO taskResultDTO = new TaskResultDTO();
+                taskResultDTO.setResultCode("approvalStatus");
+                taskResultDTO.setTaskId(taskId);
+                taskResultDTO.setComment("提交流程");
+                HashMap<String, Object> hashMap = new HashMap<>();
+                hashMap.put("approvalStatus", "0");
+                taskResultDTO.setVariable(hashMap);
+                //执行流程
+                Workflow.taskClient.completeByTask(taskId, taskResultDTO);
+//                dto.setApplyFlow(MaintenanceEnum.SHIYONG.getMsg()+","+MaintenanceEnum.WEIBAO.getMsg());
+                dto.setInstanceId(instanceId);
+            } catch (Exception e) {
+                log.error("维保使用单位提交流程启动失败：{}", e);
+            }
+        }
+        this.updateBySequenceNbr(dto);
+        //更新对应设备表
+        if (!list.isEmpty()) {
             //先删除原先设备对应关系
             LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<JgMaintenanceContractEq>()
+                    .eq(JgMaintenanceContractEq::getEquId,list.get(0).get("SEQUENCE_NBR"))
                     .eq(JgMaintenanceContractEq::getIsDelete, false);
-            List<Long> list = jgMaintenanceContractEqService.list(queryWrapper).stream().map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
-            jgMaintenanceContractEqService.deleteBatchSeq(list);
+            List<Long> listSeq = jgMaintenanceContractEqService.list(queryWrapper).stream()
+                    .map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
+            jgMaintenanceContractEqService.deleteBatchSeq(listSeq);
             //重新生成关系表
             List<JgMaintenanceContractEq> equipList = new ArrayList<>();
-            collect.forEach(x -> {
+            list.forEach(x -> {
                 JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
-//                equip.setBusinessId(dto.getApplyNo());
-//                equip.setEquipId(String.valueOf(x));
-//                equip.setBusinessType(BusinessTypeEnum.MAINTENANCE_RECORD.getName());
+                equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
+                equip.setEquipTransferId(dto.getApplyNo());
                 equipList.add(equip);
             });
             return jgMaintenanceContractEqService.saveBatch(equipList);
         }
         return true;
     }
-
-
-    /**
-     * 列表查询 示例
-     */
-    public List<JgMaintenanceContractDto> queryForJgMaintenanceContractList() {
-        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/JgScrapCancelEqServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgScrapCancelEqService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelEqDto;
+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-20
+ */
+@Service
+public class JgScrapCancelEqServiceImpl extends BaseService<JgScrapCancelEqDto,JgScrapCancelEq,JgScrapCancelEqMapper> implements IJgScrapCancelEqService {
+    /**
+     * 分页查询
+     */
+    public Page<JgScrapCancelEqDto> queryForJgScrapCancelEqPage(Page<JgScrapCancelEqDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgScrapCancelEqDto> queryForJgScrapCancelEqList()   {
+        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/JgScrapCancelServiceImpl.java

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper;
+import com.yeejoin.amos.boot.module.jg.api.service.IJgScrapCancelService;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
+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-20
+ */
+@Service
+public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto,JgScrapCancel,JgScrapCancelMapper> implements IJgScrapCancelService {
+    /**
+     * 分页查询
+     */
+    public Page<JgScrapCancelDto> queryForJgScrapCancelPage(Page<JgScrapCancelDto> page)   {
+        return this.queryForPage(page, null, false);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<JgScrapCancelDto> queryForJgScrapCancelList()   {
+        return this.queryForList("" , false);
+    }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -19,7 +19,7 @@
         tzjia.application_date,
         tzjia.accept_date,
         tzjia.inspection_charge_phone,
-        tbei2.use_contact as  inspectionChargePerson,
+        tui.name as  inspectionChargePerson,
         tbei1.use_unit AS applicationUnitName,
         tbei.use_unit AS inspectionUnitName,
         tzjia.status,
@@ -30,7 +30,7 @@
         tz_jyjc_inspection_application AS tzjia
         LEFT JOIN tz_base_enterprise_info tbei ON tbei.use_code = tzjia.application_unit_code
         LEFT JOIN tz_base_enterprise_info tbei1 ON tbei1.use_code = tzjia.inspection_unit_code
-        LEFT JOIN tz_base_enterprise_info tbei2 ON tbei2.sequence_nbr = tzjia.inspection_charge_person
+        LEFT JOIN tzs_user_info tui ON tui.sequence_nbr = tzjia.inspection_charge_person
         LEFT JOIN cb_data_dictionary cdd ON cdd.code = tzjia.equip_classify
         LEFT JOIN cb_data_dictionary cdd1 ON cdd1.code = tzjia.inspection_classify
         LEFT JOIN cb_data_dictionary cdd2 ON cdd2.code = tzjia.status and cdd2.type = 'JYLCZT'
@@ -73,6 +73,7 @@
             and biz_type = #{bizType}
         </if>
         </where>
+        order by tzjia.application_date desc
     </select>
     <select id="listByCategory"
             resultType="com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel">

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.CommonserviceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
@@ -13,7 +14,10 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author system_generator
@@ -39,6 +43,20 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse(commonserviceImpl.getUserInfosByUnitCode(unitCode));
     }
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/getUserPhonesByPersonCode")
+    @ApiOperation(httpMethod = "GET", value = "根据公司的unitCode获取检测检验人员列表", notes = "根据公司的unitCode获取检测检验人员列表")
+    public ResponseModel<Map<String,Object>> getUserPhonesByPersonCode(@RequestParam String unitCode) {
+        List<TzsUserInfo> userPhones = commonserviceImpl.getUserPhonesByPersonCode(unitCode);
+        if (CollectionUtils.isEmpty(userPhones)){
+            return null;
+        }
+        Map<String,Object> map = new HashMap<>();
+        map.put("phone",userPhones.get(0).getPhone() == null?"":userPhones.get(0).getPhone());
+        return ResponseHelper.buildResponse(map);
+    }
+
     /**
      * 查询检验检测机构列表（基本信息及联系人）
      *

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

@@ -49,6 +49,14 @@ public class CommonserviceImpl {
         return userInfos;
     }
 
+    public List<TzsUserInfo> getUserPhonesByPersonCode(String personCode) {
+        QueryWrapper userInfoQueryWrapper = new QueryWrapper<>();
+        userInfoQueryWrapper.eq("sequence_nbr", personCode);
+        List<TzsUserInfo> userInfos = userInfoMapper.selectList(userInfoQueryWrapper);
+        return userInfos;
+    }
+
+
     public List<TzBaseEnterpriseInfo> getInspectionUnitList() {
         return enterpriseInfoMapper.getInspectionUnitList(UNIT_TYPE);
     }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -133,7 +133,7 @@ public class TzsUserInfoController extends BaseController {
         if (ObjectUtils.isEmpty(reginParams)) {
             return null;
         }
-        CompanyModel companyModel = reginParams.getUserModel().getCompanys().get(0);
+        CompanyBo companyModel = reginParams.getCompany();
         if(ObjectUtils.isEmpty(companyModel)){
             throw new BadRequest("未指定人员归属单位信息");
         }

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

@@ -75,7 +75,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     private final String QYRYGW = "QYRYGW";
 
     //两个规定用户组-对应企业人员的人员类型前缀
-    private final String QYRYGW_NAME = "两员配备-企业人员类型";
+    private final String QYRYGW_NAME = "企业人员类型";
     //平台用户锁定状态
     private final String UNLOCK = "UNLOCK";
     private final String LOCK = "LOCK";