Compare commits

..

No commits in common. '1d5443fe5c26539737467b0569900a8f512294a5' and '6f5d5aaa6d148933fdf8a22e65d4dd5e77382008' have entirely different histories.

  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()); total.add(tasks.size());
map.put("total", total); map.put("total", total);
List<Long> completed = new ArrayList<>(); List<Long> completed = new ArrayList<>();
completed.add(workOrders.stream().filter(plan -> Set.of(202, 203, 204).contains(plan.getStatus())).count()); completed.add(workOrders.stream().filter(plan -> plan.getStatus() == 8).count());
completed.add(tasks.stream().filter(plan -> plan.getTaskStatus() == 4).count()); completed.add(tasks.stream().filter(plan -> plan.getTaskStatus() == 4).count());
map.put("completed", completed); map.put("completed", completed);
List<Long> unCompleted = new ArrayList<>(); List<Long> unCompleted = new ArrayList<>();
unCompleted.add(workOrders.stream().filter(plan -> !Set.of(202, 203, 204).contains(plan.getStatus())).count()); unCompleted.add(workOrders.stream().filter(plan -> plan.getStatus() != 8).count());
unCompleted.add(tasks.stream().filter(plan -> plan.getTaskStatus() != 4).count()); unCompleted.add(tasks.stream().filter(plan -> plan.getTaskStatus() != 4).count());
map.put("unCompleted", unCompleted); map.put("unCompleted", unCompleted);
return R.data(map); return R.data(map);

@ -103,8 +103,6 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
workOrderVO.setMaterials(materials); workOrderVO.setMaterials(materials);
User user = UserCache.getUser(workOrderVO.getInformant()); User user = UserCache.getUser(workOrderVO.getInformant());
workOrderVO.setInformantName(user != null ? user.getRealName() : ""); 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())); workOrderVO.setMaintenanceTeamName(SysCache.getDeptName(workOrderVO.getMaintenanceTeam()));
// 维修人员 // 维修人员

Loading…
Cancel
Save