21052 单位变更限制设备不能多次出现在执行的流程中

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

@@ -33,7 +33,7 @@ public interface IJgChangeRegistrationUnitService {
      * @param noticeDto 安装告知
      * @param op        操作类型
      */
-    JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op);
+    JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op, ReginParams reginParams);
 
     /**
      * 分页查询

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

@@ -3,34 +3,30 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 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 com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
-import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
 /**
  * 单位变更登记
  *
@@ -45,161 +41,165 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @Autowired
     JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
     @Autowired
-	CommonServiceImpl commonService;
-
-	/**
-	 * 新增
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
-	public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
-		ReginParams reginParams = getSelectedOrgInfo();
-
-		jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams);
-		return ResponseHelper.buildResponse("");
-	}
-
-	/**
-	 * 根据sequenceNbr更新
-	 *
-	 * @param model 单位变更
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/update")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新单位变更", notes = "根据sequenceNbr更新单位变更")
-	public ResponseModel<JgChangeRegistrationUnitDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
-		JgChangeRegistrationUnitDto jgChangeRegistrationUnitDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
-		if (Objects.isNull(jgChangeRegistrationUnitDto)) {
-			throw new IllegalArgumentException("参数installationInfo不能为空");
-		}
-		Object o = ((LinkedHashMap<?, ?>) model.get("changeRegisInfo")).get("changeCertificateList");
-		jgChangeRegistrationUnitDto.setChangeCertificateList((List<Map<String, Object>>) o);
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType,jgChangeRegistrationUnitDto, op));
-	}
-
-	/**
-	 * 根据sequenceNbr删除
-	 *
-	 * @param sequenceNbr 主键
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@DeleteMapping(value = "/delete")
-	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除单位变更", notes = "根据sequenceNbr删除单位变更")
-	public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-		jgChangeRegistrationUnitServiceImpl.deleteForBatch(new Long[]{sequenceNbr});
-		return ResponseHelper.buildResponse(Boolean.TRUE);
-	}
-
-	/**
-	 * 根据sequenceNbr批量删除
-	 *
-	 * @param sequenceNbrs 主键
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@DeleteMapping(value = "/batchDelete")
-	@ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
-	public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
-		try {
-			return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.deleteForBatch(sequenceNbrs));
-		} catch (Exception e) {
-			return CommonResponseUtil.failure(e.getMessage());
-		}
-	}
-
-	/**
-	 * 根据sequenceNbr查询
-	 *
-	 * @param sequenceNbr 主键
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/details")
-	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
-	public ResponseModel<Map<String,
-			Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
-	}
-
-
-	/**
-	 * 列表分页查询
-	 *
-	 * @param current 当前页
-	 * @param current 每页大小
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/page")
-	@ApiOperation(httpMethod = "POST", value = "单位变更分页查询", notes = "单位变更分页查询")
-	public ResponseModel<Page<JgChangeRegistrationUnitDto>> queryForPage(
-			@ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
-			@ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int size,
-			@ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
-			@ApiParam(value = "排序字段",required = false) @RequestParam(value = "sort",required = false) String sort,
-			@RequestBody(required = false) JgChangeRegistrationUnitDto model
-	) {
-		Page<JgChangeRegistrationUnit> page = new Page<>(current, size);
-		ReginParams reginParams = getSelectedOrgInfo();
-		 ReginParams info = getSelectedOrgInfo();
-		if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
-			type = "enterprise";
-		}else {
-			type = "supervision";
-		}
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page,sort, model, type, reginParams));
-	}
-
-	/**
-	 * 撤销
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/cancel")
-	@ApiOperation(httpMethod = "POST", value = "单位变更撤销", notes = "单位变更撤销")
-	public ResponseModel<JgChangeRegistrationUnitDto> cancel(@RequestBody Map<String, Object> model) {
-		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
-		if (Objects.isNull(installationInfo)) {
-			throw new IllegalArgumentException("参数installationInfo不能为空");
-		}
-		jgChangeRegistrationUnitServiceImpl.cancel(installationInfo);
-		return ResponseHelper.buildResponse(installationInfo);
-	}
-
-	/**
-	 * 受理
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/accept")
-	@ApiOperation(httpMethod = "POST", value = "单位变更受理", notes = "单位变更受理")
-	public ResponseModel<JgChangeRegistrationUnitDto> accept(@RequestBody Map<String, Object> model, String op) {
-		// TODO 受理单位变更流程
-		LinkedHashMap model1 = (LinkedHashMap)model.get("changeRegisInfo");
-		String opinion = (String)model.get("opinion");
-		LinkedHashMap installationInfo = (LinkedHashMap)model1.get("changeRegisInfo");
-		JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
-		jgInstallationNoticeDto.setProcessAdvice(opinion);
-		jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto,op);
-		return ResponseHelper.buildResponse(null);
-	}
-
-
-	/**
-	 * 导出使用登记证
-	 * @param response 返回
-	 * @param sequenceNbr 主键
-	 * @param printType 打印类型，0-正常打印，1-套打（默认0）
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/export")
-	@ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
-	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
-							   @RequestParam(value = "printType", defaultValue = "0") String printType) {
-		jgChangeRegistrationUnitServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
-	}
+    CommonServiceImpl commonService;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
+    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams);
+        return ResponseHelper.buildResponse("");
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param model 单位变更
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/update")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新单位变更", notes = "根据sequenceNbr更新单位变更")
+    public ResponseModel<JgChangeRegistrationUnitDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
+        JgChangeRegistrationUnitDto jgChangeRegistrationUnitDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+        if (Objects.isNull(jgChangeRegistrationUnitDto)) {
+            throw new IllegalArgumentException("参数installationInfo不能为空");
+        }
+        Object o = ((LinkedHashMap<?, ?>) model.get("changeRegisInfo")).get("changeCertificateList");
+        jgChangeRegistrationUnitDto.setChangeCertificateList((List<Map<String, Object>>) o);
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType, jgChangeRegistrationUnitDto, op, reginParams));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除单位变更", notes = "根据sequenceNbr删除单位变更")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+        jgChangeRegistrationUnitServiceImpl.deleteForBatch(new Long[]{sequenceNbr});
+        return ResponseHelper.buildResponse(Boolean.TRUE);
+    }
+
+    /**
+     * 根据sequenceNbr批量删除
+     *
+     * @param sequenceNbrs 主键
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/batchDelete")
+    @ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
+    public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
+        try {
+            return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.deleteForBatch(sequenceNbrs));
+        } catch (Exception e) {
+            return CommonResponseUtil.failure(e.getMessage());
+        }
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/details")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
+    public ResponseModel<Map<String,
+            Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
+    }
+
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/page")
+    @ApiOperation(httpMethod = "POST", value = "单位变更分页查询", notes = "单位变更分页查询")
+    public ResponseModel<Page<JgChangeRegistrationUnitDto>> queryForPage(
+            @ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
+            @ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int size,
+            @ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
+            @ApiParam(value = "排序字段", required = false) @RequestParam(value = "sort", required = false) String sort,
+            @RequestBody(required = false) JgChangeRegistrationUnitDto model
+    ) {
+        Page<JgChangeRegistrationUnit> page = new Page<>(current, size);
+        ReginParams reginParams = getSelectedOrgInfo();
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
+            type = "enterprise";
+        } else {
+            type = "supervision";
+        }
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page, sort, model, type, reginParams));
+    }
+
+    /**
+     * 撤销
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/cancel")
+    @ApiOperation(httpMethod = "POST", value = "单位变更撤销", notes = "单位变更撤销")
+    public ResponseModel<JgChangeRegistrationUnitDto> cancel(@RequestBody Map<String, Object> model) {
+        JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+        if (Objects.isNull(installationInfo)) {
+            throw new IllegalArgumentException("参数installationInfo不能为空");
+        }
+        ReginParams reginParams = getSelectedOrgInfo();
+        jgChangeRegistrationUnitServiceImpl.cancel(installationInfo);
+        return ResponseHelper.buildResponse(installationInfo);
+    }
+
+    /**
+     * 受理
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/accept")
+    @ApiOperation(httpMethod = "POST", value = "单位变更受理", notes = "单位变更受理")
+    public ResponseModel<JgChangeRegistrationUnitDto> accept(@RequestBody Map<String, Object> model, String op) {
+        // TODO 受理单位变更流程
+        LinkedHashMap model1 = (LinkedHashMap) model.get("changeRegisInfo");
+        String opinion = (String) model.get("opinion");
+        LinkedHashMap installationInfo = (LinkedHashMap) model1.get("changeRegisInfo");
+        JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
+        jgInstallationNoticeDto.setProcessAdvice(opinion);
+        ReginParams reginParams = getSelectedOrgInfo();
+        jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto, op, reginParams);
+        return ResponseHelper.buildResponse(null);
+    }
+
+
+    /**
+     * 导出使用登记证
+     *
+     * @param response    返回
+     * @param sequenceNbr 主键
+     * @param printType   打印类型，0-正常打印，1-套打（默认0）
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/export")
+    @ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
+    public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
+                               @RequestParam(value = "printType", defaultValue = "0") String printType) {
+        jgChangeRegistrationUnitServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
+    }
 
 }

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

@@ -29,7 +29,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 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.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
@@ -68,6 +67,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PROCESS_DEFINITION_KEY = "unitChange";
     private static final String TABLE_PAGE_ID = "1734141426742095873";
+    private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
 
 
     @Autowired
@@ -246,7 +246,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * @param noticeDto 单位变更
      */
     @GlobalTransactional(rollbackFor = Exception.class)
-    public JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op) {
+    public JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op, ReginParams reginParams) {
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -273,7 +273,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         ArrayList<String> roleListAll = new ArrayList<>();
         ArrayList<String> roleListNext = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            AjaxResult ajaxResult;
             // 发起流程
             if (!StringUtils.hasText(noticeDto.getInstanceId())) {
                 List<ProcessTaskDTO> processTasks = new ArrayList<>();
@@ -295,12 +294,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
 
                 JgChangeRegistrationUnit notice = new JgChangeRegistrationUnit();
-                //    JgChangeRegistrationUnit noticeOld = JgChangeRegistrationUnitMapper.selectById(noticeDto.getSequenceNbr());
                 BeanUtils.copyProperties(noticeDto, notice);
-                //         boolean submit = submit(notice, op);
                 notice.setChangeCertificate(noticeDto.getChangeCertificate());
                 notice.setRemark(noticeDto.getRemark());
-                //  notice.setStatus(taskName[0]);
                 if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
                     notice.setInstanceStatus(notice.getInstanceStatus() + "," + roleListAll);
                 } else {
@@ -368,7 +364,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             BeanUtils.copyProperties(noticeDto, bean);
             JgChangeRegistrationUnitMapper.updateById(bean);
         }
-//        updateHistorySingle(noticeDto.getSequenceNbr());
         List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
         deviceList.forEach(device -> {
             JgChangeRegistrationUnitEq unitEq = new JgChangeRegistrationUnitEq();
@@ -396,14 +391,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         registrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
                 .eq(JgRegistrationHistory::getCurrentDocumentId, noticeDto.getApplyNo()));
         registrationHistoryService.save(jgRegistrationHistory);
-        return noticeDto;
-    }
 
-    private void updateHistorySingle(Long seq) {
-        QueryWrapper<JgChangeRegistrationUnitEq> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, seq);
-        List<JgChangeRegistrationUnitEq> eqs = jgChangeRegistrationUnitEqMapper.selectList(wrapper);
-        this.updateHistoryAsync(eqs);
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode()));
+        }
+        return noticeDto;
     }
 
 
@@ -421,7 +415,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                                                                   JgChangeRegistrationUnitDto model,
                                                                                   String type,
                                                                                   ReginParams reginParams) {
-
         String orgCode;
         orgCode = reginParams.getCompany().getCompanyCode();
         String companyType = reginParams.getCompany().getCompanyType();
@@ -529,7 +522,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
     @Override
-//    @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public List<JgChangeRegistrationUnitDto> saveNotice(String submitType, JSONObject map, ReginParams reginParams) {
         JgChangeRegistrationUnitDto model = BeanUtil.toBeanIgnoreError(map.get("changeRegisInfo"), JgChangeRegistrationUnitDto.class);
@@ -563,11 +555,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             throw new BadRequest("使用登记证下无设备");
         }
 
-        for (JSONObject jsonObject : deviceList) {
-            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode());
-        }
-
         // 获取单位变更单号
         ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.DWBG.getCode(), 1);
         List<String> applyNoList = listResponseModel.getResult();
@@ -576,7 +563,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             return new ArrayList<>();
         }
         ArrayList<String> roleListFirst = new ArrayList<>();
-//        ArrayList<String> roleListSecond = new ArrayList<>();
         List<String> instanceIdList = new ArrayList<>();
         List<String> nextExecutorUserIds = new ArrayList<>();
         List<String> taskIds = new ArrayList<>();
@@ -585,18 +571,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         // 判断当前是否为提交
         if (SUBMIT_TYPE_FLOW.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(PROCESS_DEFINITION_KEY);
             dto.setBusinessKey(String.valueOf(new Date().getTime()));
             dto.setNextExecuteUserCompanyCode(model.getReceiveCompanyCode());
             dto.setCompleteFirstTask(true);
             list.add(dto);
-//            }
             actWorkflowBatchDTO.setProcess(list);
             List<ProcessTaskDTO> processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
@@ -608,14 +590,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             }
         }
 
-//        List<JgChangeRegistrationUnit> list = new ArrayList<>();
-//        List<JgChangeRegistrationUnitEq> equipList = new ArrayList<>();
         String finalNextExecutorRoleIds = nextExecutorRoleIds;
         CompanyBo companyBo = commonServiceImpl.getOneCompany(model.getReceiveCompanyCode());
-//        deviceList.forEach(obj -> {
-//            JgChangeRegistrationUnitEq jgRelationEquip = new JgChangeRegistrationUnitEq();
-//            int i = deviceList.indexOf(obj);
-//            String applyNo = applyNoList.get(i);
         model.setApplyNo(applyNoList.get(0));
         model.setReceiveCompanyOrgCode(companyBo.getOrgCode());
         model.setCreateUserId(RequestContext.getExeUserId());
@@ -628,15 +604,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         model.setNewUseUnitName(reginParams.getCompany().getCompanyName());
         model.setNewUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
-//            dto.setEquType((String.valueOf(obj.get("EQU_CATEGORY"))));
-//            dto.setProductNameB((String.valueOf(obj.get("PRODUCT_NAME"))));
-//            dto.setEquCodeB((String.valueOf(obj.get("EQU_CODE"))));
-//            dto.setUseInnerCode(ValidationUtil.isEmpty(obj.get("USE_INNER_CODE")) ? "" : String.valueOf(obj.get("USE_INNER_CODE")));
-//            dto.setEquAddress((String.valueOf(obj.get("ADDRESS"))));
-//            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-//            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
-//            jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
-//            jgRelationEquip.setUnitChangeRegistrationId(applyNo);
         if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
             model.setNextExecuteUserIds(nextExecutorUserIds.get(0));
         }
@@ -649,11 +616,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         if (!CollectionUtils.isEmpty(taskIds)) {
             model.setNextTaskId(taskIds.get(0));
         }
-//            list.add(dto);
-//            equipList.add(jgRelationEquip);
-//        });
-
-//        WorkflowResultDto workDto = new WorkflowResultDto();
         model.setSequenceNbr(sequence.nextId());
         model.setCreateDate(new Date());
         model.setCreateUserName(reginParams.getUserModel().getRealName());
@@ -665,9 +627,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         List<TaskModelDto> modelDtos = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-//            for (JgChangeRegistrationUnit obj : list) {
             TaskModelDto taskModelDto = new TaskModelDto();
-
             TaskMessageDto ta = new TaskMessageDto();
             ta.setInstanceId(registrationUnit.getInstanceId());
             ta.setStatus(registrationUnit.getStatus());
@@ -676,7 +636,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             ta.setSequenceNbr(registrationUnit.getSequenceNbr());
             ta.setNextTaskId(registrationUnit.getNextTaskId());
             taskModelDto.setModel(ta);
-            // dto.setModel(obj);
             taskModelDto.setFlowCreateDate(new Date());
             taskModelDto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
             taskModelDto.setFlowCode(registrationUnit.getNextTaskId());
@@ -695,9 +654,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setStartDate(new Date());
             taskModelDto.setNextExecuteUser(workflowResultDtos.get(0).getNextExecutorRoleIds());
             modelDtos.add(taskModelDto);
-//            }
         } else {
-//            for (JgChangeRegistrationUnit obj : list) {
             TaskModelDto taskModelDto = new TaskModelDto();
             //行数据
             taskModelDto.setModel(registrationUnit);
@@ -712,11 +669,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             modelDtos.add(taskModelDto);
 //            }
         }
-
-//        for(JgChangeRegistrationUnit obj : list) {
         commonServiceImpl.saveExecuteFlowData2Redis(registrationUnit.getInstanceId(), buildInstanceRuntimeData(registrationUnit));
-//        }
-
         commonServiceImpl.buildTaskModel(modelDtos);
 
         List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
@@ -738,12 +691,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         jgRegistrationHistory.setCurrentDocumentId(registrationUnit.getApplyNo());
         //使用登记证历史数据
         jgRegistrationHistory.setChangeData(JSONObject.toJSONString(registrationList));
-//        List<JgChangeRegistrationUnitEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
-//            List<JgChangeRegistrationUnit> collect = list.stream().filter(jgChangeRegistrationUnit -> jgRelationEquip.getUnitChangeRegistrationId().equals(jgChangeRegistrationUnit.getApplyNo())).collect(Collectors.toList());
-//            Long sequenceNbr = collect.get(0).getSequenceNbr();
-//            insertOrUpdateHis(JSON.parseObject(JSONObject.toJSONString(collect.get(0))), jgRelationEquip.getEquId());
-//            return jgRelationEquip.setUnitChangeRegistrationId(String.valueOf(sequenceNbr));
-//        }).collect(Collectors.toList());
         //先删除之前设备关系数据，在插入最新设备关系数据
         registrationUnitEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgChangeRegistrationUnitEq>()
                 .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registrationUnit.getSequenceNbr()));
@@ -752,6 +699,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         registrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
                 .eq(JgRegistrationHistory::getCurrentDocumentId, registrationUnit.getApplyNo()));
         registrationHistoryService.save(jgRegistrationHistory);
+
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
+            //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode()));
+        }
         return Collections.singletonList(model);
     }
 
@@ -776,25 +729,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
 
-    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");
-            FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
-            JSONObject result = nodeInfo.getResult();
-            Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
-            taskName[0] = String.valueOf(taskInfo.get("taskDefinitionKey"));
-            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-            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());
-                }
-            }
-        }
-    }
-
     private void convertField(JgChangeRegistrationUnitDto model) {
         // 处理图片
         if (!ValidationUtil.isEmpty(model.getChangeCertificateList())) {
@@ -834,38 +768,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
     }
 
-//    private String convertImageUrl(List<Map<String, String>> urlList) {
-//        String urls = "";
-//        if (!CollectionUtils.isEmpty(urlList)) {
-//            urls = urlList.stream().map(map -> map.get("url")).collect(Collectors.joining(","));
-//        }
-//        return urls;
-//    }
-//
-//    public void insertOrUpdateHis(JSONObject map, String equipId) {
-//        JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
-//        //使用登记编号
-//        jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
-//        //登记类别
-//        jgRegistrationHistory.setRegistrationClass("单位变更登记");
-//        //设备id
-//        jgRegistrationHistory.setEquId(equipId);
-//        //修改数据
-//        jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
-//        //设备监管码
-//        LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
-//        queryWrapper1.eq(OtherInfo::getRecord, equipId);
-//        OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
-//        jgRegistrationHistory.setSupervisoryCode(tzsJgOtherInfo.getSupervisoryCode());
-//        if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
-//            jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("sequenceNbr"))));
-//            jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
-//        } else {
-//            //当前单据id
-//            jgRegistrationHistory.setCurrentDocumentId(map.get("applyNo").toString());
-//            jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
-//        }
-//    }
 
     @GlobalTransactional(rollbackFor = Exception.class)
     public boolean submit(JgChangeRegistrationUnit notice, String op) {
@@ -925,24 +827,25 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
             // 待调整
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
-            JgChangeRegistrationUnit jgChangeRegistrationUnit = this.baseMapper.selectById(noticeDto.getSequenceNbr());
-            jgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
-            jgChangeRegistrationUnit.setPromoter("");
-            jgChangeRegistrationUnit.setNextTaskId(nextTaskId);
-            jgChangeRegistrationUnit.setNextExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
-            jgChangeRegistrationUnit.setNextExecutorIds(String.join(",", roleListNext));
-            JgChangeRegistrationUnitMapper.updateById(jgChangeRegistrationUnit);
-            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationUnit));
-            jsonObject.put("nextTaskId", jgChangeRegistrationUnit.getNextTaskId());
-            jsonObject.put("nextExecuteUser", jgChangeRegistrationUnit.getNextExecutorIds());
+            JgChangeRegistrationUnit changeUnit = this.baseMapper.selectById(noticeDto.getSequenceNbr());
+            changeUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
+            changeUnit.setPromoter("");
+            changeUnit.setNextTaskId(nextTaskId);
+            changeUnit.setNextExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
+            changeUnit.setNextExecutorIds(String.join(",", roleListNext));
+            JgChangeRegistrationUnitMapper.updateById(changeUnit);
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(changeUnit));
+            jsonObject.put("nextTaskId", changeUnit.getNextTaskId());
+            jsonObject.put("nextExecuteUser", changeUnit.getNextExecutorIds());
             jsonObject.put("taskType", BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
-            jsonObject.put("flowStatus", this.getTaskCodeByName(jgChangeRegistrationUnit.getStatus()));
-            jsonObject.put("flowStatusLabel", jgChangeRegistrationUnit.getStatus());
+            jsonObject.put("flowStatus", this.getTaskCodeByName(changeUnit.getStatus()));
+            jsonObject.put("flowStatusLabel", changeUnit.getStatus());
 
             commonServiceImpl.rollbackTask(noticeDto.getInstanceId(), jsonObject);
 
             // redis流程实时数据更新
-            commonServiceImpl.saveExecuteFlowData2Redis(noticeDto.getInstanceId(), this.buildInstanceRuntimeData(jgChangeRegistrationUnit));
+            commonServiceImpl.saveExecuteFlowData2Redis(noticeDto.getInstanceId(), this.buildInstanceRuntimeData(changeUnit));
+            this.delRepeatUseEquipData(changeUnit.getApplyNo(), changeUnit.getStatus(), changeUnit.getNewUseUnitCreditCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -960,9 +863,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 .build();
     }
 
-    //    @Transactional(rollbackFor = Exception.class)
+    /**
+     * @param dto
+     * @param op          void
+     * @param reginParams
+     * @description 执行流程
+     * @author wangguo
+     * @date 2024/7/18 11:00
+     **/
     @GlobalTransactional(rollbackFor = Exception.class)
-    public void accept(JgChangeRegistrationUnitDto dto, String op) {
+    public void accept(JgChangeRegistrationUnitDto dto, String op, ReginParams reginParams) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(dto.getInstanceId());
         RLock lock = redissonClient.getLock(lockKey);
         try {
@@ -979,12 +889,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             String taskId = dto.getNextTaskId();
             JgChangeRegistrationUnit registration = this.JgChangeRegistrationUnitMapper.selectById(dto.getSequenceNbr());
             registration.setProcessAdvice(dto.getProcessAdvice());
-            List<String> roleListNext = new ArrayList<>();
             List<String> roleListAll = new ArrayList<>();
             ArrayList<String> roleList = new ArrayList<>();
-//        boolean submit = submit(jgChangeRegistrationUnit, op);
-//        if (submit) {
-            // getNext(roleList, dto.getInstanceId(), taskName);
 
             //组装信息
             TaskResultDTO task = new TaskResultDTO();
@@ -1033,23 +939,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                             queryWrapper2.eq(UseInfo::getRecord, equipId);
                             UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
-//                            String code = commonServiceImpl.generateRegistrationCode(equipId, tzsJgOtherInfo.getSupervisoryCode(), dto.getReceiveCompanyCode());
                             if (ObjectUtils.isNotEmpty(useInfo)) {
                                 useInfo.setUseUnitName(registration.getNewUseUnitName());
                                 useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
-//                                if (ValidationUtil.isEmpty(code)) {
-//                                    log.error("生成新的使用登记证编号失败");
-//                                    return;
-//                                }
                                 useInfoMapper.updateById(useInfo);
-//                        jgChangeRegistrationUnit.setUseRegistCode(code);
                             }
-                            //更新使用注册登记证编号
-//                            idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equipId, code);
                             //es中的编号信息
                             Map<String, Map<String, Object>> resultMap = new HashMap<>();
                             Map<String, Object> map1 = new HashMap<>();
-//                            map1.put("USE_ORG_CODE", code);
                             map1.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
                             map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
                             resultMap.put(equipId, map1);
@@ -1106,6 +1003,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
             // redis流程实时数据更新
             commonServiceImpl.saveExecuteFlowData2Redis(dto.getInstanceId(), this.buildInstanceRuntimeData(registration));
+            this.delRepeatUseEquipData(registration.getApplyNo(), registration.getStatus(), registration.getNewUseUnitCreditCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
             throw new BadRequest("数据异常，请联系管理员");
@@ -1116,6 +1014,43 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
     }
 
+    /**
+     * 删除 redis校验重复引用设备的数据
+     */
+    private void delRepeatUseEquipData(String applyNo, String status, String companyCode) {
+        JgRegistrationHistory history = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, applyNo).one();
+        // 获取使用登记证列表
+        JSONArray registrationList = JSON.parseArray(history.getChangeData());
+        if (CollectionUtils.isEmpty(registrationList)) {
+            return;
+        }
+        List<Long> registrationIdList = new ArrayList<>();
+        //根据使用登记证查询设备
+        for (Object o : registrationList) {
+            JSONObject parseObject = JSON.parseObject(o.toString());
+            if (parseObject.containsKey("sequenceNbr") && ObjectUtils.isNotEmpty(parseObject.get("sequenceNbr")) &&
+                    canConvertToLong(parseObject.get("sequenceNbr").toString())) {
+                registrationIdList.add(Long.parseLong(parseObject.get("sequenceNbr").toString()));
+            }
+        }
+        if (CollectionUtils.isEmpty(registrationIdList)) {
+            return;
+        }
+        List<JSONObject> equList = registrationManageService.queryEquByCertificateSeqList(registrationIdList);
+        // 获取单位变更设备列表
+        if (CollectionUtils.isEmpty(equList)) {
+            return;
+        }
+        List<String> records = new ArrayList<>();
+        for (JSONObject jsonObject : equList) {
+            records.add(jsonObject.getString("SEQUENCE_NBR"));
+        }
+        if (NOT_FLOWING_STATE.contains(status)) {
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .delDataForCheckEquipRepeatUsed(records, companyCode);
+        }
+    }
+
     private Integer getTaskCodeByName(String auditStatus) {
         return commonServiceImpl.getDictionaryCodeByName(auditStatus);
     }
@@ -1181,12 +1116,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         queryWrapper1.eq(OtherInfo::getRecord, jgChangeRegistrationUnitEq.getEquId());
         OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
         exportParamsMap.put("supervisoryCode", tzsJgOtherInfo.getSupervisoryCode());
-
         getAuditPassedDate(transfer.getAuditPassDate(), exportParamsMap);
-
-        //设备使用地址
-
-
         //查询设备注册信息
         IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", jgChangeRegistrationUnitEq.getEquId()));
         if (!ValidationUtil.isEmpty(registerInfo)) {
@@ -1300,34 +1230,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         });
     }
 
-//    private void executeOneStep(JgChangeRegistrationUnit jgChangeRegistrationName, String taskName, String nextUserIds, String operate) {
-//        // 先更新之前的待办
-//        TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName, operate);
-//        TaskModelDto taskModelDto = new TaskModelDto();
-//        taskModelDto.setTaskDesc("");
-//        taskModelDto.setTaskContent(this.buildTaskContent(jgChangeRegistrationName));
-//        taskV2Model.setTaskName(taskName);
-//        taskModelDto.setTaskDesc("");
-//        taskModelDto.setTaskCode(jgChangeRegistrationName.getApplyNo());
-//        taskV2Model.setExecuteUserIds(nextUserIds);
-//        taskV2Model.setRelationId(jgChangeRegistrationName.getInstanceId());
-//        taskV2Model.setTaskStatus(this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
-//        taskV2Model.setTaskStatusLabel(jgChangeRegistrationName.getAuditStatus());
-//        taskV2Model.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
-//        taskModelDto.setStartUser(jgChangeRegistrationName.getCreateUserName());
-//        taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
-//        taskModelDto.setStartDate(jgChangeRegistrationName.getCreateDate());
-//        taskModelDto.setStartUserId(jgChangeRegistrationName.getCreateUserId());
-//        taskModelDto.setStartUserCompanyName(jgChangeRegistrationName.getUseUnitName());
-//        taskModelDto.setExecuteUserIds(nextUserIds);
-//        TaskModelDto modelDto = new TaskModelDto();
-//        BeanUtil.copyProperties(taskV2Model,modelDto);
-//        modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
-//        modelDto.setModel(jgChangeRegistrationName);
-//        // 再插入新代办、数据待定
-//        commonServiceImpl.buildTaskModel(Collections.singletonList(modelDto));
-//    }
-
     private void executeOneStep(JgChangeRegistrationUnit jgChangeRegistrationName, String taskName, String nextUserIds, String operate) {
         // 先更新之前的待办
         TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName, operate);
@@ -1342,12 +1244,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         taskV2Model.setTaskStatusLabel(jgChangeRegistrationName.getStatus());
         taskV2Model.setFlowStatus(this.getTaskStatusByName(jgChangeRegistrationName.getStatus()));
         taskV2Model.setFlowStatusLabel(jgChangeRegistrationName.getStatus());
-        //  taskV2Model.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
-        //  taskV2Model.setStartUser(jgChangeRegistrationName.getCreateUserName());
-        //  taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
-        //  taskV2Model.setStartDate(jgChangeRegistrationName.getCreateDate());
-        //  taskV2Model.setStartUserId(jgChangeRegistrationName.getCreateUserId());
-        //  taskV2Model.setStartUserCompanyName(jgChangeRegistrationName.getUseUnitName());
         taskV2Model.setExecuteUserIds(nextUserIds);
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model, modelDto);