浏览代码

no message

ly 1 年之前
父节点
当前提交
8ab67dcd09
共有 1 个文件被更改,包括 11 次插入16 次删除
  1. 11 16
      src/main/java/cn/ezhizao/project/business/order/controller/BizArchiveInputController.java

+ 11 - 16
src/main/java/cn/ezhizao/project/business/order/controller/BizArchiveInputController.java

@@ -191,22 +191,7 @@ public class BizArchiveInputController extends BaseController {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult alter(@RequestBody BizArchiveInput bizArchiveInput) {
         Long userId = SecurityUtils.getUserId();
-        List<BizArchiveInputDetail> details = archiveInputDetailService.query()
-                .eq("deleted",0)
-                .eq("contract_id", bizArchiveInput.getId()).list();
-        for (BizArchiveInputDetail item : details) {
-            BizCollectionDetail detail = new BizCollectionDetail();
-            detail.setContractId(bizArchiveInput.getId());
-            detail.setContractDetailId(item.getId());
-            detail.setTaskTypeId(item.getTaskTypeId());
-            List<BizCollectionDetail> list = bizCollectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>()
-                    .eq(BizCollectionDetail::getContractId, bizArchiveInput.getId())
-                    .eq(BizCollectionDetail::getContractDetailId, item.getId())
-                    .eq(BizCollectionDetail::getTaskTypeId, item.getTaskTypeId()));
-            if(CollectionUtils.isNotEmpty(list)){
-                throw new RuntimeException("已存在该任务类型的收款合同,无法删除");
-            }
-        }
+
         BizArchiveInput oldBizArchiveInput = getById(bizArchiveInput.getId());
         checkAlter(bizArchiveInput, oldBizArchiveInput);
         setNullId(oldBizArchiveInput);
@@ -324,6 +309,16 @@ public class BizArchiveInputController extends BaseController {
             if (!changeList.isEmpty() && !bizArchiveInputService.checkWorkOrderChangeStatus(changeList)) {
                 throw new ServiceException("修改任务月数小于已完成月数。");
             }
+        for (BizArchiveInputDetail item : delList) {
+
+            List<BizCollectionDetail> list = bizCollectionDetailService.list(new LambdaQueryWrapper<BizCollectionDetail>()
+                    .eq(BizCollectionDetail::getContractId, newBizArchiveInput.getId())
+                    .eq(BizCollectionDetail::getContractDetailId, item.getId())
+                    .eq(BizCollectionDetail::getTaskTypeId, item.getTaskTypeId()));
+            if(CollectionUtils.isNotEmpty(list)){
+                throw new RuntimeException("已存在该任务类型的收款合同,无法删除");
+            }
+        }
         }
         return true;
     }