zcloud_gbs
/
zcloud_gbs_edu
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复培训用户项目查询中的数据类型和关联表问题

dev
zhangyue 2026-04-10 10:38:00 +08:00
parent 17c650c40b
commit 27f9b9cbb3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-client/src/main/java/com/zcloud/edu/dto/training/TrainingUserPageProjectQry.java
View File

@ -29,7 +29,7 @@ public class TrainingUserPageProjectQry extends PageQuery {
private Integer flowFlag; private Integer flowFlag;
private Integer noMain; private Integer noMain;
private Integer eqEmploymentFlag; private Integer eqEmploymentFlag;
private List<Integer> departmentList; private List<Long> departmentList;
private String name; private String name;
private Integer corpinfoId; private Integer corpinfoId;

11
web-infrastructure/src/main/resources/mapper/study/StudentMapper.xml
View File

@ -423,8 +423,8 @@
<select id="educationUserList" resultType="com.zcloud.edu.dto.clientobject.study.EducationUserCO"> <select id="educationUserList" resultType="com.zcloud.edu.dto.clientobject.study.EducationUserCO">
SELECT SELECT
GROUP_CONCAT(DISTINCT p.corpinfo_id SEPARATOR ', ') AS corpinfo_id, GROUP_CONCAT(DISTINCT c.id SEPARATOR ', ') AS corpinfo_id,
GROUP_CONCAT(DISTINCT p.corpinfo_name SEPARATOR ', ') AS corpinfo_name, GROUP_CONCAT(DISTINCT c.corp_name SEPARATOR ', ') AS corpinfo_name,
GROUP_CONCAT(DISTINCT p.project_id SEPARATOR ', ') AS project_id, GROUP_CONCAT(DISTINCT p.project_id SEPARATOR ', ') AS project_id,
GROUP_CONCAT(DISTINCT p.project_name SEPARATOR ', ') AS project_name, GROUP_CONCAT(DISTINCT p.project_name SEPARATOR ', ') AS project_name,
u.name, u.name,
@ -444,15 +444,16 @@
WHERE delete_enum = 'FALSE' AND apply_type IN (2, 3) WHERE delete_enum = 'FALSE' AND apply_type IN (2, 3)
) tap ON tap.training_apply_record_id = tau.training_apply_record_id AND tap.rn = 1 ) tap ON tap.training_apply_record_id = tau.training_apply_record_id AND tap.rn = 1
left join user u on tau.user_id = u.id left join user u on tau.user_id = u.id
left join project_user f on u.id = f.user_id left join corp_info c on c.id = u.corpinfo_id
left join project_user f on u.id = f.user_id and f.delete_enum = 'FALSE'
left join project p on p.id = f.project_id and p.project_status = 4 left join project p on p.id = f.project_id and p.project_status = 4
left join department d on d.id = u.department_id left join department d on d.id = u.department_id
left join post po on u.post_id = po.id left join post po on u.post_id = po.id
left join training_user tu on tu.phone = u.phone left join training_user tu on tu.phone = u.phone
LEFT JOIN project_approval_flow paf on paf.project_id = p.id and paf.delete_enum = 'FALSE' and paf.audit_type = 2 and paf.approval_status = 2 LEFT JOIN project_approval_flow paf on paf.project_id = p.id and paf.delete_enum = 'FALSE' and paf.audit_type = 2 and paf.approval_status = 2
and paf.corpinfo_id = #{params.eqProjectCorpInfoId} and paf.corpinfo_id = #{params.eqProjectCorpInfoId}
where f.delete_enum = 'FALSE' where
and tap.corpinfo_id = #{params.eqProjectCorpInfoId} tap.corpinfo_id = #{params.eqProjectCorpInfoId}
and tau.delete_enum = 'FALSE' and tau.delete_enum = 'FALSE'
and tar.delete_enum = 'FALSE' and tar.delete_enum = 'FALSE'
and tau.apply_status = 2 and tau.apply_status = 2