From b42609f59a6adb46b60b8a59061e3bae9ae4c6c9 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 5 Jun 2025 10:41:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=B8=9A=E9=83=A8=E8=AF=84=E4=BB=B7?=
=?UTF-8?q?=E4=BA=BA=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E5=A4=9A=E4=BA=BA?=
=?UTF-8?q?=E8=AF=84=E4=BB=B7=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=AA=E5=85=A8?=
=?UTF-8?q?=E9=83=A8=E5=AE=8C=E6=88=90=E8=AF=84=E4=BB=B7=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BF=9D=E5=AD=98=EF=BC=8C=E6=89=80=E6=9C=89?=
=?UTF-8?q?=E9=A1=B9=E5=85=A8=E9=83=A8=E8=AF=84=E4=BB=B7=E5=AE=8C=E6=88=90?=
=?UTF-8?q?=E6=89=8D=E5=8F=AF=E4=BB=A5=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sub/evaluate/evaluate/beans/EvaluateDataBean.java | 1 +
.../mappers/evaluate/OutsourcerEvaluateMapper.xml | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
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}