待审核红点提示和分包商评价模板修改
This commit is contained in:
parent
fdbd209b6f
commit
8674907964
|
|
@ -146,6 +146,15 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
||||||
childList.add(childMap);
|
childList.add(childMap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
oneList = oneList.stream().distinct().collect(Collectors.toList());
|
||||||
|
Map<String, Object> upload = new LinkedHashMap<>();
|
||||||
|
upload.put("title", "操作");
|
||||||
|
upload.put("mergeType", "rowspan");
|
||||||
|
upload.put("num", 3);
|
||||||
|
upload.put("minWidth", 100);
|
||||||
|
upload.put("field", "examineAndApprove");
|
||||||
|
oneList.add(upload);
|
||||||
|
|
||||||
finalList.add(oneList);
|
finalList.add(oneList);
|
||||||
finalList.add(twoList);
|
finalList.add(twoList);
|
||||||
finalList.add(threeList);
|
finalList.add(threeList);
|
||||||
|
|
@ -1021,6 +1030,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
||||||
}
|
}
|
||||||
list.add(map);
|
list.add(map);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addCollectTitleMap(List<Map<String, Object>> list, String title, String field, int num, int minWidth
|
private void addCollectTitleMap(List<Map<String, Object>> list, String title, String field, int num, int minWidth
|
||||||
, String countType, String standardScore) {
|
, String countType, String standardScore) {
|
||||||
Map<String, Object> map = new LinkedHashMap<>();
|
Map<String, Object> map = new LinkedHashMap<>();
|
||||||
|
|
|
||||||
|
|
@ -88,6 +88,9 @@ public class PermissionController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
permission.getChild().forEach(cc -> {
|
||||||
|
cc.getChild().forEach(c -> {
|
||||||
if (c.getHref().equals("pages/evaluate/team/evaluateCheckList.html")) {
|
if (c.getHref().equals("pages/evaluate/team/evaluateCheckList.html")) {
|
||||||
for (TeamEvaluateBean teamEvaluateBean : teamEvaluateBeans) {
|
for (TeamEvaluateBean teamEvaluateBean : teamEvaluateBeans) {
|
||||||
if ("5".equals(loginUser.getRoleId()) ||
|
if ("5".equals(loginUser.getRoleId()) ||
|
||||||
|
|
@ -109,6 +112,7 @@ public class PermissionController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
return firstLevel;
|
return firstLevel;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue