diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvaluateDataBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvaluateDataBean.java index ebe1319..6086e12 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvaluateDataBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/EvaluateDataBean.java @@ -22,6 +22,7 @@ public class EvaluateDataBean { private String userId; private String userName; private String isProject; + private String personIds; private String rejectReason; private String type; diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml index ebac47d..59d5068 100644 --- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml +++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml @@ -75,7 +75,11 @@ 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 = - '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} @@ -556,13 +560,13 @@ sub_evaluate_id as templateId, dept_id as deptId, json as jsonData, - su.username as userName, + GROUP_CONCAT(su.username ) as userName, per.person_id as userId, ifnull(per.check_one,'0') as isApprove, ifnull(per.check_two,'0') as isTwoApprove, ifnull(per.check_three,'0') as isThreeApprove 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 evaluate_id = #{evaluateId} and sub_evaluate_id = #{templateId} and dept_id = #{deptId}