zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
wuchunlei
2025-06-19 13:24:34 +08:00
parent 613db2fc0b
commit 20c53190b3
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/peanut/modules/master/controller/CourseTaihumedController.java
View File

@@ -93,16 +93,16 @@ public class CourseTaihumedController {
@RequestMapping("/getCourseListForTaihumed") @RequestMapping("/getCourseListForTaihumed")
public R getCourseListForMedical(@RequestBody Map<String,Object> params){ public R getCourseListForMedical(@RequestBody Map<String,Object> params){
MPJLambdaWrapper<CourseToTaihumed> wrapper = new MPJLambdaWrapper<>(); MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(CourseEntity.class); wrapper.selectAll(CourseEntity.class);
wrapper.selectAs(CourseToTaihumed::getId,"bindId"); wrapper.selectAs(CourseToTaihumed::getId,"bindId");
wrapper.selectAs(CourseToTaihumed::getSort,"toSociologySort"); wrapper.selectAs(CourseToTaihumed::getSort,"toSociologySort");
wrapper.selectAs(CourseToTaihumed::getLevel,"level"); wrapper.selectAs(CourseToTaihumed::getLevel,"level");
wrapper.selectAs(CourseToTaihumed::getSelective,"selective"); wrapper.selectAs(CourseToTaihumed::getSelective,"selective");
wrapper.leftJoin(CourseEntity.class,CourseEntity::getId, CourseToTaihumed::getCourseId); wrapper.rightJoin(CourseToTaihumed.class,CourseToTaihumed::getCourseId,CourseEntity::getId);
wrapper.eq(CourseToTaihumed::getTaihumedId,params.get("taihumedId")); wrapper.eq(CourseToTaihumed::getTaihumedId,params.get("id"));
wrapper.orderByAsc(CourseToTaihumed::getSort); wrapper.orderByAsc(CourseToTaihumed::getSort);
List<Object> courseEntities = courseToTaihumedService.listObjs(wrapper); List<CourseEntity> courseEntities = courseService.list(wrapper);
return R.ok().put("courseList",courseEntities); return R.ok().put("courseList",courseEntities);
} }

10
src/main/java/com/peanut/modules/taihumed/controller/CourseController.java
View File

@@ -114,7 +114,8 @@ public class CourseController {
.eq(CourseToTalent::getTalentId,taihuTalent.getId())); .eq(CourseToTalent::getTalentId,taihuTalent.getId()));
List<Integer> collect = courseToTalents.stream().map(CourseToTalent::getCourseId).collect(Collectors.toList()); List<Integer> collect = courseToTalents.stream().map(CourseToTalent::getCourseId).collect(Collectors.toList());
List<CourseToTaihumed> cTTs = courseToTaihumedService.list(new LambdaQueryWrapper<CourseToTaihumed>() List<CourseToTaihumed> cTTs = courseToTaihumedService.list(new LambdaQueryWrapper<CourseToTaihumed>()
.in(CourseToTaihumed::getCourseId,collect)); .in(CourseToTaihumed::getCourseId,collect)
.ne(CourseToTaihumed::getTaihumedId,101));
List<Integer> tls = new ArrayList<>(); List<Integer> tls = new ArrayList<>();
for (CourseToTaihumed ctt:cTTs){ for (CourseToTaihumed ctt:cTTs){
topLael(tls,ctt.getTaihumedId()); topLael(tls,ctt.getTaihumedId());
@@ -126,6 +127,12 @@ public class CourseController {
} }
} }
} }
if (!flag){
//会议论坛
if (collect.contains(params.get("courseId"))){
flag = true;
}
}
} }
if (!flag){ if (!flag){
//不是太湖英才，不是vip，查询买课 //不是太湖英才，不是vip，查询买课
@@ -134,6 +141,7 @@ public class CourseController {
.eq(UserCourseBuyEntity::getCatalogueId,params.get("catalogueId")) .eq(UserCourseBuyEntity::getCatalogueId,params.get("catalogueId"))
.orderByDesc(UserCourseBuyEntity::getEndTime)); .orderByDesc(UserCourseBuyEntity::getEndTime));
if (ucbs.size() > 0){ if (ucbs.size() > 0){
flag = true;
endTime = ucbs.get(0).getEndTime()==null?"":ucbs.get(0).getEndTime().toString(); endTime = ucbs.get(0).getEndTime()==null?"":ucbs.get(0).getEndTime().toString();
} }
} }