代码提交
This commit is contained in:
parent
4798784b8d
commit
58b08f45f7
|
|
@ -42,6 +42,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
|
|||
return ar;
|
||||
}
|
||||
|
||||
//该接口未使用
|
||||
@RequestMapping(value = "/getTableList", method = RequestMethod.GET)
|
||||
@ResponseBody
|
||||
public AjaxRes getTableList(EvaluateSubBean o) {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
|||
}
|
||||
|
||||
@Override
|
||||
public AjaxRes getTableTitle(EvaluateSubBean o) {
|
||||
public AjaxRes getTableTitle(EvaluateSubBean o) {
|
||||
AjaxRes ar = new AjaxRes();
|
||||
String deptId = (StringUtils.isBlank(o.getDeptId()) || "0".equals(o.getDeptId())) ? "0" : o.getDeptId();
|
||||
String deptName = (StringUtils.isBlank(o.getDeptId()) || "0".equals(o.getDeptId())) ? "项目部" : dao.getDeptNameById(deptId);
|
||||
|
|
@ -146,7 +146,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
|||
childList.add(childMap);
|
||||
}
|
||||
}
|
||||
// oneList = oneList.stream().distinct().collect(Collectors.toList());
|
||||
oneList = oneList.stream().distinct().collect(Collectors.toList());
|
||||
Map<String, Object> upload = new LinkedHashMap<>();
|
||||
upload.put("title", "操作");
|
||||
upload.put("mergeType", "rowspan");
|
||||
|
|
|
|||
Loading…
Reference in New Issue