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-07-21 10:46:51 +08:00
parent 855c0b9ec9
commit 476d785dba
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/InitiateEvaluateServiceImpl.java
View File

@ -63,7 +63,7 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService {
JSONArray jsonArray = JSONArray.parseArray(subInfo); JSONArray jsonArray = JSONArray.parseArray(subInfo);
int count = dao.checkIsExistEvaluate(o); int count = dao.checkIsExistEvaluate(o);
if (count > 0) { if (count > 0) {
ar.setFailMsg("当前事业部在"+o.getEvaluateDate()+"已经发起过评价，请勿重复发起!!!"); ar.setFailMsg("当前事业部在" + o.getEvaluateDate() + "已经发起过评价，请勿重复发起!!!");
return ar; return ar;
} }
//判断是否已经发起过评价 //判断是否已经发起过评价
@ -89,8 +89,8 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService {
ar.setFailMsg("评价模板中没有负责部门，请重新选择"); ar.setFailMsg("评价模板中没有负责部门，请重新选择");
return ar; return ar;
} }
List<String > idsList = new ArrayList<>(); List<String> idsList = new ArrayList<>();
List<String > deptIdList = new ArrayList<>(); List<String> deptIdList = new ArrayList<>();
for (String deptId : arr) { for (String deptId : arr) {
if ("0".equals(deptId)) { if ("0".equals(deptId)) {
List<SysUser> sysUsers = dao.getProUserIdByDeptId(jsonArray); List<SysUser> sysUsers = dao.getProUserIdByDeptId(jsonArray);
@ -104,7 +104,7 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService {
idsList.add(ids); idsList.add(ids);
deptIdList.add(deptId); deptIdList.add(deptId);
// dao.insertPjTaskEvaluate(o.getId(), ids, deptId, "1"); // dao.insertPjTaskEvaluate(o.getId(), ids, deptId, "1");
}else if("-1".equals(deptId)){ } else if ("-1".equals(deptId)) {
List<SysUser> sysUsers = dao.getBusinessDivisionUserIdByDeptId(o.getOrgId()); List<SysUser> sysUsers = dao.getBusinessDivisionUserIdByDeptId(o.getOrgId());
String ids = sysUsers.stream() String ids = sysUsers.stream()
.map(sysUser -> sysUser.getId().toString()) .map(sysUser -> sysUser.getId().toString())
@ -116,7 +116,7 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService {
idsList.add(ids); idsList.add(ids);
deptIdList.add(deptId); deptIdList.add(deptId);
// dao.insertPjTaskEvaluate(o.getId(), ids, deptId, "1"); // dao.insertPjTaskEvaluate(o.getId(), ids, deptId, "1");
}else { } else {
// arr删除值为0的元素 // arr删除值为0的元素
String[] arr1 = Arrays.stream(arr).filter(s -> !s.equals("0")).toArray(String[]::new); String[] arr1 = Arrays.stream(arr).filter(s -> !s.equals("0")).toArray(String[]::new);
List<SysUser> sysUsers = dao.getUserIdByDeptId(deptId); List<SysUser> sysUsers = dao.getUserIdByDeptId(deptId);
@ -152,7 +152,7 @@ public class InitiateEvaluateServiceImpl implements InitiateEvaluateService {
uniqueDeptIdList.get(i), ("0".equals(uniqueDeptIdList.get(i)) || "-1".equals(uniqueDeptIdList.get(i))) ? "1" : "0")); uniqueDeptIdList.get(i), ("0".equals(uniqueDeptIdList.get(i)) || "-1".equals(uniqueDeptIdList.get(i))) ? "1" : "0"));
ar.setRes(GlobalConst.SUCCEED); ar.setRes(GlobalConst.SUCCEED);
} catch (Exception e) { } catch (Exception e) {
log.error(e.toString(),e); log.error(e.toString(), e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
ar.setFailMsg(GlobalConst.DATA_FAIL); ar.setFailMsg(GlobalConst.DATA_FAIL);
return ar; return ar;

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

@ -1296,6 +1296,9 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
o.setPostId(orgId); o.setPostId(orgId);
} }
List<String> stringList = dao.getExaminePersonByDeptAndRoleName(o.getPostId(), "审批人"); List<String> stringList = dao.getExaminePersonByDeptAndRoleName(o.getPostId(), "审批人");
if (o.getPostId().equals("7")){
stringList.addAll(dao.getExaminePersonByDeptAndRoleName(o.getPostId(), "汇总审批人"));
}
o.setUserList(String.join(",", stringList)); o.setUserList(String.join(",", stringList));
return dao.addExaminePerson(o); return dao.addExaminePerson(o);
} }