Merge branch 'develop_tzs_register' of…

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

@@ -5,7 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
+import java.util.List;
 
 /**
  * 改造变更登记
@@ -15,10 +17,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgChangeRegistrationReformDto", description="改造变更登记")
-public class JgChangeRegistrationReformDto  extends BaseDto {
+@ApiModel(value = "JgChangeRegistrationReformDto", description = "改造变更登记")
+public class JgChangeRegistrationReformDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "设备监管码")
@@ -108,4 +110,11 @@ public class JgChangeRegistrationReformDto  extends BaseDto {
     @ApiModelProperty(value = "任务发起人id")
     private String promoter;
 
+
+    private List<String> roleIds;
+
+    private String dataType;
+
+    private String unitCode;
+
 }

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

@@ -33,6 +33,9 @@ public class JgEquipTransferDto  extends BaseDto {
     @ApiModelProperty(value = "申请状态")
     private String applyStatus;
 
+    @ApiModelProperty(value = "申请状态描述")
+    private String applyStatusDesc;
+
     @ApiModelProperty(value = "申请日期")
     private Date applyDate;
 
@@ -49,7 +52,7 @@ public class JgEquipTransferDto  extends BaseDto {
     private String instanceId;
 
     @ApiModelProperty(value = "下步执行角色/人id")
-    private String nextExecutorIds;
+    private String nextExecuteIds;
 
     @ApiModelProperty(value = "流程执行顺序标识")
     private String executeSequence;
@@ -73,6 +76,6 @@ public class JgEquipTransferDto  extends BaseDto {
     private Date acceptDate;
 
     @ApiModelProperty(value = "任务发起人id")
-    private String executorUserId;
+    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/JgScrapCancelDto.java

 package com.yeejoin.amos.boot.module.jg.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 设备注销报废
@@ -15,10 +19,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="JgScrapCancelDto", description="设备注销报废")
-public class JgScrapCancelDto  extends BaseDto {
+@ApiModel(value = "JgScrapCancelDto", description = "设备注销报废")
+public class JgScrapCancelDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
 
     @ApiModelProperty(value = "注销类型（1报废注销，2移装注销）")
@@ -63,7 +67,22 @@ public class JgScrapCancelDto  extends BaseDto {
     @ApiModelProperty(value = "注销证明")
     private String cancelCertificate;
 
+    @ApiModelProperty(value = "注销证明文件集合格式")
+    private List<Map<String, Object>> cancelCertificateList;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "告知设备列表")
+    private List<Map<String, Object>> deviceList;
+
+
     @ApiModelProperty(value = "终审通过时间")
     private Date auditPassDate;
 
+
+    private List<String> roleIds;
+
+
+    // 区分监管和企业
+    private String type;
+
 }

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

@@ -2,9 +2,9 @@ package com.yeejoin.amos.boot.module.jg.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 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 org.springframework.util.StringUtils;
@@ -186,4 +186,12 @@ public class JgTransferNoticeDto extends BaseDto {
                 + (StringUtils.isEmpty(this.address) ? "" : this.address);
     }
 
+    private List<String> roleIds;
+
+    private  String dataType;
+
+    private String nextExecuteIds;
+
+    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/JgChangeRegistrationReform.java

@@ -201,6 +201,5 @@ public class JgChangeRegistrationReform extends BaseEntity {
      */
     @TableField(value = "promoter")
     private String promoter;
-    
-    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/entity/JgEquipTransfer.java

@@ -77,12 +77,6 @@ public class JgEquipTransfer extends BaseEntity {
     private String instanceId;
 
     /**
-     * 下步执行角色/人id
-     */
-	@TableField("next_executor_ids")
-    private String nextExecutorIds;
-
-    /**
      * 流程执行顺序标识
      */
 	@TableField("execute_sequence")
@@ -125,9 +119,21 @@ public class JgEquipTransfer extends BaseEntity {
     private Date acceptDate;
 
     /**
+     * 下一执行节点ids
+     */
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+    /**
+     * 任务发起人id
+     */
+    @TableField(value = "promoter")
+    private String promoter;
+
+    /**
      * 任务发起人id
      */
-	@TableField("executor_user_id")
-    private String executorUserId;
+    @TableField(value = "task_name")
+    private String taskName;
 
 }

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

@@ -112,4 +112,8 @@ public class JgScrapCancel extends BaseEntity {
 	@TableField("audit_pass_date")
     private Date auditPassDate;
 
+
+    @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/JgTransferNotice.java

@@ -3,10 +3,10 @@ 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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 import java.util.Date;
 
 /**
@@ -280,6 +280,14 @@ public class JgTransferNotice extends BaseEntity {
     @TableField("province_name")
     private String provinceName;
 
-    @TableField("promoter")
+    @TableField("next_execute_ids")
+    private String nextExecuteIds;
+
+
+    @TableField("status")
+    private String status;
+
+    @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/enums/CancelFlowStatusEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 使用登记状态西悉尼
+ */
+@Getter
+@AllArgsConstructor
+public enum CancelFlowStatusEnum {
+
+    SUBMIT("使用单位提交", "submit", "使用单位待提交"),
+    RECEIVE("一级受理", "receive", "一级待受理"),
+    PRELIMINARY("二级受理", "preliminary", "二级待受理"),
+    REEXAMINE("三级受理", "reexamine", "三级待受理");
+
+
+
+    private final String name;
+
+    private final String code;
+
+    private final String pass;
+
+
+
+    public static CancelFlowStatusEnum getMessage(String name){
+        for (CancelFlowStatusEnum constants : values()) {
+            if (constants.getName().equals(name)) {
+                return constants;
+            }
+        }
+        return null;
+    }
+}

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

-package com.yeejoin.amos.boot.module.jg.api.enums;
-
-/**
- * 办理状态枚举
- */
-public enum  FlowStatusEnum {
-
-    /**
-     * 待提交
-     */
-    TO_BE_SUBMITTED(6610, "待提交"),
-    /**
-     * 已提交
-     */
-    SUBMITTED(6611, "已提交"),
-    /**
-     * 待受理
-     */
-    TO_BE_PROCESSED(6612, "待受理"),
-    /**
-     * 已办理
-     */
-    HAVE_PROCESSED(6613, "已办理"),
-
-    /**
-     * 已驳回
-     */
-    REJECTED(6614, "已驳回"),
-
-    /**
-     * 已撤回
-     */
-    ROBACK(6615, "已撤回");
-
-    private final int code;
-
-    private final String name;
-
-    FlowStatusEnum(int code, String name) {
-        this.code = code;
-        this.name = name;
-    }
-
-    public static String getNameByType(Long code) {
-        String name = null;
-        for (FlowStatusEnum enumOne : FlowStatusEnum.values()) {
-            if (enumOne.getCode() == code) {
-                name = enumOne.getName();
-                break;
-            }
-        }
-        return name;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformEqMapper extends BaseMapper<JgChangeRegistrationReformEq> {
-    @Update("update jg_change_registration_reform set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update jg_change_registration_reform set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

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.JgChangeRegistrationReformDto;
 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;
@@ -17,7 +18,7 @@ import java.util.Map;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeRegistrationReform> {
-    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationReform dto , @Param("roleIds") List<String> roleIds);
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgChangeRegistrationReformDto dto , @Param("roleIds") List<String> roleIds);
 
     Map<String, Object> getDetail(@Param("id")String 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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-20
  */
 public interface JgChangeRegistrationTransferEqMapper extends BaseMapper<JgChangeRegistrationTransferEq> {
-    @Update("update tzs_jg_change_registration_transfer_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update tzs_jg_change_registration_transfer_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId,@Param("currentDocumentId") String currentDocumentId);
 }

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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 设备移交 Mapper 接口
@@ -9,6 +14,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author system_generator
  * @date 2023-12-20
  */
-public interface JgEquipTransferMapper extends BaseMapper<JgEquipTransfer> {
+public interface JgEquipTransferMapper extends CustomBaseMapper<JgEquipTransfer> {
+    Page<JgEquipTransfer> queryForPage(Page<JgEquipTransfer> page, JgEquipTransferDto dto, String type, String companyCode);
 
+    void updatePromoter(@Param("id")Long id);
+
+    @MapKey("sequenceNbr")
+    List<Map<String, Object>> queryEquipInformation(Long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgScrapCancelMapper.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.JgScrapCancelDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 设备注销报废 Mapper 接口
@@ -11,4 +19,23 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface JgScrapCancelMapper extends BaseMapper<JgScrapCancel> {
 
+    Page<Map<String, Object>> getListPage(@Param("page")Page<Map<String, Object>> page, @Param("dto") JgScrapCancelDto dto , @Param("roleIds") List<String> roleIds, @Param("orgCode") String orgCode);
+
+    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);
+
+    /**
+     * 根据安装告知编号查询设备、设计、制造等信息
+     *
+     * @param sequenceNbr 安装告知编号
+     */
+    Map<String, Object> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
+
 }

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

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Update;
  * @date 2023-12-18
  */
 public interface JgUseRegistrationEqMapper extends BaseMapper<JgUseRegistrationEq> {
-    @Update("update tzs_jg_use_registration_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id = #{currentDocumentId} ")
+    @Update("update tzs_jg_use_registration_eq set  is_invalid = 1 where equ_id = #{equipId} and equip_transfer_id != #{currentDocumentId} ")
     void updateEquipIsVaildByEquipIdAndCurrentDocumentId(@Param("equipId") String equipId, @Param("currentDocumentId") String currentDocumentId);
 }

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;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
+
+import java.util.Map;
+
 /**
  * 设备移交接口类
  *
  * @author system_generator
  * @date 2023-12-20
  */
-public interface IJgEquipTransferService {
+public interface IJgEquipTransferService  extends IService<JgEquipTransfer> {
+
+    /**
+     * 分页查询设备移交接口
+     *
+     * @param page  分页对象
+     * @param dto 查询参数
+     * @param type  类型：enterprise-企业端、supervision-监管端
+     * @return 设备移交分页列表
+     */
+    Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransfer> page, JgEquipTransferDto dto, String type, ReginParams reginParams);
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return 设备移交详情
+     */
+    Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr);
 
+    /**
+     * 保存设备移交接口
+     * @param submitType 按钮类型
+     * @param dto dto
+     * @param selectedOrgInfo reginParams
+     */
+    void saveEquipTransfer(String submitType, Map<String, JgEquipTransferDto> dto, ReginParams selectedOrgInfo);
 }

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

@@ -31,15 +31,15 @@
 
         <where>
             and  ur.is_delete = 0
-            <if test="dto.equCategory != null and dto.equCategory != ''">
-                and jri.EQU_CATEGORY = #{dto.equCategory}
-            </if>
+<!--            <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.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>

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">
+    <update id="updatePromoter">
+        
+    </update>
 
+    <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer">
+        select
+            jet.sequence_nbr AS sequenceNbr,
+            jet.apply_no AS applyNo,
+            jet.use_unit_credit_code AS useUnitCreditCode,
+            jet.use_unit_name AS useUnitName,
+            jet.apply_status AS applyStatus,
+            jet.apply_date AS applyDate,
+            jet.install_unit_credit_code AS installUnitCreditCode,
+            jet.equip_num AS equipNum,
+            jet.install_unit_name AS installUnitName,
+            jet.instance_id AS instanceId,
+            jet.promoter,
+            jet.next_execute_ids AS nextExecuteIds,
+            jet.execute_sequence AS executeSequence,
+            jet.instance_status AS instanceStatus,
+            jet.accept_date AS acceptDate,
+            jet.task_name AS taskName
+        FROM
+            tzs_jg_equip_transfer jet
+        <where>
+            jet.is_delete = false
+            <if test="param != null ">
+                <if test="param.applyNo != null and param.applyNo != ''">
+                    AND jet.apply_no LIKE CONCAT('%', #{param.applyNo}, '%')
+                </if>
+                <if test="param.useUnitName != null and param.useUnitName != ''">
+                    AND jet.use_unit_name LIKE CONCAT('%', #{param.useUnitName}, '%')
+                </if>
+                <if test="param.installUnitName != null and param.installUnitName != ''">
+                    AND jet.install_unit_name LIKE CONCAT('%', #{param.installUnitName}, '%')
+                </if>
+                <if test="param.applyStatus != null and param.applyStatus != ''">
+                    AND jet.apply_status = #{param.applyStatus}
+                </if>
+            </if>
+            <if test="type == 'useUnit'">
+                AND jet.use_unit_credit_code = #{companyCode}
+            </if>
+            <if test="type == 'installUnit'">
+                AND jet.install_unit_credit_code = #{companyCode}
+            </if>
+        </where>
+        ORDER BY jet.apply_date DESC
+    </select>
+    <select id="queryEquipInformation" resultType="java.util.Map">
+        select
+            jet.sequence_nbr AS sequenceNbr,
+            jet.apply_no AS applyNo,
+            jet.use_unit_credit_code AS useUnitCreditCode,
+            jet.use_unit_name AS useUnitName,
+            jet.apply_status AS applyStatus,
+            jet.apply_date AS applyDate,
+            jet.install_unit_credit_code AS installUnitCreditCode,
+            jet.equip_num AS equipNum,
+            jet.install_unit_name AS installUnitName,
+            jet.instance_id AS instanceId,
+            jet.promoter,
+            jet.next_execute_ids AS nextExecuteIds,
+            jet.execute_sequence AS executeSequence,
+            jet.instance_status AS instanceStatus,
+            jet.accept_date AS acceptDate,
+            jet.task_name AS taskName
+            ri.equ_list AS equList,
+            ri.equ_category AS equCategory,
+            ri.equ_define AS equDefine,
+            ri.product_name AS productName,
+            ri.brand_name AS brandName,
+            ri.equ_type AS equType,
+            ri.equ_price AS equPrice,
+            ri.product_photo AS productPhoto,
+            di.design_unit_credit_code AS designUnitCreditCode,
+            di.design_unit_name AS designUnitName,
+            di.design_license_num AS designLicenseNum,
+            di.design_use_date AS designUseDate,
+            di.design_date AS designDate,
+            di.drawing_do AS drawingDo,
+            di.appraisal_unit AS appraisalUnit,
+            di.appraisal_date AS appraisalDate,
+            di.design_doc AS designDoc,
+            di.design_standard AS designStandard,
+            fi.produce_unit_credit_code AS produceUnitCreditCode,
+            fi.produce_unit_name AS produceUnitName,
+            fi.produce_license_num AS produceLicenseNum,
+            fi.factory_num AS factoryNum,
+            fi.produce_date AS produceDate,
+            fi.imported AS imported,
+            fi.produce_country AS produceCountry,
+            fi.factory_standard AS factoryStandard,
+            fi.product_quality_yield_prove AS productQualityYieldProve,
+            fi.ins_use_maintain_explain AS insUseMaintainExplain,
+            ui.safety_manager AS safetyManager,
+            ui.phone AS safetyManagerPhone,
+            ui.PROVINCE_NAME AS useUnitProvinceName,
+            ui.CITY_NAME AS useUnitCityName,
+            ui.COUNTY_NAME AS useUnitCountyName,
+            ui.ADDRESS AS useUnitAddress
+        FROM
+            tzs_jg_equip_transfer jet
+                LEFT JOIN tzs_jg_equip_transfer_eq ete ON re.equip_transfer_id = jet.sequence_nbr
+                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = ete.equ_id
+                LEFT JOIN idx_biz_jg_design_info di ON di.record = ete.equ_id
+                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = ete.equ_id
+                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = ete.equ_id
+                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = ete.equ_id
+        WHERE
+            jet.sequence_nbr = #{sequenceNbr}
+        LIMIT 1
+    </select>
 </mapper>

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

@@ -44,7 +44,6 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND (isn.notice_status in ('6612', '6613', '6610')  )
                 AND isn.receive_org_credit_code = #{orgCode}
             </if>
             <if test="type == 'enterprise'">
@@ -52,7 +51,7 @@
             </if>
         </where>
         ORDER BY
-        isn.notice_date DESC
+        isn.rec_date DESC
     </select>
 
     <select id="queryEquipInformation" resultType="java.util.Map">

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

@@ -2,4 +2,211 @@
 <!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">
 
+    <update id="updatePromoter">
+        UPDATE tzs_jg_scrap_cancel set promoter = null
+        where sequence_nbr = #{id}
+    </update>
+
+
+    <select id="getListPage" resultType="java.util.Map">
+        select ur.sequence_nbr as sequenceNbr,
+        ur.instance_id as instanceId,
+        ur.audit_status as auditStatus,
+        ur.rec_date as regDate,
+        ur.receive_org_code as receiveOrgCode,
+        ur.receive_org_name as receiveOrgName,
+        ur.receive_company_code as receiveCompanyCode,
+        ur.cancel_certificate as cancelCertificate,
+        ur.cancel_type as cancelType,
+        ur.apply_no as applyNo,
+        ur.status,
+        ur.remark,
+        ur.instance_status as instanceStatus,
+        ur.promoter,
+        ifnull(ur.next_execute_ids,'') as nextExecuteIds,
+        audit_pass_date as auditPassDate,
+        use.USE_UNIT_CREDIT_CODE as useUnitCreditCode,
+        use.USE_UNIT_NAME as useUnitName,
+        (SELECT name from tz_equipment_category  where  code = jri.EQU_CATEGORY) as equCategory,
+        jri.EQU_DEFINE as equDefine,
+        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,
+        re.equ_id as equipId
+        from tzs_jg_scrap_cancel ur
+        LEFT JOIN tzs_jg_scrap_cancel_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  use.USE_UNIT_NAME like concat('%',#{dto.useUnitName},'%')-->
+<!--            </if>-->
+            <if test="roleIds != null and dto.type == 'supervision'">
+                <foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
+                    ur.audit_status like concat('%',#{role},'%')
+                </foreach>
+            </if>
+            <if test="dto.type == 'supervision'">
+                AND ur.receive_org_code = #{orgCode}
+            </if>
+<!--            <if test="dto.type == 'enterprise'">-->
+<!--                AND use.USE_UNIT_CREDIT_CODE = #{orgCode}-->
+<!--            </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>
+
+    <select id="queryEquipInformation" resultType="java.util.Map">
+        select
+            ur.sequence_nbr AS sequenceNbr,
+            ur.instance_id as instanceId,
+            ur.audit_status as auditStatus,
+            ur.rec_date as regDate,
+            ur.receive_org_code as receiveOrgCode,
+            ur.receive_org_name as receiveOrgName,
+            ur.receive_company_code as receiveCompanyCode,
+            ur.cancel_certificate as cancelCertificate,
+            ur.cancel_type as cancelType,
+            ur.apply_no as applyNo,
+            ur.status,
+            ur.remark,
+            ur.instance_status as instanceStatus,
+            ur.promoter,
+            ri.equ_list AS equList,
+            ri.equ_category AS equCategory,
+            ri.EQU_DEFINE AS equDefine,
+            ri.product_name AS productName,
+            ri.brand_name AS brandName,
+            ri.equ_type AS equType,
+            ri.equ_price AS equPrice,
+            ri.product_photo AS productPhoto,
+            di.design_unit_credit_code AS designUnitCreditCode,
+            di.design_unit_name AS designUnitName,
+            di.design_license_num AS designLicenseNum,
+            di.design_use_date AS designUseDate,
+            di.design_date AS designDate,
+            di.drawing_do AS drawingDo,
+            di.appraisal_unit AS appraisalUnit,
+            di.appraisal_date AS appraisalDate,
+            di.design_doc AS designDoc,
+            di.design_standard AS designStandard,
+            fi.produce_unit_credit_code AS produceUnitCreditCode,
+            fi.produce_unit_name AS produceUnitName,
+            fi.produce_license_num AS produceLicenseNum,
+            fi.factory_num AS factoryNum,
+            fi.produce_date AS produceDate,
+            fi.imported AS imported,
+            fi.produce_country AS produceCountry,
+            fi.factory_standard AS factoryStandard,
+            fi.product_quality_yield_prove AS productQualityYieldProve,
+            fi.ins_use_maintain_explain AS insUseMaintainExplain,
+            ui.safety_manager AS safetyManager,
+            ui.phone AS safetyManagerPhone,
+            ui.PROVINCE_NAME AS useUnitProvinceName,
+            ui.CITY_NAME AS useUnitCityName,
+            ui.COUNTY_NAME AS useUnitCountyName,
+            ui.ADDRESS AS useUnitAddress
+        FROM
+            tzs_jg_scrap_cancel ur
+                LEFT JOIN tzs_jg_scrap_cancel_eq re ON re.equip_transfer_id = ur.sequence_nbr
+                LEFT JOIN idx_biz_jg_register_info ri ON ri.record = re.equ_id
+                LEFT JOIN idx_biz_jg_design_info di ON di.record = re.equ_id
+                LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
+                LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
+        WHERE
+            ur.sequence_nbr = #{sequenceNbr}
+            LIMIT 1
+    </select>
 </mapper>

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

@@ -18,7 +18,10 @@
         tjtn.instance_id AS instanceId,
         tjtn.transfer_type AS transferType,
         tjtn.plan_date AS planDate,
-        tjtn.promoter AS promoter
+        tjtn.promoter AS promoter,
+        tjtn.next_execute_ids AS nextExecuteIds,
+        tjtn.instance_status AS instanceStatus,
+        tjtn.notice_report_url AS noticeReportUrl
         FROM
             tzs_jg_transfer_notice tjtn
         <where>
@@ -47,8 +50,7 @@
                 </if>
             </if>
             <if test="type == 'supervision'">
-                AND tjtn.notice_status in ('6612', '6613', '6614')
-                AND tjtn.receive_org_code = #{orgCode}
+                AND tjtn.notice_status in ('6612', '6613', '6610')
             </if>
             <if test="type == 'enterprise'">
                 AND tjtn.install_unit_credit_code = #{orgCode}

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

@@ -2,6 +2,7 @@ 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.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -88,7 +89,7 @@ public class JgChangeRegistrationReformController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
 	@GetMapping(value = "/getList")
-	public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationReform dto,
+	public ResponseModel<Page<Map<String, Object>>> getList(JgChangeRegistrationReformDto dto,
 															@RequestParam(value = "current") int current,
 															@RequestParam(value = "size") int size) {
 		Page<Map<String, Object>> page = new Page<>(current, size);

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 com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
+import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang3.StringUtils;
 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 java.util.Arrays;
+import java.util.Map;
 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;
@@ -34,83 +37,60 @@ public class JgEquipTransferController extends BaseController {
     /**
      * 新增设备移交
      *
-     * @return
+     * @return String
      */
     @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));
-	}
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增设备移交", notes = "新增设备移交")
+    public ResponseModel<JgEquipTransferDto> save(@RequestParam String submitType, @RequestBody Map<String, JgEquipTransferDto> dto) {
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.saveOrUpdateModel(dto, false));
+    }
 
-	/**
-     * 根据sequenceNbr删除
+    /**
+     * 批量删除
      *
-     * @param sequenceNbr 主键
-     * @return
+     * @param ids 主键
+     * @return ResponseModel
      */
     @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));
+    @DeleteMapping(value = "/deleteBatch")
+    @ApiOperation(httpMethod = "POST", value = "批量删除设备移交", notes = "批量删除设备移交")
+    public ResponseModel<Object> deleteBySequenceNbr(@RequestParam String ids) {
+        if (StringUtils.isEmpty(ids)) {
+            throw new RuntimeException("请选择需要删除的行！");
+        }
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.removeByIds(Arrays.asList(ids.split(","))));
     }
 
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
-     * @return
+     * @param sequenceNbr 主键
+     * @return Map
      */
-	@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));
-	}
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/details")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个设备移交", notes = "根据sequenceNbr查询单个设备移交")
+    public ResponseModel<Map<String, Map<String, Object>>> selectOne(@RequestParam Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryBySequenceNbr(sequenceNbr));
+    }
 
-	/**
+    /**
      * 列表分页查询
      *
      * @param current 当前页
-     * @param current 每页大小
-     * @return
+     * @param size    每页大小
+     * @return Page
      */
-	@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());
-	}
+    @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,
+                                                                @ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
+                                                                @RequestBody(required = false) JgEquipTransferDto dto) {
+        Page<JgEquipTransfer> page = new Page<>(current, size);
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page, dto, type, getSelectedOrgInfo()));
+    }
 }
+

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

@@ -42,6 +42,7 @@ public class JgInstallationByWorkFlowController {
      *
      * @return
      */
+    @Deprecated
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/submit")
     @ApiOperation(httpMethod = "POST", value = "安装告知提交", notes = "安装告知提交")

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 cn.hutool.core.bean.BeanUtil;
+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;
-import java.util.List;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgScrapCancelDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 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 com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.feign.privilege.Privilege;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 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;
+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.*;
 
 /**
  * 设备注销报废
@@ -28,89 +35,104 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 @RequestMapping(value = "/jg-scrap-cancel")
 public class JgScrapCancelController extends BaseController {
 
-    @Autowired
-    JgScrapCancelServiceImpl jgScrapCancelServiceImpl;
+	@Autowired
+	JgScrapCancelServiceImpl jgScrapCancelService;
 
-    /**
-     * 新增设备注销报废
-     *
-     * @return
-     */
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+
+	@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);
+	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	public ResponseModel<Object> save(@RequestParam String submitType, @RequestBody Map<String, JgScrapCancelDto> model) {
+		jgScrapCancelService.save(submitType, model);
+		return ResponseHelper.buildResponse("ok");
 	}
 
 	/**
-     * 根据sequenceNbr更新
-     *
-     * @param sequenceNbr 主键
-     * @return
-     */
+	 * 根据sequenceNbr更新
+	 *
+	 * @param model 安装告知
+	 */
 	@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));
+	@PostMapping(value = "/updateInfo")
+	@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新安装告知", notes = "根据sequenceNbr更新安装告知")
+	public ResponseModel<JgScrapCancelDto> updateInfo(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
+		JgScrapCancelDto jgScrapCancelDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("jgScrapCancelAdd")), JgScrapCancelDto.class, true);
+		if (Objects.isNull(jgScrapCancelDto)) {
+			throw new IllegalArgumentException("参数jgScrapCancelAdd不能为空");
+		}
+		Object o = ((LinkedHashMap<?, ?>) model.get("jgScrapCancelAdd")).get("cancelCertificateList");
+		jgScrapCancelDto.setCancelCertificateList((List<Map<String, Object>>) o);
+		return ResponseHelper.buildResponse(jgScrapCancelService.updateInfo(submitType, jgScrapCancelDto, op));
 	}
 
-	/**
-     * 根据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));
+	@PostMapping(value = "/flowExecute")
+	@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+	public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+
+		LinkedHashMap model1 = (LinkedHashMap)map.get("model");
+		LinkedHashMap jgScrapCancelInfo = (LinkedHashMap)model1.get("jgScrapCancelAdd");
+		JgScrapCancelDto jgScrapCancelDto = JSON.parseObject(JSON.toJSONString(jgScrapCancelInfo), JgScrapCancelDto.class);
+
+		jgScrapCancelService.flowExecute(Long.valueOf(String.valueOf(jgScrapCancelDto.getSequenceNbr())), jgScrapCancelDto.getInstanceId(), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")), true);
+		return ResponseHelper.buildResponse("ok");
+	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/withdraw")
+	@ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+	public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
+		jgScrapCancelService.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");
+		jgScrapCancelService.deleteBatch(ids);
+		return ResponseHelper.buildResponse("ok");
 	}
 
-	/**
-     * 列表分页查询
-     *
-     * @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));
+	@PostMapping(value = "/deleteMessage")
+	@ApiOperation(httpMethod = "POST", value = "批量删除", notes = "批量删除")
+	public ResponseModel<Object> deleteMessage(@RequestParam("id") Long id) {
+		ArrayList<Long> ids = new ArrayList<>();
+		ids.add(id);
+		jgScrapCancelService.deleteBatch(ids);
+		return ResponseHelper.buildResponse("ok");
 	}
 
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST", value = "列表全部数据查询", notes = "列表全部数据查询")
+	@PostMapping(value = "/getList")
+	public ResponseModel<Page<Map<String, Object>>> getList(JgScrapCancelDto dto,
+															@RequestParam(value = "current") int current,
+															@RequestParam(value = "size") int size) {
+		Page<Map<String, Object>> page = new Page<>(current, size);
+		return ResponseHelper.buildResponse(jgScrapCancelService.getList(dto, page,  dto.getRoleIds()));
+	}
+
+
 	/**
-	 * 列表全部数据查询
-     *
-	 * @return
+	 * 根据sequenceNbr查询
+	 *
+	 * @param sequenceNbr 主键
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "设备注销报废列表全部数据查询",   notes = "设备注销报废列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<JgScrapCancelDto>> selectForList() {
-	    return ResponseHelper.buildResponse(jgScrapCancelServiceImpl.queryForJgScrapCancelList());
+	@GetMapping(value = "/details")
+	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个详情", notes = "根据sequenceNbr查询单个详情")
+	public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+		return ResponseHelper.buildResponse(jgScrapCancelService.queryBySequenceNbr(sequenceNbr));
 	}
+
+
+
+
+
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 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.ReginParams;
-import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;

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

@@ -22,6 +22,7 @@ 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.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.feign.workflow.Workflow;
@@ -64,8 +65,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     private InspectionDetectionInfoMapper inspectionDetectionInfoMapper;
     @Autowired
     private OtherInfoMapper otherInfoMapper;
-    @Autowired
-    private JgChangeRegistrationReformMapper jgChangeRegistrationReformMapper;
     //改造登记关系表mapper
     @Autowired
     private JgChangeRegistrationReformEqMapper jgChangeRegistrationReformEqMapper;
@@ -79,7 +78,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     //使用登记关系表mapper
     @Autowired
     private JgUseRegistrationEqMapper jgUseRegistrationEqMapper;
-
     @Autowired
     private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
@@ -91,7 +89,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
     /**
      * 分页查询
      */
-    public Page<Map<String, Object>> getList(JgChangeRegistrationReform dto, Page<Map<String, Object>> page, List<String> roleIds) {
+    public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
         Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
         return listPage;
     }
@@ -153,7 +151,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             List<String> applicationFormCode = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SYDJ.getCode(), 1);
             jgChangeRegistrationReform.setApplyNo(applicationFormCode.get(0));
             jgChangeRegistrationReform.setAuditStatus("待提交");
-            jgChangeRegistrationReform.setStatus(UseStatusEnum.SUBMIT.getPass());
+            jgChangeRegistrationReform.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
             this.save(jgChangeRegistrationReform);
             jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
             jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
@@ -178,7 +176,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
                 // 执行流程
                 String status = flowExecute(jgChangeRegistrationReform.getSequenceNbr(), instanceId, "0", "", true);
                 jgChangeRegistrationReform.setAuditStatus("已提交");
-                jgChangeRegistrationReform.setStatus(UseStatusEnum.RECEIVE.getPass());
+                jgChangeRegistrationReform.setStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
             }
             jgChangeRegistrationReform.setInstanceId(instanceId);
 
@@ -253,7 +251,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         if ("流程结束".equals(taskName)) {
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
             jgChangeRegistrationReform.setStatus(taskName);
-            jgChangeRegistrationReform.setAuditStatus("已完成");
+            jgChangeRegistrationReform.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
+
             //交换历史数据与新增数据
             updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString());
         } else {

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.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 com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * 设备移交服务实现类
@@ -16,18 +26,81 @@ import java.util.List;
  * @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 class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
+
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
+    public JgEquipTransferDto saveOrUpdateModel(Map<String, JgEquipTransferDto> dto, Boolean enableStartFlow) {
+        String[] taskName = new String[]{"流程结束"};
+        boolean isUpdate = false;
+        String instanceId = null;
+        JgEquipTransfer entity = null;
+
+        return null;
+    }
+
+
+    @Override
+    public Page<JgEquipTransferDto> queryForJgEquipTransferPage(Page<JgEquipTransfer> page, JgEquipTransferDto dto, String type, ReginParams reginParams) {
+
+        Page<JgEquipTransfer> equipTransferPage = this.baseMapper.queryForPage(page, dto, type, reginParams.getCompany().getCompanyCode());
+
+        Page<JgEquipTransferDto> equipTransferDtoPage = new Page<>();
+        BeanUtils.copyProperties(equipTransferPage, equipTransferDtoPage, "records");
+        List<JgEquipTransferDto> records = equipTransferPage.getRecords().stream().map(transfer -> {
+            JgEquipTransferDto equipTransferDto = new JgEquipTransferDto();
+            BeanUtils.copyProperties(transfer, equipTransferDto);
+            if (Objects.nonNull(transfer.getApplyStatus())) {
+                equipTransferDto.setApplyStatusDesc(FlowStatusEnum.getNameByType(Long.valueOf(transfer.getApplyStatus())));
+            }
+            return equipTransferDto;
+        }).collect(java.util.stream.Collectors.toList());
+        equipTransferDtoPage.setRecords(records);
+
+        return equipTransferDtoPage;
+    }
+
+    @Override
+    public Map<String, Map<String, Object>> queryBySequenceNbr(Long sequenceNbr) {
+        JgEquipTransfer equipTransfer = this.baseMapper.selectById(sequenceNbr);
+
+        if (Objects.isNull(equipTransfer)) {
+            return null;
+        }
+
+        Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
+
+        String[] fields = {"productPhoto", "designDoc", "designStandard", "factoryStandard",
+                "productQualityYieldProve", "insUseMaintainExplain", "inspectReport",
+                "proxyStatementAttachment", "installContractAttachment"};
+
+        List<Map<String, Object>> equipmentInfos = this.baseMapper.queryEquipInformation(sequenceNbr);
+
+        handleJsonArrayFields(equipTransferInfo, fields);
+        handleJsonArrayFields(equipmentInfos.get(0), fields);
+
+        Map<String, Map<String, Object>> result = new HashMap<>();
+        result.put("installationInfo", equipTransferInfo);
+        result.put("equipmentInfo", equipmentInfos.get(0));
+
+        return result;
+    }
+
+    @Override
+    @Transactional(rollbackFor = {Exception.class, BaseException.class})
+    public void saveEquipTransfer(String submitType, Map<String, JgEquipTransferDto> dto, ReginParams selectedOrgInfo) {
+        String[] taskName = new String[]{"流程结束"};
+    }
+
+    private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
+        Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer));
+        equipTransferInfo.put("useUnitCreditCode", equipTransfer.getUseUnitCreditCode() + "_" + equipTransfer.getUseUnitName());
+        equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
+        return equipTransferInfo;
     }
 
-    /**
-     * 列表查询 示例
-     */
-    public List<JgEquipTransferDto> queryForJgEquipTransferList()   {
-        return this.queryForList("" , false);
+    private void handleJsonArrayFields(Map<String, Object> map, String[] fields) {
+        for (String field : fields) {
+            map.computeIfPresent(field, (key, value) -> JSON.parseArray(value.toString()));
+        }
     }
 }
\ 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

@@ -5,17 +5,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.aspose.words.SaveFormat;
 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.DateUtils;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
@@ -26,6 +23,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
@@ -187,7 +185,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             // 发起流程
             if (!StringUtils.hasText(noticeDto.getInstanceId())) {
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey("installationNotification");
+                dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey("1");
                 try {
                     ajaxResult = Workflow.taskClient.startByVariable(dto);
@@ -492,10 +490,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             String applyNo = applyNoList.get(i);
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
-            dto.setNextExecuteIds(String.join(",", roleListSecond));
-            dto.setInstanceStatus(String.join(",", roleListFirst));
-            dto.setPromoter(reginParams.getUserModel().getUserId());
-            dto.setStatus(taskName[0]);
+            if(SUBMIT_TYPE_FLOW.equals(submitType)) {
+                dto.setNextExecuteIds(String.join(",", roleListSecond));
+                dto.setInstanceStatus(String.join(",", roleListFirst));
+                dto.setPromoter(reginParams.getUserModel().getUserId());
+                dto.setStatus(taskName[0]);
+            }
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
@@ -659,7 +659,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             jgInstallationNotice.setStatus(taskName[0]);
             jgInstallationNotice.setPromoter("");
             jgInstallationNotice.setNextExecuteIds(String.join(",", roleList));
-            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
             jgInstallationNoticeMapper.updateById(jgInstallationNotice);
         }
     }
@@ -717,7 +717,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                     supervisoryCodeInfo.setStatus("1");
                     supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
 
-                    jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                    jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                     this.generateInstallationNoticeReport(jgInstallationNotice.getSequenceNbr());
                     // 更新其他业务表
                     tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());
@@ -747,7 +747,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
                 }
             } else {
                 jgInstallationNotice.setPromoter("");
-                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.REJECTED.getCode()));
             }
             jgInstallationNoticeMapper.updateById(jgInstallationNotice);
         }

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

@@ -16,7 +16,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
@@ -26,6 +25,7 @@ import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -606,7 +606,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         if (submit) {
             if ("0".equals(op)) {
                 jgMaintainNotice.setPromoter(reginParams.getUserModel().getUserId());
-                jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                jgMaintainNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 this.generateMaintainNoticeReport(jgMaintainNotice.getSequenceNbr());
 //                // 更新其他业务表
 //                tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());

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

@@ -8,16 +8,12 @@ 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;
@@ -26,6 +22,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -416,8 +413,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 Workflow.taskClient.completeByTask(taskId, taskResultDTO);
                 extracted(instanceId, roleList, contract);
                 contract.setInstanceId(instanceId);
-                contract.setApplyStatus(FlowStatusEnum.SUBMITTED.getName());
-                contract.setStatus(FlowStatusEnum.SUBMITTED.getName());
+                contract.setApplyStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                contract.setStatus(FlowStatusEnum.TO_BE_PROCESSED.getName());
             } catch (Exception e) {
                 log.error("维保使用单位提交流程启动失败：{}", e);
             }

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

@@ -13,19 +13,15 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgReformNoticeService;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -51,7 +47,6 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -666,7 +661,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         boolean submit = submit(JgReformNotice, op);
         if (submit) {
             if ("0".equals(op)) {
-                JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                JgReformNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
                 this.generateInstallationNoticeReport(JgReformNotice.getSequenceNbr());
                 // 更新其他业务表
                 // tzsJgOtherInfo.setCode96333(mapCode.get("code96333").toString());

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 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.JgScrapCancelDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancel;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgScrapCancelEq;
+import com.yeejoin.amos.boot.module.jg.api.enums.CancelFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelEqMapper;
 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 com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
+import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
+import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.workflow.Workflow;
+import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
+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.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 设备注销报废服务实现类
@@ -17,17 +49,431 @@ import java.util.List;
  */
 @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);
+
+
+    @Autowired
+    private JgScrapCancelEqServiceImpl jgScrapCancelEqService;
+
+    @Autowired
+    private JgScrapCancelEqMapper jgScrapCancelEqMapper;
+    @Autowired
+    WorkFlowFeignService workFlowFeginService;
+    @Autowired
+    private ICreateCodeService iCreateCodeService;
+    @Autowired
+    RedisUtils redisUtils;
+    public Page<Map<String, Object>> getList(JgScrapCancelDto dto, Page<Map<String, Object>> page , List<String> roleIds) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        String orgCode = reginParams.getCompany().getCompanyCode();
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds, orgCode);
+        listPage.getRecords().forEach(item -> {
+            if (item.containsKey("auditStatus") && Objects.nonNull(item.get("auditStatus"))) {
+                String noticeStatusDesc = FlowStatusEnum.getNameByType(Long.valueOf(item.get("auditStatus").toString()));
+                item.put("auditStatusDesc", noticeStatusDesc);
+            }
+        });
+        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);
+    }
+
+
+
+
+
+
+    private void convertField(JgScrapCancelDto model) {
+        // 处理图片
+        if (!ValidationUtil.isEmpty(model.getCancelCertificateList())) {
+            model.setCancelCertificate(JSON.toJSONString(model.getCancelCertificateList()));
+        }
+        String receiveOrgId = model.getReceiveOrgCode();
+        if (!ObjectUtils.isEmpty(receiveOrgId)) {
+            String[] receiveOrgIdList = receiveOrgId.split("_");
+            if (receiveOrgIdList.length > 1) {
+                model.setReceiveOrgCode(receiveOrgIdList[0]);
+                model.setReceiveOrgName(receiveOrgIdList[1]);
+            }
+        }
+    }
+
+
+
+
+    @SuppressWarnings({"Duplicates", "rawtypes"})
+    @Transactional(rollbackFor = Exception.class)
+    public void save(String submitType, Map<String, JgScrapCancelDto> jgInstallationNoticeDtoMap) {
+        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        String[] taskName = new String[]{"流程结束"};
+        JgScrapCancelDto model = jgInstallationNoticeDtoMap.get("jgScrapCancelAdd");
+        // 字段转换
+        convertField(model);
+        // 获取告知设备列表
+        List<Map<String, Object>> deviceList = model.getDeviceList();
+        if (CollectionUtils.isEmpty(deviceList)) {
+            return;
+        }
+        // 获取告知单号
+        List<String> applyNoList = iCreateCodeService.createApplicationFormCode(ApplicationFormTypeEnum.SBZX.getCode(), deviceList.size());
+        if (CollectionUtils.isEmpty(applyNoList)) {
+            return;
+        }
+
+        ArrayList<String> roleListFirst = new ArrayList<>();
+        ArrayList<String> roleListSecond = new ArrayList<>();
+        // 判断当前是否为提交
+        List<String> instanceIdList = new ArrayList<>();
+        if ("1".equals(submitType)) {
+            // 发起流程
+            // ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+            ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+            List<ActWorkflowStartDTO> list = new ArrayList<>();
+            for (int i = 0; i<deviceList.size() ; i++
+            ) {
+                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+                dto.setProcessDefinitionKey("scrapCancel");
+                dto.setBusinessKey(String.valueOf(i));
+                list.add(dto);
+            }
+            actWorkflowBatchDTO.setProcess(list);
+            try {
+                FeignClientResult result = Workflow.taskV2Client.startByVariableBatch(actWorkflowBatchDTO);
+                List<Object> returnList = (List<Object>) result.getResult();
+                for (Object obj :returnList) {
+                    JSONObject jsonObject =  JSON.parseObject(JSONObject.toJSONString(obj));
+                    String instanceId = jsonObject.getString("id");
+                    instanceIdList.add(instanceId);
+                    // 查询下节点任务
+                    if(returnList.get(0).equals(obj)) {
+                        getNext(roleListFirst, instanceId,taskName);
+                    }
+                    // 推动下一个节点
+                    AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+                    JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+                    String taskId = dataObject.getString("id");
+                    //组装信息
+                    TaskResultDTO dto = new TaskResultDTO();
+                    dto.setResultCode("approvalStatus");
+                    dto.setTaskId(taskId);
+                    dto.setComment("提交流程");
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("approvalStatus", "0");
+                    dto.setVariable(map);
+                    //执行流程
+                    AjaxResult ajaxResult1 = null;
+                    try {
+                        ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
+                        if (ajaxResult1.get("code").equals(200)) {
+                            getNext(roleListSecond, instanceId,taskName);
+                        } else {
+                            log.error("提交失败");
+                        }
+                    } catch (Exception e) {
+                        log.error("提交失败：{}", e);
+                    }
+                }
+            } catch (Exception e) {
+                log.error("提交失败：{}", e);
+            }
+        }
+
+        List<JgScrapCancel> list = new ArrayList<>();
+        List<JgScrapCancelEq> equipList = new ArrayList<>();
+        deviceList.forEach(obj -> {
+            JgScrapCancelEq jgRelationEquip = new JgScrapCancelEq();
+            JgScrapCancel dto = new JgScrapCancel();
+            BeanUtils.copyProperties(model, dto);
+            int i = deviceList.indexOf(obj);
+            String applyNo = applyNoList.get(i);
+            dto.setApplyNo(applyNo);
+            dto.setCreateDate(new Date());
+            dto.setNextExecuteIds(String.join(",", roleListSecond));
+            dto.setInstanceStatus(String.join(",", roleListFirst));
+            dto.setPromoter(reginParams.getUserModel().getUserId());
+            dto.setStatus(taskName[0]);
+            jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
+            jgRelationEquip.setEquipTransferId(applyNo);
+            if (!CollectionUtils.isEmpty(instanceIdList)) {
+                dto.setInstanceId(instanceIdList.get(i));
+                dto.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+            } else {
+                dto.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            }
+            list.add(dto);
+            equipList.add(jgRelationEquip);
+        });
+        this.saveBatch(list);
+        List<JgScrapCancelEq> jgScrapCancelEqList = equipList.stream().map(t -> {
+            List<JgScrapCancel> collect = list.stream().filter(item -> t.getEquipTransferId().equals(item.getApplyNo())).collect(Collectors.toList());
+            Long sequenceNbr = collect.get(0).getSequenceNbr();
+            return t.setEquipTransferId(String.valueOf(sequenceNbr));
+        }).collect(Collectors.toList());
+        jgScrapCancelEqService.saveBatch(jgScrapCancelEqList);
+    }
+
+
+
+
+
+
+
+    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<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
+        lambda.eq(JgScrapCancel::getSequenceNbr, id);
+        JgScrapCancel jgScrapCancel = this.getBaseMapper().selectOne(lambda);
+        if ("流程结束".equals(taskName)) {
+            jgScrapCancel.setStatus(taskName);
+            jgScrapCancel.setAuditStatus("已完成");
+        } else {
+            jgScrapCancel.setNextExecuteIds(role);
+            jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
+            if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
+                jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + role);
+            } else {
+                jgScrapCancel.setInstanceStatus(role);
+            }
+            CancelFlowStatusEnum message = CancelFlowStatusEnum.getMessage(taskName);
+            jgScrapCancel.setStatus(message.getPass());
+        }
+        if (rollBack){
+            this.getBaseMapper().update(jgScrapCancel, lambda);
+            this.getBaseMapper().updatePromoter(jgScrapCancel.getSequenceNbr());
+        }else {
+            this.getBaseMapper().update(jgScrapCancel, lambda);
+        }
+    }
+
+    public void withdraw(String instanceId) {
+        String taskName = "";
+        JgScrapCancel jgScrapCancel = new JgScrapCancel();
+        LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
+        lambda.eq(JgScrapCancel::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)) {
+            CancelFlowStatusEnum message = CancelFlowStatusEnum.getMessage(taskName);
+            jgScrapCancel.setStatus(message.getPass());
+        }
+
+        String join = String.join(",", roleList);
+        JgScrapCancel jgScrapCancel1 = this.getBaseMapper().selectOne(lambda);
+        this.updateStatus(jgScrapCancel1.getSequenceNbr(), instanceId, taskName, join, true);
+    }
+
+    public void deleteBatch(List<Long> ids) {
+        JgScrapCancel jgScrapCancel = new JgScrapCancel();
+        jgScrapCancel.setIsDelete(true);
+        LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
+        lambda.in(JgScrapCancel::getSequenceNbr, ids);
+        this.update(jgScrapCancel, 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;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public JgScrapCancelDto updateInfo(String submitType, JgScrapCancelDto jgScrapCancelDto, String op) {
+        if (Objects.isNull(jgScrapCancelDto) || StringUtils.isEmpty(submitType)) {
+            throw new IllegalArgumentException("参数不能为空");
+        }
+        String[] taskName = new String[]{"流程结束"};
+        // 字段转换
+        this.convertField(jgScrapCancelDto);
+        ArrayList<String> roleListFirst = new ArrayList<>();
+        ArrayList<String> roleListSecond = new ArrayList<>();
+        if ("1".equals(submitType)) {
+            AjaxResult ajaxResult;
+            // 发起流程
+            if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
+                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+                dto.setProcessDefinitionKey("scrapCancel");
+                dto.setBusinessKey("1");
+                try {
+                    ajaxResult = Workflow.taskClient.startByVariable(dto);
+                    String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
+                    jgScrapCancelDto.setInstanceId(instanceId);
+                    // 查询下节点任务
+                    getNext(roleListFirst, instanceId, taskName);
+                    jgScrapCancelDto.setInstanceStatus(String.join(",", roleListFirst));
+                } catch (Exception e) {
+                    log.error("提交失败：{}", e);
+                }
+            }
+            JgScrapCancel jgScrapCancel = new JgScrapCancel();
+            BeanUtils.copyProperties(jgScrapCancelDto, jgScrapCancel);
+            boolean submit = submit(jgScrapCancel, op);
+            if (submit) {
+                // 查询下节点任务
+                getNext(roleListSecond, jgScrapCancel.getInstanceId(), taskName);
+                jgScrapCancel.setStatus(taskName[0]);
+                if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus())) {
+                    jgScrapCancel.setInstanceStatus(jgScrapCancel.getInstanceStatus() + "," + roleListSecond);
+                } else {
+                    jgScrapCancel.setInstanceStatus(String.join(",", roleListSecond));
+                }
+                jgScrapCancel.setPromoter(RequestContext.getExeUserId());
+                jgScrapCancel.setNextExecuteIds(String.join(",", roleListSecond));
+                jgScrapCancel.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                this.updateById(jgScrapCancel);
+            }
+        } else {
+            JgScrapCancel bean = new JgScrapCancel();
+            BeanUtils.copyProperties(jgScrapCancelDto, bean);
+            this.updateById(bean);
+        }
+        return jgScrapCancelDto;
+    }
+
+
+    public boolean submit(JgScrapCancel notice, String op) {
+
+        AjaxResult ajaxResult = Workflow.taskClient.getTask(notice.getInstanceId());
+        JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+        String taskId = dataObject.getString("id");
+        //组装信息
+        TaskResultDTO dto = new TaskResultDTO();
+        dto.setResultCode("approvalStatus");
+        dto.setTaskId(taskId);
+        dto.setComment("提交流程");
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("approvalStatus", op);
+        dto.setVariable(map);
+        //执行流程
+        AjaxResult ajaxResult1 = null;
+        try {
+            ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
+            if (ajaxResult1.get("code").equals(200)) {
+                return true;
+            } else {
+                return false;
+            }
+        } catch (Exception e) {
+            log.error("提交失败：{}", e);
+            return false;
+        }
+    }
+
+    void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
+        AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
+        JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
+        if (!ObjectUtils.isEmpty(taskNoAuth)) {
+            String nextTaskId = taskNoAuth.getString("id");
+            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+            taskName[0] = taskNoAuth.getString("name");
+            JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+            for (Object datum : data) {
+                if (((Map) datum).containsKey("groupId")) {
+                    roleListFirst.add(((Map) datum).get("groupId").toString());
+                }
+            }
+        }
+    }
+
+    public Map<String, Object> queryBySequenceNbr(Long sequenceNbr) {
+        // 安装告知信息
+        JgScrapCancel notice = this.baseMapper.selectById(sequenceNbr);
+        if (Objects.isNull(notice)) {
+            return null;
+        }
+        Map<String, Object> installationInfo = BeanUtil.beanToMap(notice);
+        installationInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
+
+        installationInfo.put("cancelCertificateList", JSON.parseArray(installationInfo.get("cancelCertificate").toString()));
+
+        // 设备信息
+        Map<String, Object> equipmentInfos = this.baseMapper.queryEquipInformation(sequenceNbr);
+        BeanUtil.copyProperties(installationInfo, equipmentInfos);
+        return new HashMap<String, Object>() {{
+            this.put("jgScrapCancelAdd", equipmentInfos);
+//            this.put("equipmentInfo", equipmentInfos);
+        }};
     }
 }
\ 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/JgTransferNoticeServiceImpl.java

@@ -2,29 +2,25 @@ 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.aspose.words.SaveFormat;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 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.ByteArrayMultipartFile;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
-import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.SupervisoryCodeInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
@@ -49,13 +45,11 @@ import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.text.ParseException;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -291,9 +285,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
-
+        String[] taskName = new String[]{"流程结束"};
         // 字段转换
         this.convertField(noticeDto);
+        ArrayList<String> roleListFirst = new ArrayList<>();
+        ArrayList<String> roleListSecond = new ArrayList<>();
         noticeDto.setPromoter(reginParams.getUserModel().getUserId());
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             AjaxResult ajaxResult;
@@ -306,34 +302,32 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     ajaxResult = Workflow.taskClient.startByVariable(dto);
                     String instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
                     noticeDto.setInstanceId(instanceId);
+                    // 查询下节点任务
+                    getNext(roleListFirst, instanceId,taskName);
+                    noticeDto.setInstanceStatus(String.join(",", roleListFirst));
                 } catch (Exception e) {
                     log.error("提交失败：{}", e);
                 }
             }
 
-            ajaxResult = Workflow.taskClient.getTask(noticeDto.getInstanceId());
-            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> map = new HashMap<>();
-            map.put("approvalStatus", op);
-            taskResultDTO.setVariable(map);
-            //执行流程
-            AjaxResult ajaxResult1;
-            try {
-                ajaxResult1 = Workflow.taskClient.completeByTask(taskId, taskResultDTO);
-                if (ajaxResult1.get("code").equals(200)) {
-                    noticeDto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-                    JgTransferNotice bean = new JgTransferNotice();
-                    BeanUtils.copyProperties(noticeDto, bean);
-                    jgTransferNoticeMapper.updateById(bean);
+            JgTransferNotice notice = new JgTransferNotice();
+            BeanUtils.copyProperties(noticeDto,notice);
+
+            boolean submit = submit(notice, op);
+
+            if(submit) {
+                // 查询下节点任务
+                getNext(roleListSecond, notice.getInstanceId(),taskName);
+                notice.setStatus(taskName[0]);
+                if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
+                    notice.setInstanceStatus(notice.getInstanceStatus() + "," + roleListSecond);
+                } else {
+                    notice.setInstanceStatus(String.join(",", roleListSecond));
                 }
-            } catch (Exception e) {
-                log.error("提交失败：{}", e);
+                notice.setPromoter(RequestContext.getExeUserId());
+                notice.setNextExecuteIds(String.join(",", roleListSecond));
+                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                jgTransferNoticeMapper.updateById(notice);
             }
         } else {
             JgTransferNotice bean = new JgTransferNotice();
@@ -342,7 +336,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         }
         return noticeDto;
     }
-    
+
     /**
      * 分页查询
      */
@@ -380,6 +374,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public void saveNotice(String submitType, Map<String, JgTransferNoticeDto> jgTransferNoticeDtoMap, ReginParams reginParams) {
+        String[] taskName = new String[]{"流程结束"};
         JgTransferNoticeDto model = jgTransferNoticeDtoMap.get(TABLE_PAGE_ID);
         // 字段转换
         convertField(model);
@@ -396,6 +391,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             return;
         }
 
+        ArrayList<String> roleListFirst = new ArrayList<>();
+        ArrayList<String> roleListSecond = new ArrayList<>();
         // 判断当前是否为提交
         List<String> instanceIdList = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
@@ -408,7 +405,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
                 dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
                 dto.setBusinessKey(String.valueOf(i));
-                dto.setCompleteFirstTask(true);
+//                dto.setCompleteFirstTask(true);
                 list.add(dto);
             }
             actWorkflowBatchDTO.setProcess(list);
@@ -419,11 +416,39 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                 for (Object obj : returnList
                 ) {
                     JSONObject jsonObject = JSON.parseObject(JSONObject.toJSONString(obj));
-                    instanceIdList.add(jsonObject.getString("id"));
+                    String instanceId = jsonObject.getString("id");
+                    instanceIdList.add(instanceId);
+                    // 查询下节点任务
+                    if(returnList.get(0).equals(obj)) {
+                        getNext(roleListFirst, instanceId,taskName);
+                    }
+                    // 推动下一个节点
+                    AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
+                    JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+                    String taskId = dataObject.getString("id");
+                    //组装信息
+                    TaskResultDTO dto = new TaskResultDTO();
+                    dto.setResultCode("approvalStatus");
+                    dto.setTaskId(taskId);
+                    dto.setComment("提交流程");
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("approvalStatus", "0");
+                    dto.setVariable(map);
+                    //执行流程
+                    AjaxResult ajaxResult1 = null;
+                    try {
+                        ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
+                        if (ajaxResult1.get("code").equals(200)) {
+                            getNext(roleListSecond, instanceId,taskName);
+                        } else {
+                            log.error("提交失败");
+                        }
+                    } catch (Exception e) {
+                        log.error("提交失败：{}", e);
+                    }
                 }
-
             } catch (Exception e) {
-                e.printStackTrace();
+                log.error("提交失败：{}", e);
             }
         }
 
@@ -438,6 +463,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             dto.setPromoter(reginParams.getUserModel().getUserId());
             dto.setApplyNo(applyNo);
             dto.setNoticeDate(new Date());
+            dto.setNextExecuteIds(String.join(",", roleListSecond));
+            dto.setInstanceStatus(String.join(",", roleListFirst));
+            dto.setPromoter(reginParams.getUserModel().getUserId());
+            dto.setStatus(taskName[0]);
             dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
             dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
             jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
@@ -575,11 +604,17 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     }
 
     public void cancel(JgTransferNoticeDto noticeDto) {
+        String[] taskName = new String[]{"流程结束"};
         FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
-        JgTransferNotice JgTransferNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
-        if (ajaxResult.getStatus() == 200) {
-            JgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
-            jgTransferNoticeMapper.updateById(JgTransferNotice);
+        JgTransferNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
+        ArrayList<String> roleList = new ArrayList<>();
+        if(ajaxResult.getStatus() == 200) {
+            getNext(roleList, noticeDto.getInstanceId(),taskName);
+            jgInstallationNotice.setStatus(taskName[0]);
+            jgInstallationNotice.setPromoter("");
+            jgInstallationNotice.setNextExecuteIds(String.join(",", roleList));
+            jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            jgTransferNoticeMapper.updateById(jgInstallationNotice);
         }
     }
 
@@ -631,7 +666,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         if(submit) {
             jgTransferNotice.setPromoter(reginParams.getUserModel().getUserId());
             if("0".equals(op)) {
-                jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.HAVE_PROCESSED.getCode()));
+                jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
 //                this.generateMaintainNoticeReport(JgTransferNotice.getSequenceNbr());
             } else {
                 jgTransferNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
@@ -659,4 +694,20 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 //            prefix = ObjectUtils.isEmpty(elevatorMap) ? equipmentCategoryMapper.getAdministrativeDivision(EquipmentCategoryEnum.XZQHDT.getCode(), dto.getCity()).get("code").toString() : elevatorMap.get("code").toString();
 //        }
     }
+
+    void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
+        AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
+        JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
+        if (!ObjectUtils.isEmpty(taskNoAuth)) {
+            String nextTaskId = taskNoAuth.getString("id");
+            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
+            taskName[0] = taskNoAuth.getString("name");
+            JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
+            for (Object datum : data) {
+                if (((Map) datum).containsKey("groupId")) {
+                    roleListFirst.add(((Map) datum).get("groupId").toString());
+                }
+            }
+        }
+    }
 }
\ No newline at end of file

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

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
-import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.GroupModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;

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

@@ -11,23 +11,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.enums.WorkFlowEnum;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.*;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.DocumentEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.ResultStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.*;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionApplicationService;
-import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.jyjc.biz.feign.JgFeignClient;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.handler.JyjcInspectionApplicationHandlerFactory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.service.ICreateCodeService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.workflow.Workflow;

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 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.netflix.loadbalancer.RetryRule;
 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.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
-import com.yeejoin.amos.boot.module.jyjc.api.common.CommonConstants;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
-import com.yeejoin.amos.boot.module.jyjc.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcGeographicModel;
@@ -30,6 +25,7 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseUnitLicenceMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
@@ -45,7 +41,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.thymeleaf.expression.Ids;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -53,10 +48,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 

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

-package com.yeejoin.amos.boot.module.jyjc.api.enums;
+package com.yeejoin.amos.boot.module.ymt.api.enums;
+
+import lombok.Getter;
 
 /**
- * 办理状态枚举
+ * 流程办理状态统一枚举
  */
-public enum  FlowStatusEnum {
-
+@Getter
+public enum FlowStatusEnum {
     /**
      * 待提交
      */
-    TO_BE_SUBMITTED(6610, "未提交"),
-    /**
-     * 已提交
-     */
-    SUBMITTED(6611, "已提交"),
+    TO_BE_SUBMITTED(6610, "待提交"),
+
     /**
      * 待受理
      */
     TO_BE_PROCESSED(6612, "待受理"),
-    /**
-     * 已办理
-     */
-    HAVE_PROCESSED(6613, "已办理"),
 
     /**
      * 已驳回
@@ -60,11 +55,4 @@ public enum  FlowStatusEnum {
         return name;
     }
 
-    public int getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
 }
\ No newline at end of file

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

@@ -31,6 +31,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
     private static final String LOCK_KEY_SUPERVISORY = "sequence_lock_supervisory";
     private static final String SEQUENCE_TYPE_UR = "%05d";
     private static final String SEQUENCE_TYPE = "%07d";
+    private static final long LOCK_EXPIRATION_SECONDS = 60;
     private final RedisTemplate<String, String> redisTemplate;
     private String rulePrefix = "";
 
@@ -140,7 +141,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
      */
     public List<String> generateBatchSequence(String sequenceKey, int batchSize) {
         // 使用分布式锁，确保在并发情况下只有一个线程能够生成顺序码
-        Boolean lockAcquired = redisTemplate.opsForValue().setIfAbsent(LOCK_KEY_AF, LOCK_VALUE);
+        Boolean lockAcquired = obtainLock(LOCK_KEY_AF);
         if (Boolean.TRUE.equals(lockAcquired)) {
             try {
                 // 获取当前顺序码
@@ -166,7 +167,7 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
 
                 return sequenceList;
             } finally {
-                redisTemplate.delete(LOCK_KEY_AF);
+                releaseLock(LOCK_KEY_AF);
             }
         } else {
             // 获取锁失败，可以选择重试或采取其他策略
@@ -309,7 +310,12 @@ public class GenerateCodeServiceImpl implements IGenerateCodeService {
      * @return bool
      */
     private Boolean obtainLock(String lockKey) {
-        return redisTemplate.opsForValue().setIfAbsent(lockKey, LOCK_VALUE);
+        Boolean lockAcquired = redisTemplate.opsForValue().setIfAbsent(lockKey, LOCK_VALUE);
+        if (lockAcquired != null && lockAcquired) {
+            redisTemplate.expire(lockKey, LOCK_EXPIRATION_SECONDS, TimeUnit.SECONDS);
+        }
+
+        return lockAcquired;
     }
 
     /**