|
@@ -992,7 +992,9 @@ public class WmSupervisionManager {
|
|
|
|
|
|
// 查询所有的服务商
|
|
|
Page<SysDept> deptPage = deptService.page(new Page<>(query.getCurrent(), query.getSize()),
|
|
|
- Wrappers.<SysDept>lambdaQuery().eq(SysDept::getLevel, 4).in(CollUtil.isNotEmpty(entIds), SysDept::getDeptId, entIds));
|
|
|
+ Wrappers.<SysDept>lambdaQuery().eq(SysDept::getLevel, 4)
|
|
|
+ .eq(StrUtil.isNotBlank(query.getEntName()), SysDept::getName, query.getEntName())
|
|
|
+ .in(CollUtil.isNotEmpty(entIds), SysDept::getDeptId, entIds));
|
|
|
|
|
|
List<SysDept> depts = deptPage.getRecords();
|
|
|
|
|
@@ -1003,7 +1005,7 @@ public class WmSupervisionManager {
|
|
|
// 封装参数
|
|
|
|
|
|
List<Map<String, Object>> collect = depts.stream().map(dept -> {
|
|
|
- Map<String, Object> map = new HashMap<>(3);
|
|
|
+ Map<String, Object> map = new HashMap<>(5);
|
|
|
map.put("deptName", dept.getName());
|
|
|
map.put("deptId", dept.getDeptId());
|
|
|
|
|
@@ -1035,6 +1037,8 @@ public class WmSupervisionManager {
|
|
|
stat.put("supTotal", supTotal);
|
|
|
stat.put("total", total);
|
|
|
map.put("taskSupStat", stat);
|
|
|
+ map.put("toCheck", supTotal != total);
|
|
|
+ map.put("checked", supTotal != 0);
|
|
|
|
|
|
return map;
|
|
|
}).collect(Collectors.toList());
|