功能完善

master
薛宏祥 12 months ago
parent 2ad6638516
commit c3c4cdcb18
  1. 4
      src/main/java/org/springblade/modules/business/contraller/WorkBenchesController.java
  2. 2
      src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@ -136,11 +136,11 @@ public class WorkBenchesController extends BladeController {
total.add(tasks.size());
map.put("total", total);
List<Long> completed = new ArrayList<>();
completed.add(workOrders.stream().filter(plan -> plan.getStatus() == 8).count());
completed.add(workOrders.stream().filter(plan -> Set.of(202, 203, 204).contains(plan.getStatus())).count());
completed.add(tasks.stream().filter(plan -> plan.getTaskStatus() == 4).count());
map.put("completed", completed);
List<Long> unCompleted = new ArrayList<>();
unCompleted.add(workOrders.stream().filter(plan -> plan.getStatus() != 8).count());
unCompleted.add(workOrders.stream().filter(plan -> !Set.of(202, 203, 204).contains(plan.getStatus())).count());
unCompleted.add(tasks.stream().filter(plan -> plan.getTaskStatus() != 4).count());
map.put("unCompleted", unCompleted);
return R.data(map);

@ -103,6 +103,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workOrderVO.setMaterials(materials);
User user = UserCache.getUser(workOrderVO.getInformant());
workOrderVO.setInformantName(user != null ? user.getRealName() : "");
Dept dept = deptService.getOne(Wrappers.lambdaQuery(Dept.class).eq(Dept::getId, user.getDeptId()));
workOrderVO.setReportUnitName(dept.getDeptName());
// 维修班组
workOrderVO.setMaintenanceTeamName(SysCache.getDeptName(workOrderVO.getMaintenanceTeam()));
// 维修人员

Loading…
Cancel
Save