liux
/
gs_sub_evaluate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

This commit is contained in:
liang.chao 2025-02-27 13:51:55 +08:00
parent 4798784b8d
commit 58b08f45f7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/OutsourcerEvaluateController.java
View File

@ -42,6 +42,7 @@ public class OutsourcerEvaluateController extends BaseController<EvaluateSubBean
return ar; return ar;
} }
//该接口未使用
@RequestMapping(value = "/getTableList", method = RequestMethod.GET) @RequestMapping(value = "/getTableList", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public AjaxRes getTableList(EvaluateSubBean o) { public AjaxRes getTableList(EvaluateSubBean o) {

4
src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java
View File

@ -47,7 +47,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
} }
@Override @Override
public AjaxRes getTableTitle(EvaluateSubBean o) { public AjaxRes getTableTitle(EvaluateSubBean o) {
AjaxRes ar = new AjaxRes(); AjaxRes ar = new AjaxRes();
String deptId = (StringUtils.isBlank(o.getDeptId()) || "0".equals(o.getDeptId())) ? "0" : o.getDeptId(); 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); 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); childList.add(childMap);
} }
} }
// oneList = oneList.stream().distinct().collect(Collectors.toList()); oneList = oneList.stream().distinct().collect(Collectors.toList());
Map<String, Object> upload = new LinkedHashMap<>(); Map<String, Object> upload = new LinkedHashMap<>();
upload.put("title", "操作"); upload.put("title", "操作");
upload.put("mergeType", "rowspan"); upload.put("mergeType", "rowspan");