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

事业部无法查看评价bug修复

This commit is contained in:
liang.chao 2025-04-16 10:25:24 +08:00
parent 7ed334dc80
commit d980d27cb9
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java
View File

@ -151,4 +151,6 @@ public interface OutsourcerEvaluateDao {
List<String> getPjEvaluateResultDeptId(EvaluateDataBean o); List<String> getPjEvaluateResultDeptId(EvaluateDataBean o);
List<String> getPjTaskEvaluatedPostId(EvaluateDataBean o); List<String> getPjTaskEvaluatedPostId(EvaluateDataBean o);
List<String> getOrgList();
} }

11
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);
@ -513,7 +513,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
} }
} }
outsourcerEvaluateDao.deleteEvaluateData(o); outsourcerEvaluateDao.deleteEvaluateData(o);
outsourcerEvaluateDao.updateEvalStatus("2",o.getEvaluateId()); outsourcerEvaluateDao.updateEvalStatus("2", o.getEvaluateId());
outsourcerEvaluateDao.saveEvaluateData(detailsList); outsourcerEvaluateDao.saveEvaluateData(detailsList);
o.setIsApprove("0"); o.setIsApprove("0");
o.setEvaluateType("3"); o.setEvaluateType("3");
@ -1217,7 +1217,12 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
@Override @Override
public List<OutSourceBean> getTeamEvaluateList(OutSourceBean o) { public List<OutSourceBean> getTeamEvaluateList(OutSourceBean o) {
o.setUserId(UserUtil.getLoginUser().getId().toString()); o.setUserId(UserUtil.getLoginUser().getId().toString());
o.setDeptId(UserUtil.getLoginUser().getDeptId()); List<String> orgList = dao.getOrgList();
if (orgList.size() > 0 && orgList.contains(UserUtil.getLoginUser().getDeptId())) {
o.setDeptId("-1");
} else {
o.setDeptId(UserUtil.getLoginUser().getDeptId());
}
return dao.getTeamEvaluateList(o); return dao.getTeamEvaluateList(o);
} }

8
src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml
View File

@ -802,6 +802,14 @@
<select id="getPjTaskEvaluatedPostId" resultType="java.lang.String"> <select id="getPjTaskEvaluatedPostId" resultType="java.lang.String">
select post_id from pj_task_evaluated where evaluate_id =#{evaluateId} select post_id from pj_task_evaluated where evaluate_id =#{evaluateId}
</select> </select>
<select id="getOrgList" resultType="java.lang.String">
select
id
from
pm_org_info
where
org_type = '1'
</select>
<update id="updateEvaluateRecordByEvaluateId"> <update id="updateEvaluateRecordByEvaluateId">
update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId} update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId}