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

Merge branch 'master' of http://192.168.0.75:3000/liux/gs_sub_evaluate

This commit is contained in:
BianLzhaoMin 2025-02-27 09:29:29 +08:00
parent a7e665cee3 09813ecbc0
commit 47a08bbf6b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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");
@ -360,7 +360,6 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
public AjaxRes saveEvaluateData(EvaluateDataBean o) {
AjaxRes ar = new AjaxRes();
try {
String deptId = UserUtil.getLoginUser().getDeptId();
String userId = String.valueOf(UserUtil.getLoginUser().getId());
o.setDeptId(deptId);
@ -1075,7 +1074,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
private void addSummaryMap(List<Map<String, Object>> twoList, SetTemplateBean setTemplateBean, int childNum,
int twoNum, String parentId) {
//判断当前二级标题下是否有部门 且二级标题大于1
if (childNum > 1 && setTemplateBean.getResponsibleDepartment().split(",").length > 1) {
if (childNum > 1 && setTemplateBean.getResponsibleDepartment().split(",").length > 0) {
//添加小计
addChildMap(twoList, createTemplateBean("小计", setTemplateBean.getParentId(), setTemplateBean.getId()), 2,
2, parentId);

1
src/main/resources/mappers/evaluate/SetTemplateMapper.xml
View File

@ -59,6 +59,7 @@
<if test="createUser != null and createUser != ''">
AND ptc.create_user_name LIKE CONCAT('%', #{createUser}, '%')
</if>
GROUP BY ptc.config_id
ORDER BY
ptc.config_id DESC
</select>