|
|
|
|
@ -197,25 +197,25 @@ public class WorkBenchesController extends BladeController { |
|
|
|
|
|
|
|
|
|
if ("0".equals(perType)) { |
|
|
|
|
// 客服今日待办
|
|
|
|
|
todoCount = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).in(WorkOrder::getStatus, CUSTOMER_SUBMIT, EVALUATE_FINISH)); |
|
|
|
|
todoCount = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).in(WorkOrder::getStatus, CUSTOMER_SUBMIT.getValue(), EVALUATE_FINISH.getValue())); |
|
|
|
|
// 客服今日已办
|
|
|
|
|
finish = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).between(WorkOrder::getDispatchTime, start, end)); |
|
|
|
|
} else if ("1".equals(perType)) { |
|
|
|
|
// 主管今日待办
|
|
|
|
|
todoCount = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getStatus, SUPERVISOR_CONFIRM)); |
|
|
|
|
todoCount = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getStatus, SUPERVISOR_CONFIRM.getValue())); |
|
|
|
|
// 主管今日已办
|
|
|
|
|
finish = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).between(WorkOrder::getDispatchTime, start, end)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
LocalDate now = LocalDate.now(); |
|
|
|
|
// 本月已办结-需求提报
|
|
|
|
|
int monthCountWork = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getStatus, TICKET).between(WorkOrder::getDispatchTime, getMonthStartAsDate(now), getMonthEndAsDate(now))); |
|
|
|
|
int monthCountWork = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getStatus, TICKET.getValue()).between(WorkOrder::getSignatureTime, getMonthStartAsDate(now), getMonthEndAsDate(now))); |
|
|
|
|
// 本月已办结-巡检任务
|
|
|
|
|
int monthCount = (int) maintenanceTaskService.count(Wrappers.lambdaQuery(MaintenanceTask.class).eq(MaintenanceTask::getTaskStatus, TASK_CUSTOMER_CONFIRM).between(MaintenanceTask::getFinishTime, getMonthStartAsDate(now), getMonthEndAsDate(now))); |
|
|
|
|
int monthCount = (int) maintenanceTaskService.count(Wrappers.lambdaQuery(MaintenanceTask.class).eq(MaintenanceTask::getTaskStatus, TASK_CUSTOMER_CONFIRM.getValue()).between(MaintenanceTask::getFinishTime, getMonthStartAsDate(now), getMonthEndAsDate(now))); |
|
|
|
|
// 今年已办结-需求提报
|
|
|
|
|
int yearCountWork = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getStatus, TICKET).between(WorkOrder::getDispatchTime, getYearStartAsDate(now), getYearEndAsDate(now))); |
|
|
|
|
int yearCountWork = (int) workOrderService.count(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getStatus, TICKET.getValue()).between(WorkOrder::getSignatureTime, getYearStartAsDate(now), getYearEndAsDate(now))); |
|
|
|
|
// 今年已办结-巡检任务
|
|
|
|
|
int yearCount = (int) maintenanceTaskService.count(Wrappers.lambdaQuery(MaintenanceTask.class).eq(MaintenanceTask::getStatus, TASK_CUSTOMER_CONFIRM).between(MaintenanceTask::getFinishTime, getYearStartAsDate(now), getYearEndAsDate(now))); |
|
|
|
|
int yearCount = (int) maintenanceTaskService.count(Wrappers.lambdaQuery(MaintenanceTask.class).eq(MaintenanceTask::getTaskStatus, TASK_CUSTOMER_CONFIRM.getValue()).between(MaintenanceTask::getFinishTime, getYearStartAsDate(now), getYearEndAsDate(now))); |
|
|
|
|
|
|
|
|
|
map1.put("title", "我的任务"); |
|
|
|
|
map1.put("mainName", "今日待办"); |
|
|
|
|
@ -236,7 +236,7 @@ public class WorkBenchesController extends BladeController { |
|
|
|
|
// 巡检计划签约数量
|
|
|
|
|
int count = (int) maintenancePlanService.count(Wrappers.lambdaQuery(MaintenancePlan.class)); |
|
|
|
|
// 巡检次数
|
|
|
|
|
int xjCount = (int) maintenanceTaskService.count(Wrappers.lambdaQuery(MaintenanceTask.class).eq(MaintenanceTask::getStatus, TASK_CUSTOMER_CONFIRM)); |
|
|
|
|
int xjCount = (int) maintenanceTaskService.count(Wrappers.lambdaQuery(MaintenanceTask.class).eq(MaintenanceTask::getTaskStatus, TASK_CUSTOMER_CONFIRM.getValue())); |
|
|
|
|
map3.put("num", count); |
|
|
|
|
map3.put("num1", xjCount); |
|
|
|
|
} else if ("1".equals(perType)) { |
|
|
|
|
|