From 3156c41a4d416dda52417609379cf71ebf7dde9b Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 19 Jun 2025 16:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TaihuTalentController.java     | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)
 rename src/main/java/com/peanut/modules/{common => taihumed}/controller/TaihuTalentController.java (85%)

diff --git a/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java b/src/main/java/com/peanut/modules/taihumed/controller/TaihuTalentController.java
similarity index 85%
rename from src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java
rename to src/main/java/com/peanut/modules/taihumed/controller/TaihuTalentController.java
index 4dc2ccbf..3ec28bb9 100644
--- a/src/main/java/com/peanut/modules/common/controller/TaihuTalentController.java
+++ b/src/main/java/com/peanut/modules/taihumed/controller/TaihuTalentController.java
@@ -1,26 +1,25 @@
-package com.peanut.modules.common.controller;
+package com.peanut.modules.taihumed.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.peanut.common.utils.R;
-import com.peanut.modules.common.entity.TaihuTalent;
-import com.peanut.modules.common.entity.UserCertificate;
-import com.peanut.modules.common.entity.UserCertificateLabel;
+import com.peanut.modules.common.entity.*;
 import com.peanut.modules.common.service.TaihuTalentService;
 import com.peanut.modules.common.service.UserCertificateLabelService;
 import com.peanut.modules.common.service.UserCertificateService;
+import com.peanut.modules.master.service.CourseService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
-@RestController("commonTaihuTalent")
-@RequestMapping("common/taihuTalent")
+@RestController("taihumedTaihuTalent")
+@RequestMapping("taihumed/taihuTalent")
 public class TaihuTalentController {
 
     @Autowired
@@ -29,6 +28,8 @@ public class TaihuTalentController {
     private UserCertificateService userCertificateService;
     @Autowired
     private UserCertificateLabelService userCertificateLabelService;
+    @Autowired
+    private CourseService courseService;
 
     //太湖英才列表
     @RequestMapping("/getTaihuTalents")
@@ -101,10 +102,17 @@ public class TaihuTalentController {
                 res.add(label);
             }
         }
+        MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper();
+        wrapper.rightJoin(CourseToTalent.class,CourseToTalent::getCourseId,CourseEntity::getId);
+        wrapper.leftJoin(TaihuTalent.class,TaihuTalent::getId,CourseToTalent::getTalentId);
+        wrapper.selectAll(CourseEntity.class);
+        wrapper.eq(CourseToTalent::getTalentId,taihuTalent.getId());
+        List<CourseEntity> courseList = courseService.list(wrapper);
         return R.ok()
                 .put("taihuTalent",taihuTalent)
                 .put("label",titleLabel)
-                .put("certificates",res);
+                .put("certificates",res)
+                .put("courseList",courseList);
     }
 
     void getUserCertificates(List<UserCertificate> us,UserCertificateLabel label,int userId){