Преглед на файлове

fix:委托生成时,判断是否工单已结束

ly преди 10 месеца
родител
ревизия
9bb32ab7af
променени са 1 файла, в които са добавени 2 реда и са изтрити 0 реда
  1. 2 0
      src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderCurrentController.java

+ 2 - 0
src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderCurrentController.java

@@ -535,6 +535,7 @@ public class WorkOrderCurrentController extends BaseController {
         entrustExamineService.saveBatch(entrustExamineList);
         return AjaxResult.success();
     }
+    @Transactional(rollbackFor = Exception.class)
     @PostMapping("/delEntrust")
     public AjaxResult delEntrust(@RequestBody BizEntrust bizEntrust) {
         List<Long> workOrderIds1 = bizEntrust.getWorkOrderIds();
@@ -768,6 +769,7 @@ public class WorkOrderCurrentController extends BaseController {
             bizWorkOrder.setType(1);
             bizWorkOrder.setNoContract(0);
             bizWorkOrder.setWorkDate(generateDateTime);
+            bizWorkOrder.setCurrentMonth(generateDateTime);
             List<BizWorkOrder> workOrderList = bizWorkOrderService.getList(bizWorkOrder);
             BizEntrust bizEntrust = null;
             for(BizWorkOrder workOrder :workOrderList){