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-06-05 10:41:37 +08:00
parent dcc2209842
commit b42609f59a
2 changed files with 8 additions and 3 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/beans/EvaluateDataBean.java
View File

@ -22,6 +22,7 @@ public class EvaluateDataBean {
private String userId; private String userId;
private String userName; private String userName;
private String isProject; private String isProject;
private String personIds;
private String rejectReason; private String rejectReason;
private String type; private String type;

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

@ -75,7 +75,11 @@
<update id="updateEvaluateChildData"> <update id="updateEvaluateChildData">
update pj_evaluate_result set json = #{jsonData},title_list = #{titleFiled},is_project = update pj_evaluate_result set json = #{jsonData},title_list = #{titleFiled},is_project =
#{isProject},check_one = '0',check_person_one = '0',reject_one = '',check_two = '0',check_person_two = #{isProject},check_one = '0',check_person_one = '0',reject_one = '',check_two = '0',check_person_two =
'0',reject_two = '',person_id = #{userId} '0',reject_two = '',person_id = #{userId},person_ids =
CASE
WHEN person_ids IS NULL OR person_ids = '' THEN #{userId}
ELSE CONCAT(person_ids, ',', #{userId})
END
where id = #{id} where id = #{id}
</update> </update>
@ -556,13 +560,13 @@
sub_evaluate_id as templateId, sub_evaluate_id as templateId,
dept_id as deptId, dept_id as deptId,
json as jsonData, json as jsonData,
su.username as userName, GROUP_CONCAT(su.username ) as userName,
per.person_id as userId, per.person_id as userId,
ifnull(per.check_one,'0') as isApprove, ifnull(per.check_one,'0') as isApprove,
ifnull(per.check_two,'0') as isTwoApprove, ifnull(per.check_two,'0') as isTwoApprove,
ifnull(per.check_three,'0') as isThreeApprove ifnull(per.check_three,'0') as isThreeApprove
from pj_evaluate_result per from pj_evaluate_result per
left join sys_user su on per.person_id = su.id LEFT JOIN sys_user su ON FIND_IN_SET(su.id, per.person_ids)
where where
evaluate_id = #{evaluateId} and sub_evaluate_id = #{templateId} and dept_id = #{deptId} evaluate_id = #{evaluateId} and sub_evaluate_id = #{templateId} and dept_id = #{deptId}
<if test="userId !=null and userId !='null' and userId !=''"> <if test="userId !=null and userId !='null' and userId !=''">