浏览代码

fix:循环任务设置执行人

ly 9 月之前
父节点
当前提交
3f4c970d19

+ 12 - 1
src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -441,8 +441,19 @@ public class BizWorkOrderController extends BaseController {
     @PostMapping("setService")
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult setService(@RequestBody BizWorkOrder workOrder) {
+        BizEntrust entrustConditions = new BizEntrust();
+        entrustConditions.setWorkOrderIds(workOrder.getIds());
+        List<BizEntrust> entrusts = entrustService.getList(entrustConditions);
         List<BizWorkOrder> workOrders = bizWorkOrderService.query().in("id", workOrder.getIds()).list();
-        workOrders.forEach(l -> l.setServiceId(workOrder.getServiceId()));
+        int falsum = 0;
+        for(BizWorkOrder l : workOrders){
+            if(null != entrusts.stream().filter(v -> v.getWorkOrderId().equals(l.getId())).findFirst().orElse(null)){
+                falsum++;
+            }
+        }
+        if(falsum > 0){
+            return error("当前工单已经委托,无法重新设置执行人,请先取消委托");
+        }
         return toAjax(bizWorkOrderService.updateBatchById(workOrders));
     }
 }