no message

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

@@ -69,29 +69,29 @@ public class WorkOrderCurrentController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
 
-        List<SysCurrentMonth> months = sysCurrentMonthService.list(new LambdaQueryWrapper<SysCurrentMonth>()
-                .eq(SysCurrentMonth::getTenantId, getTenantId())
-                .eq(SysCurrentMonth::getType, 0));
-        Date date = DateTime.of(months.get(0).getYear() + "-" + months.get(0).getMonth() + "-01", "yyyy-MM-dd").toSqlDate();
-        bizWorkOrder.setWorkDate(date);
+//        List<SysCurrentMonth> months = sysCurrentMonthService.list(new LambdaQueryWrapper<SysCurrentMonth>()
+//                .eq(SysCurrentMonth::getTenantId, getTenantId())
+//                .eq(SysCurrentMonth::getType, 0));
+//        Date date = DateTime.of(months.get(0).getYear() + "-" + months.get(0).getMonth() + "-01", "yyyy-MM-dd").toSqlDate();
+        bizWorkOrder.setWorkDate(bizWorkOrder.getCurrentMonth());
         setTenantId(bizWorkOrder);
         startPage();
         startOrderBy();
 //        bizWorkOrder.setIsStop(0);
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
-        if (months.isEmpty()) {
-            return getDataTable(new ArrayList<>());
-        } else {
+//        if (months.isEmpty()) {
+//            return getDataTable(new ArrayList<>());
+//        } else {
             BizEntrust bizEntrust = new BizEntrust();
             bizEntrust.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
-            bizEntrust.setWorkMonth(DateTime.of(months.get(0).getYear() + "-" + months.get(0).getMonth() + "-01", "yyyy-MM-dd").toSqlDate());
+             bizEntrust.setWorkMonth(DateTime.of(bizWorkOrder.getCurrentMonth()).toSqlDate());
             List<BizEntrust> entrusts = bizEntrustService.getList(bizEntrust);
 //            bizEntrustService.query().in("work_order_id", list.stream().map(BizWorkOrder::getId).collect(Collectors.toList())).eq("work_month", months.get(0).getYear() + "-" + months.get(0).getMonth() + "-01").list();
             list.forEach(l -> {
                 l.setEntrust(entrusts.stream().filter(v -> v.getWorkOrderId().equals(l.getId())).findFirst().orElse(null));
             });
             return getDataTable(list);
-        }
+//        }
     }
 
     @GetMapping("/history/list")
@@ -480,14 +480,11 @@ public class WorkOrderCurrentController extends BaseController {
     @PostMapping("/delEntrust")
     public AjaxResult delEntrust(@RequestBody BizEntrust bizEntrust) {
         List<BizEntrust> entrustList = bizEntrustService.getList(bizEntrust);
-//        DateTime currentMonth = DateTime.of(bizEntrust.getWorkMonth());
-//        bizEntrust.setWorkMonth(currentMonth.offset(DateField.MONTH, 1).toSqlDate());
-        bizEntrust.setCurrentMonth(bizEntrust.getCurrentMonth());
-//        List<BizEntrust> nextEntrustList = bizEntrustService.getList(bizEntrust);
-
-        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()))
+        DateTime currentMonth = DateTime.of(bizEntrust.getWorkMonth());
+        bizEntrust.setWorkMonth(currentMonth.offset(DateField.MONTH, 1).toSqlDate());
+        List<BizEntrust> nextEntrustList = bizEntrustService.getList(bizEntrust);
+
+        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);
     }

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

@@ -55,31 +55,27 @@ public class WorkOrderNextController extends BaseController {
     @PreAuthorize("@ss.hasPermi('business:entrust:workOrder:next:list')")
     @GetMapping("/list")
     public TableDataInfo list(BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
+//        List<SysCurrentMonth> months = sysCurrentMonthService.list(new LambdaQueryWrapper<SysCurrentMonth>()
+//                .eq(SysCurrentMonth::getTenantId, getTenantId())
+//                .eq(SysCurrentMonth::getType, 1));
         setTenantId(bizWorkOrder);
         startPage();
         startOrderBy();
         bizWorkOrder.setIsStop(0);
-        List<SysCurrentMonth> months = sysCurrentMonthService.list(new LambdaQueryWrapper<SysCurrentMonth>()
-                .eq(SysCurrentMonth::getTenantId, getTenantId())
-                .eq(SysCurrentMonth::getType, 1));
 //        List<SysCurrentMonth> months = sysCurrentMonthService.query().eq("tenant_id", getTenantId()).eq("type", 1).list();
-        Date date = DateTime.of(months.get(0).getYear() + "-" + months.get(0).getMonth() + "-01", "yyyy-MM-dd").toSqlDate();
-        bizWorkOrder.setWorkDate(date);
+//        Date date = DateTime.of(months.get(0).getYear() + "-" + months.get(0).getMonth() + "-01", "yyyy-MM-dd").toSqlDate();
+        bizWorkOrder.setWorkDate(bizWorkOrder.getCurrentMonth());
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
 
 
-        if (months.isEmpty()) {
-            return getDataTable(new ArrayList<>());
-        } else {
-            BizEntrust bizEntrust = new BizEntrust();
-            bizEntrust.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
-            bizEntrust.setWorkMonth(DateTime.of(months.get(0).getYear() + "-" + months.get(0).getMonth() + "-01", "yyyy-MM-dd").toSqlDate());
-            List<BizEntrust> entrusts = bizEntrustService.getList(bizEntrust);
-            list.forEach(l -> {
-                l.setEntrust(entrusts.stream().filter(v -> v.getWorkOrderId().equals(l.getId())).findFirst().orElse(null));
-            });
-            return getDataTable(list);
-        }
+        BizEntrust bizEntrust = new BizEntrust();
+        bizEntrust.setWorkOrderIds(list.stream().map(BizWorkOrder::getId).collect(Collectors.toList()));
+        bizEntrust.setWorkMonth(DateTime.of(bizWorkOrder.getCurrentMonth()).toSqlDate());
+        List<BizEntrust> entrusts = bizEntrustService.getList(bizEntrust);
+        list.forEach(l -> {
+            l.setEntrust(entrusts.stream().filter(v -> v.getWorkOrderId().equals(l.getId())).findFirst().orElse(null));
+        });
+        return getDataTable(list);
     }
 
     /**
@@ -163,8 +159,8 @@ public class WorkOrderNextController extends BaseController {
 //        ExcelUtil<BizWorkOrderExport> util = new ExcelUtil<BizWorkOrderExport>(BizWorkOrderExport.class);
 //        util.exportExcel(response, listExport, "下月工单");
 //            } else {
-                ExcelUtil<BizWorkOrder> util = new ExcelUtil<BizWorkOrder>(BizWorkOrder.class);
-                util.exportExcel(response, list, "下月工单");
+        ExcelUtil<BizWorkOrder> util = new ExcelUtil<BizWorkOrder>(BizWorkOrder.class);
+        util.exportExcel(response, list, "下月工单");
 //            }
 //
 //        } else {