评价数据没有回显出来bug修改
This commit is contained in:
parent
1001060ae1
commit
3d3f1a8c1d
|
|
@ -67,6 +67,7 @@ public class OutSourceBean {
|
||||||
private String rejectReason;
|
private String rejectReason;
|
||||||
private String templateId;
|
private String templateId;
|
||||||
private String deptId;
|
private String deptId;
|
||||||
|
private String userDeptId;
|
||||||
private String isApprove;
|
private String isApprove;
|
||||||
//已评价数量
|
//已评价数量
|
||||||
private String evaluateNum;
|
private String evaluateNum;
|
||||||
|
|
|
||||||
|
|
@ -1223,6 +1223,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
||||||
} else {
|
} else {
|
||||||
o.setDeptId(UserUtil.getLoginUser().getDeptId());
|
o.setDeptId(UserUtil.getLoginUser().getDeptId());
|
||||||
}
|
}
|
||||||
|
o.setUserDeptId(UserUtil.getLoginUser().getDeptId());
|
||||||
return dao.getTeamEvaluateList(o);
|
return dao.getTeamEvaluateList(o);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -190,7 +190,7 @@
|
||||||
SELECT evaluate_id as evaluateId,COUNT(id) as evaluateNum,
|
SELECT evaluate_id as evaluateId,COUNT(id) as evaluateNum,
|
||||||
GROUP_CONCAT(DISTINCT IF(reject_one is null or reject_one = '',null,reject_one)) as rejectReason,
|
GROUP_CONCAT(DISTINCT IF(reject_one is null or reject_one = '',null,reject_one)) as rejectReason,
|
||||||
GROUP_CONCAT(DISTINCT IF(reject_two is null or reject_two = '',null,reject_two)) as rejectReasonTwo
|
GROUP_CONCAT(DISTINCT IF(reject_two is null or reject_two = '',null,reject_two)) as rejectReasonTwo
|
||||||
from pj_evaluate_result where dept_id = #{deptId}
|
from pj_evaluate_result where dept_id = #{userDeptId}
|
||||||
<if test="deptId == 0 or deptId == '0'">
|
<if test="deptId == 0 or deptId == '0'">
|
||||||
and person_id = #{userId}
|
and person_id = #{userId}
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue