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

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

@@ -6,9 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,25 +15,19 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
-import java.io.*;
-import java.net.URLEncoder;
 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.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 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 javax.servlet.http.HttpServletResponse;
 
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 
@@ -97,12 +89,8 @@ public class JgChangeRegistrationUnitController extends BaseController {
 	@DeleteMapping(value = "/delete")
 	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除单位变更", notes = "根据sequenceNbr删除单位变更")
 	public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-		JgChangeRegistrationUnit changeRegistrationUnit = jgChangeRegistrationUnitServiceImpl.getById(sequenceNbr);
-		boolean bool = jgChangeRegistrationUnitServiceImpl.removeById(sequenceNbr);
-		if (bool){
-			commonService.deleteTaskModel(sequenceNbr+"",changeRegistrationUnit.getInstanceId());
-		}
-		return ResponseHelper.buildResponse(bool);
+		jgChangeRegistrationUnitServiceImpl.deleteForBatch(new Long[]{sequenceNbr});
+		return ResponseHelper.buildResponse(Boolean.TRUE);
 	}
 
 	/**

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

@@ -8,6 +8,7 @@ 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.JgInstallationNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgInstallationNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
 import io.swagger.annotations.Api;
@@ -40,10 +41,6 @@ public class JgInstallationNoticeController extends BaseController {
     @Autowired
     private IJgInstallationNoticeService iJgInstallationNoticeService;
 
-
-    @Autowired
-    private CommonServiceImpl commonService;
-
     /**
      * 新增
      *
@@ -91,11 +88,8 @@ public class JgInstallationNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除安装告知", notes = "根据sequenceNbr删除安装告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-        // 删除待办 + 中止流程
-        JgInstallationNotice jgInstallationNotice = iJgInstallationNoticeService.getBaseMapper().selectById(sequenceNbr);
-        commonService.deleteTaskModel(String.valueOf(sequenceNbr),jgInstallationNotice.getInstanceId());
-        jgInstallationNotice.setIsDelete(true);
-        return ResponseHelper.buildResponse(iJgInstallationNoticeService.updateById(jgInstallationNotice));
+        iJgInstallationNoticeService.deleteForBatch(new Long[]{sequenceNbr});
+        return ResponseHelper.buildResponse(Boolean.TRUE);
     }
 
     /**

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

@@ -7,15 +7,14 @@ 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.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
-import com.yeejoin.amos.boot.module.jg.biz.utils.ImageUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import jdk.nashorn.api.scripting.JSObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -43,10 +42,6 @@ public class JgTransferNoticeController extends BaseController {
     @Autowired
     private ICommonService commonService;
 
-
-    @Autowired
-    private CommonServiceImpl commonServiceImpl;
-
     @Autowired
     private IJgInstallationNoticeService iJgInstallationNoticeService;
 
@@ -101,10 +96,8 @@ public class JgTransferNoticeController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除移装造告知", notes = "根据sequenceNbr删除移装造告知")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-        // 删除待办 及 中止流程
-        JgTransferNotice jgTransferNotice = jgTransferNoticeService.getBaseMapper().selectById(sequenceNbr);
-        commonServiceImpl.deleteTaskModel(String.valueOf(sequenceNbr),jgTransferNotice.getInstanceId());
-        return ResponseHelper.buildResponse(jgTransferNoticeService.removeById(sequenceNbr));
+        jgTransferNoticeService.deleteForBatch(new Long[]{sequenceNbr});
+        return ResponseHelper.buildResponse(Boolean.TRUE);
     }
 
     /**

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

@@ -119,6 +119,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
     private static String template = "来自企业（%s）的业务办理";
 
     public static String  JG_COMAPNY_TYPE = "监管机构";
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
 
     @Transactional(rollbackFor = Exception.class)
@@ -446,21 +448,19 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
 
     @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(List<Long> ids) {
-        // 删除待办
-        this.deleteTaskBatch(ids);
-        // 删除业务数据
-        JgChangeRegistrationName jgChangeRegistrationName = new JgChangeRegistrationName();
-        jgChangeRegistrationName.setIsDelete(true);
-        LambdaQueryWrapper<JgChangeRegistrationName> lambda = new QueryWrapper<JgChangeRegistrationName>().lambda();
-        lambda.in(JgChangeRegistrationName::getSequenceNbr, ids);
-        this.update(jgChangeRegistrationName, lambda);
+        for (Long seq : ids) {
+            JgChangeRegistrationName jgChangeRegistrationName = this.baseMapper.selectById(seq);
+            // 删除代办 + 中止流程
+            commonService.deleteTaskModel(String.valueOf(seq),jgChangeRegistrationName.getInstanceId());
+            // 删除单子
+            this.baseMapper.deleteById(seq);
+            // 删除单子对应eq
+            jgChangeRegistrationNameEqMapper.delete(new LambdaQueryWrapper<JgChangeRegistrationNameEq>()
+                    .eq(JgChangeRegistrationNameEq::getNameChangeRegistrationId, seq));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgChangeRegistrationName.getApplyNo()));
         }
-
-    private void deleteTaskBatch(List<Long> ids) {
-        ids.forEach(id-> {
-            JgChangeRegistrationName jgChangeRegistrationName = this.baseMapper.selectById(id);
-            commonService.deleteTaskModel(id + "",jgChangeRegistrationName.getInstanceId());
-        });
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -492,24 +492,21 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(List<Long> ids) {
-        List<JgChangeRegistrationReform> jgChangeRegistrationReformList = this.getBaseMapper().selectList(new QueryWrapper<JgChangeRegistrationReform>().in("sequence_nbr", ids));
-        List<String> applyNos = jgChangeRegistrationReformList.stream().map(JgChangeRegistrationReform::getApplyNo).collect(Collectors.toList());
-        JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
-        jgChangeRegistrationReform.setIsDelete(true);
-        LambdaQueryWrapper<JgChangeRegistrationReform> lambda = new QueryWrapper<JgChangeRegistrationReform>().lambda();
-        lambda.in(JgChangeRegistrationReform::getSequenceNbr, ids);
-        this.getBaseMapper().delete(lambda);
-        JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
-        jgChangeRegistrationReformEq.setIsDelete(true);
-        LambdaQueryWrapper<JgChangeRegistrationReformEq> lambda1 = new QueryWrapper<JgChangeRegistrationReformEq>().lambda();
-        lambda1.in(JgChangeRegistrationReformEq::getEquipTransferId, ids);
-        jgChangeRegistrationReformEqMapper.delete(lambda1);
-        jgRegistrationHistoryMapper.delete(new QueryWrapper<JgRegistrationHistory>().in("current_document_id", applyNos));
-        //删除暂存的待办
+        // 删除暂存的待办
         ids.forEach(id -> {
             JgChangeRegistrationReform registrationReform = this.baseMapper.selectById(id);
+            // 删除代办 + 流程流程
             commonServiceImpl.deleteTaskModel(String.valueOf(id),registrationReform.getInstanceId());
+            // 删除单子
+            this.baseMapper.deleteById(id);
+            // 删除单子对应eq
+            jgChangeRegistrationReformEqMapper.delete(new LambdaQueryWrapper<JgChangeRegistrationReformEq>()
+                    .eq(JgChangeRegistrationReformEq::getEquipTransferId, id));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, registrationReform.getApplyNo()));
         });
     }
 

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

@@ -133,6 +133,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     @Autowired
     private RedissonClient redissonClient;
 
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
+
     /**
      * 新增移装变更登记
      *
@@ -524,48 +527,25 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             return false;
         }
         try {
-            //删除移装变更信息
-            JgChangeRegistrationTransfer transfer = new JgChangeRegistrationTransfer();
-            transfer.setIsDelete(true);
-            LambdaQueryWrapper<JgChangeRegistrationTransfer> transferWapper = new QueryWrapper<JgChangeRegistrationTransfer>().lambda();
-            transferWapper.in(JgChangeRegistrationTransfer::getSequenceNbr, Arrays.asList(sequenceNbrs));
-            this.update(transfer, transferWapper);
-            //删除关联表信息
-            JgChangeRegistrationTransferEq eq = new JgChangeRegistrationTransferEq();
-            transfer.setIsDelete(true);
-            LambdaQueryWrapper<JgChangeRegistrationTransferEq> eqWapper = new QueryWrapper<JgChangeRegistrationTransferEq>().lambda();
-            eqWapper.in(JgChangeRegistrationTransferEq::getEquipTransferId, Arrays.asList(sequenceNbrs));
-            jgChangeRegistrationTransferEqService.updateDate(eq, eqWapper);
-            //删除历史表
-            JgRegistrationHistory history = new JgRegistrationHistory();
-            history.setIsDelete(true);
-            List<JgChangeRegistrationTransferDto> transferDtos = this.queryBatchSeq(Arrays.asList(sequenceNbrs));
-            if (!ValidationUtil.isEmpty(transferDtos)) {
-                List<String> applyNos = transferDtos.stream().map(item -> item.getApplyNo()).collect(Collectors.toList());
-                if (!ValidationUtil.isEmpty(applyNos)) {
-                    LambdaQueryWrapper<JgRegistrationHistory> historyWapper = new QueryWrapper<JgRegistrationHistory>().lambda();
-                    historyWapper.in(JgRegistrationHistory::getCurrentDocumentId, applyNos);
-                    jgRegistrationHistoryService.updateDate(history, historyWapper);
-                }
-            }
-
-            // 删除待办
-            this.deleteTaskBatch(Arrays.asList(sequenceNbrs));
-
+            for (Long sequenceNbr : sequenceNbrs) {
+                JgChangeRegistrationTransfer registrationTransfer = this.baseMapper.selectById(sequenceNbr);
+                // 删除代办 + 中止流程
+                commonService.deleteTaskModel(String.valueOf(sequenceNbr),registrationTransfer.getInstanceId());
+                // 删除单子
+                this.baseMapper.deleteById(sequenceNbr);
+                // 删除单子对应eq
+                jgChangeRegistrationTransferEqMapper.delete(new LambdaQueryWrapper<JgChangeRegistrationTransferEq>()
+                        .eq(JgChangeRegistrationTransferEq::getEquipTransferId, sequenceNbr));
+                // 删除单子对应历史表数据
+                jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                        .eq(JgRegistrationHistory::getCurrentDocumentId, registrationTransfer.getApplyNo()));
+            }
         } catch (Exception e) {
             return false;
         }
         return true;
     }
 
-    // 删除待办
-    private void deleteTaskBatch(List<Long> ids) {
-        ids.forEach(id -> {
-            JgChangeRegistrationTransfer jgChangeRegistrationTransfer = this.baseMapper.selectById(id);
-            commonService.deleteTaskModel(id + "",jgChangeRegistrationTransfer.getInstanceId());
-        });
-    }
-
     /**
      * 根据移装变更记录sequenceNbr查询详情
      * @param sequenceNbr 变更记录sequenceNbr

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

@@ -383,11 +383,20 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) {
             return false;
         }
-        Collection<JgChangeRegistrationUnit> JgChangeRegistrationUnits = this.listByIds(Arrays.asList(sequenceNbrs));
-        JgChangeRegistrationUnits.forEach(notice -> {
-            notice.setIsDelete(true);
-        });
-        return this.updateBatchById(JgChangeRegistrationUnits);
+        for (Long sequenceNbr : sequenceNbrs) {
+            JgChangeRegistrationUnit changeRegistrationUnit = this.baseMapper.selectById(sequenceNbr);
+            // 删除代办 + 中止流程
+            commonServiceImpl.deleteTaskModel(String.valueOf(sequenceNbr),changeRegistrationUnit.getInstanceId());
+            // 删除单子
+            this.baseMapper.deleteById(sequenceNbr);
+            // 删除单子对应eq
+            jgChangeRegistrationUnitEqMapper.delete(new LambdaQueryWrapper<JgChangeRegistrationUnitEq>()
+                    .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, sequenceNbr));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, changeRegistrationUnit.getApplyNo()));
+        }
+        return Boolean.TRUE;
     }
 
 

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

@@ -16,6 +16,7 @@ import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEnableDisableService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -97,6 +98,9 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
     @Autowired
     private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
 
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
+
     /**
      * 设备状态:启用
      */
@@ -701,14 +705,19 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         this.getBaseMapper().updateById(jgEnableDisable);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void deleteMessage(Long sequenceNbr) {
-        this.baseMapper.deleteById(sequenceNbr);
-        LambdaQueryWrapper<JgEnableDisableEq> lambda = new QueryWrapper<JgEnableDisableEq>().lambda();
-        lambda.eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr);
-        jgEnableDisableEqService.getBaseMapper().delete(lambda);
-        // 删除待办
         JgEnableDisable jgEnableDisable = this.baseMapper.selectById(sequenceNbr);
-        commonService.deleteTaskModel(sequenceNbr + "",jgEnableDisable.getInstanceId());
+        // 删除代办 + 中止流程
+        commonService.deleteTaskModel(String.valueOf(sequenceNbr),jgEnableDisable.getInstanceId());
+        // 删除单子
+        this.baseMapper.deleteById(sequenceNbr);
+        // 删除单子对应eq
+        jgEnableDisableEqService.getBaseMapper().delete(new QueryWrapper<JgEnableDisableEq>().lambda()
+                .eq(JgEnableDisableEq::getEnableDisableApplyId, sequenceNbr));
+        // 删除单子对应历史表数据
+        jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                .eq(JgRegistrationHistory::getCurrentDocumentId, jgEnableDisable.getApplyNo()));
     }
 
     public Map<String, Object> getDetail(Long sequenceNbr) {

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

@@ -15,10 +15,12 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransferEq;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -82,6 +84,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     @Autowired
     private RedissonClient redissonClient;
 
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
+
     /**
      * 保存和保存并提交
      *
@@ -745,9 +750,17 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     public Boolean deleteForBatch(Long[] ids) {
         Collection<JgEquipTransfer> jgEquipTransfers = this.listByIds(Arrays.asList(ids));
         for (JgEquipTransfer notice : jgEquipTransfers) {
-            notice.setIsDelete(true);
+            // 删除代办 + 中止流程
             commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()),notice.getInstanceId());
-        }
-        return this.updateBatchById(jgEquipTransfers);
+            // 删除单子
+            this.baseMapper.deleteById(notice.getSequenceNbr());
+            // 删除对应eq
+            jgEquipTransferEqMapper.delete(new LambdaQueryWrapper<JgEquipTransferEq>()
+                    .eq(JgEquipTransferEq::getEquipTransferId, notice.getSequenceNbr()));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo()));
+        }
+        return Boolean.TRUE;
     }
 }
\ 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

@@ -19,10 +19,12 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 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.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 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.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -162,6 +164,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     private JgResumeInfoServiceImpl jgResumeInfoService;
     @Autowired
     private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
     /**
      * 根据sequenceNbr查询
@@ -448,19 +452,21 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) {
             return false;
         }
-        Collection<JgInstallationNotice> jgInstallationNotices = this.listByIds(Arrays.asList(sequenceNbrs));
-        // jgInstallationNotices.forEach(notice -> {
-        //     if (StringUtils.hasText(notice.getInspectUnitId())) {
-        //         throw new IllegalStateException("所选数据已存在流程，不能删除！");
-        //     }
-        //     notice.setIsDelete(true);
-        // });
-        // 删除暂存的待办
-        jgInstallationNotices.forEach(installationNotice -> {
-            installationNotice.setIsDelete(true);
-            commonService.deleteTaskModel(String.valueOf(installationNotice.getSequenceNbr()), installationNotice.getInstanceId());
-        });
-        return this.updateBatchById(jgInstallationNotices);
+        for (Long sequenceNbr : sequenceNbrs) {
+            // 删除待办 + 中止流程
+            JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(sequenceNbr);
+            commonService.deleteTaskModel(String.valueOf(sequenceNbr),jgInstallationNotice.getInstanceId());
+            // 删除业务单
+            jgInstallationNotice.setIsDelete(true);
+            this.getBaseMapper().deleteById(sequenceNbr);
+            // 删除对应equ
+            jgInstallationNoticeEqMapper.delete(new LambdaUpdateWrapper<JgInstallationNoticeEq>()
+                    .eq(JgInstallationNoticeEq::getEquipTransferId, sequenceNbr));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgInstallationNotice.getApplyNo()));
+        }
+        return Boolean.TRUE;
     }
 
     /**

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,12 +16,13 @@ import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgInstallationNotice;
 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.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 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.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -116,6 +117,8 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
     @Autowired
     private RedissonClient redissonClient;
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
     /**
      * 根据sequenceNbr查询
@@ -365,14 +368,21 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     }
 
     @Override
-    public boolean deleteBySequenceNbr(Long[] sequenceNbr) {
-        this.baseMapper.deleteById(sequenceNbr);
-        LambdaQueryWrapper<JgMaintainNoticeEq> lambda = new QueryWrapper<JgMaintainNoticeEq>().lambda();
-        lambda.eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr);
-        jgMaintainNoticeEqMapper.delete(lambda);
-        // 删除待办 + 中止流程
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteBySequenceNbr(Long[] sequenceNbrs) {
+        for (Long sequenceNbr : sequenceNbrs) {
             JgMaintainNotice jgMaintainNotice = this.baseMapper.selectById(sequenceNbr);
+            // 删除待办 + 中止流程
             commonService.deleteTaskModel(sequenceNbr + "",jgMaintainNotice.getInstanceId());
+            // 删除业务单
+            this.baseMapper.deleteById(sequenceNbr);
+            // 删除对应equ
+            jgMaintainNoticeEqMapper.delete(new QueryWrapper<JgMaintainNoticeEq>().lambda()
+                    .eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgMaintainNotice.getApplyNo()));
+        }
         return true;
     }
 

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

@@ -13,12 +13,14 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 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.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
@@ -94,6 +96,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     private RedissonClient redissonClient;
     @Autowired
     private JgResumeInfoServiceImpl jgResumeInfoService;
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
     /**
      * 分页查询
@@ -244,8 +248,16 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         List<Long> list = Arrays.asList(ids);
         list.forEach(seq -> {
             JgMaintenanceContract jgMaintenanceContract = this.baseMapper.selectById(seq);
+            // 删除待办 及 中止流程
             commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()),jgMaintenanceContract.getInstanceId());
+            // 删除业务单
             this.baseMapper.deleteById(seq);
+            // 删除对应eq
+            jgMaintenanceContractEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgMaintenanceContractEq>()
+                    .eq(JgMaintenanceContractEq::getEquipTransferId, seq));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgMaintenanceContract.getApplyNo()));
         });
         return true;
     }

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

@@ -15,9 +15,11 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
 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.entity.JgRegistrationHistory;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 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.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgReformNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -105,6 +107,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     private CmWorkflowServiceImpl cmWorkflowService;
     @Autowired
     private RedissonClient redissonClient;
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
     /**
      * 根据sequenceNbr查询
@@ -305,14 +309,18 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         }
         Collection<JgReformNotice> JgReformNotices = this.listByIds(Arrays.asList(sequenceNbrs));
         JgReformNotices.forEach(notice -> {
-            // if (StringUtils.hasText(notice.getInspectUnitId())) {
-            //     throw new IllegalStateException("所选数据已存在流程，不能删除！");
-            // }
-            notice.setIsDelete(true);
+            // 删除代办 + 中止流程
             commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()),notice.getInstanceId());
+            // 删除单子
+            this.baseMapper.deleteById(notice.getSequenceNbr());
+            // 删除对应eq
+            jgReformNoticeEqMapper.delete(new LambdaQueryWrapper<JgReformNoticeEq>()
+                    .eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr()));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, notice.getApplyNo()));
         });
-
-        return this.updateBatchById(JgReformNotices);
+        return Boolean.TRUE;
     }
 
     /**

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

@@ -11,11 +11,13 @@ 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.*;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 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.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.CancelTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.WorkFlowStatusEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 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;
@@ -23,7 +25,6 @@ import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgRegisterInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgUseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.OtherInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.SuperviseInfo;
@@ -97,6 +98,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     private JgScrapCancelEqMapper jgScrapCancelEqMapper;
     @Autowired
     private IdxBizJgUseInfoMapper idxBizJgUseInfoMapper;
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
 
     @Autowired
     private RedissonClient redissonClient;
@@ -330,17 +333,23 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
         return String.format(template, equListName, Objects.isNull(supervisoryCode) ? "无" : supervisoryCode, type);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(List<Long> ids) {
         if (!ids.isEmpty()) {
             for (Long id : ids) {
                 LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
                 lambda.eq(JgScrapCancel::getSequenceNbr, id);
                 JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
-                // 删除代办消息
+                // 删除代办 + 中止流程
                 commonService.deleteTaskModel(String.valueOf(jgScrapCancel.getSequenceNbr()),jgScrapCancel.getInstanceId());
-                // 更新jgScrapCancel数据
-                jgScrapCancel.setIsDelete(true);
-                this.updateById(jgScrapCancel);
+                // 删除单子
+                this.baseMapper.deleteById(jgScrapCancel.getSequenceNbr());
+                // 删除对应eq
+                jgScrapCancelEqMapper.delete(new LambdaQueryWrapper<JgScrapCancelEq>()
+                        .eq(JgScrapCancelEq::getEquipTransferId,jgScrapCancel.getSequenceNbr()));
+                // 删除单子对应历史表数据
+                jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                        .eq(JgRegistrationHistory::getCurrentDocumentId, jgScrapCancel.getApplyNo()));
             }
         }
     }

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

@@ -14,9 +14,11 @@ 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.*;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
 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.BusinessTypeEnum;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 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.mapper.JgUseRegistrationMapper;
@@ -30,7 +32,6 @@ 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.*;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -98,7 +99,8 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     private JgTransferNoticeMapper jgTransferNoticeMapper;
     @Autowired
     private CommonServiceImpl commonService;
-
+    @Autowired
+    private JgRegistrationHistoryMapper jgRegistrationHistoryMapper;
     @Autowired
     private RedissonClient redissonClient;
 
@@ -194,19 +196,20 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         if (Objects.isNull(sequenceNbrs) || sequenceNbrs.length == 0) {
             return false;
         }
-        Collection<JgTransferNotice> jgTransferNotices = this.listByIds(Arrays.asList(sequenceNbrs));
-        // jgTransferNotices.forEach(notice -> {
-        //     if (StringUtils.hasText(notice.getInspectionUnitCreditCode())) {
-        //         throw new IllegalStateException("所选数据已存在流程，不能删除！");
-        //     }
-        //     notice.setIsDelete(true);
-        // });
-        // 删除待办及中止流程
-        jgTransferNotices.forEach(jgTransferNotice -> {
-            jgTransferNotice.setIsDelete(true);
-            commonService.deleteTaskModel(String.valueOf(jgTransferNotice.getSequenceNbr()),jgTransferNotice.getInstanceId());
-        });
-        return this.updateBatchById(jgTransferNotices);
+        for (Long sequenceNbr : sequenceNbrs) {
+            // 删除待办 及 中止流程
+            JgTransferNotice jgTransferNotice = this.getBaseMapper().selectById(sequenceNbr);
+            commonService.deleteTaskModel(String.valueOf(sequenceNbr),jgTransferNotice.getInstanceId());
+            // 删除业务单
+            this.getBaseMapper().deleteById(sequenceNbr);
+            // 删除对应eq
+            jgTransferNoticeEqMapper.delete(new LambdaQueryWrapper<JgTransferNoticeEq>()
+                    .eq(JgTransferNoticeEq::getEquipTransferId, sequenceNbr));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryMapper.delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, jgTransferNotice.getApplyNo()));
+        }
+        return Boolean.TRUE;
     }
 
     /**

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

@@ -166,8 +166,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     private JgUseRegistrationMapper jgUseRegistrationMapper;
     @Autowired
-    private ConstructionInfoMapper constructionInfoMapper;
-    @Autowired
     private ESEquipmentCategory esEquipmentCategory;
     @Autowired
     private JgResumeInfoServiceImpl jgResumeInfoService;
@@ -1294,17 +1292,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(List<Long> ids) {
-        JgUseRegistration jgUseRegistration = new JgUseRegistration();
-        jgUseRegistration.setIsDelete(true);
-        LambdaQueryWrapper<JgUseRegistration> lambda = new QueryWrapper<JgUseRegistration>().lambda();
-        lambda.in(JgUseRegistration::getSequenceNbr, ids);
-        // 删除暂存的待办
         ids.forEach(id -> {
             JgUseRegistration useRegistration = this.baseMapper.selectById(id);
+            // 删除代办 + 中止流程
             commonServiceImpl.deleteTaskModel(String.valueOf(id), useRegistration.getInstanceId());
+            // 删除单子
+            this.baseMapper.deleteById(id);
+            // 删除对应eq
+            jgUseRegistrationEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgUseRegistrationEq>()
+                    .eq(JgUseRegistrationEq::getEquipTransferId, id));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, useRegistration.getApplyNo()));
         });
-        this.update(jgUseRegistration, lambda);
     }
 
     public Map<String, Object> getDetail(String record, Long sequenceNbr) {

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

@@ -840,19 +840,22 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     /**
      * 批量删除
      *
-     * @param ids ids
      */
+    @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(List<Long> ids) {
-        JgVehicleInformation jgVehicleInformation = new JgVehicleInformation();
-        jgVehicleInformation.setIsDelete(true);
-        LambdaQueryWrapper<JgVehicleInformation> lambda = new QueryWrapper<JgVehicleInformation>().lambda();
-        lambda.in(JgVehicleInformation::getSequenceNbr, ids);
-        // 删除暂存的待办
         ids.forEach(id -> {
             JgVehicleInformation vehicleInformation = this.baseMapper.selectById(id);
+            // 删除代办 + 中止流程
             commonService.deleteTaskModel(String.valueOf(id),vehicleInformation.getInstanceId());
+            // 删除单子
+            this.deleteBySeq(id);
+            // 删除单子对应设备
+            jgVehicleInformationEqMapper.delete(new LambdaQueryWrapper<JgVehicleInformationEq>()
+                    .eq(JgVehicleInformationEq::getVehicleId, id));
+            // 删除单子对应历史表数据
+            jgRegistrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
+                    .eq(JgRegistrationHistory::getCurrentDocumentId, vehicleInformation.getApplyNo()));
         });
-        this.update(jgVehicleInformation, lambda);
     }
 
     public Page<Map<String, Object>> getPageList(JgVehicleInformationDto dto, String sort, Page<Map<String, Object>> page, List<String> roleIds) {