no message

src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderOnceController.java

@@ -13,6 +13,8 @@ import cn.ezhizao.project.business.entrust.service.IBizEntrustService;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrder;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderOnce;
 import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderOnceExport;
+import cn.ezhizao.project.business.workOrder.domain.BizWorkOrderRecord;
+import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderRecordService;
 import cn.ezhizao.project.business.workOrder.service.IBizWorkOrderService;
 import cn.ezhizao.project.system.domain.SysCurrentMonth;
 import cn.ezhizao.project.system.domain.SysDictData;
@@ -22,6 +24,7 @@ import cn.ezhizao.project.tenant.domain.Tenant;
 import cn.ezhizao.project.tenant.service.ITenantService;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -55,6 +58,9 @@ public class WorkOrderOnceController extends BaseController {
     @Resource
     private ISysDictDataService sysDictDataService;
 
+    @Resource
+    private IBizWorkOrderRecordService bizWorkOrderRecordService;
+
     /**
      * 查询工单信息列表
      */
@@ -167,8 +173,13 @@ public class WorkOrderOnceController extends BaseController {
         DateTime currentMonth = DateTime.of(bizEntrust.getWorkMonth());
         bizEntrust.setWorkMonth(currentMonth.offset(DateField.MONTH, 1).toSqlDate());
         List<BizEntrust> nextEntrustList = bizEntrustService.getList(bizEntrust);
+        List<Long> workOrderIds = bizEntrust.getWorkOrderIds();
+        bizWorkOrderRecordService.remove(new LambdaQueryWrapper<BizWorkOrderRecord>().in(BizWorkOrderRecord::getWorkOrderId, workOrderIds));
+        boolean status = (entrustList.isEmpty()
+                || bizEntrustService.removeByIds(entrustList.stream().map(BizEntrust::getId)
+                .collect(Collectors.toList()))) && (nextEntrustList.isEmpty() ||
+                bizEntrustService.removeByIds(nextEntrustList.stream().map(BizEntrust::getId).collect(Collectors.toList())));
 
-        boolean status = (entrustList.isEmpty() || bizEntrustService.removeByIds(entrustList.stream().map(BizEntrust::getId).collect(Collectors.toList()))) && (nextEntrustList.isEmpty() || bizEntrustService.removeByIds(nextEntrustList.stream().map(BizEntrust::getId).collect(Collectors.toList())));
         // 取消委托
         return toAjax(status);
     }