解决专业限制条件查询接口没有数据的问题

src/main/java/com/xjrsoft/module/banding/controller/BandingTaskMajorConditionController.java

@@ -1,18 +1,11 @@
 package com.xjrsoft.module.banding.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.hutool.core.util.ObjectUtil;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.xjrsoft.common.enums.DeleteMark;
 import com.xjrsoft.common.model.result.RT;
-import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.banding.dto.BandingTaskMajorConditionListDto;
 import com.xjrsoft.module.banding.dto.SaveMajorConditionDto;
-import com.xjrsoft.module.banding.entity.BandingTaskMajorCondition;
 import com.xjrsoft.module.banding.service.IBandingTaskMajorConditionService;
 import com.xjrsoft.module.banding.vo.BandingTaskMajorConditionListVo;
-import com.xjrsoft.module.base.entity.BaseMajorSet;
-import com.xjrsoft.module.base.service.IBaseMajorSetService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -39,25 +32,12 @@ public class BandingTaskMajorConditionController {
 
 
     private final IBandingTaskMajorConditionService conditionService;
-    private final IBaseMajorSetService majorSetService;
 
     @GetMapping(value = "/list")
     @ApiOperation(value="专业限制条件列表")
     @SaCheckPermission("bandingtaskmajorcondition:detail")
     public RT<List<BandingTaskMajorConditionListVo>> page(@Valid BandingTaskMajorConditionListDto dto){
-
-        List<BandingTaskMajorConditionListVo> page = majorSetService.selectJoinList(BandingTaskMajorConditionListVo.class,
-                new MPJLambdaWrapper<BaseMajorSet>().disableSubLogicDel()
-                        .eq(ObjectUtil.isNotNull(dto.getBandingTaskId()), BandingTaskMajorCondition::getBandingTaskId, dto.getBandingTaskId())
-                        .eq(BaseMajorSet::getDeleteMark, DeleteMark.NODELETE.getCode())
-                        .select(BandingTaskMajorCondition::getId)
-                        .select(BaseMajorSet.class, x -> VoToColumnUtil.fieldsToColumns(BaseMajorSet.class).contains(x.getProperty()))
-                        .selectAs(BaseMajorSet::getId, BandingTaskMajorConditionListVo::getMajorSetId)
-                        .selectAs(BaseMajorSet::getName, BandingTaskMajorConditionListVo::getMajorSetName)
-                        .selectAs(BandingTaskMajorCondition::getHeight, BandingTaskMajorConditionListVo::getHeight)
-                        .selectAs(BandingTaskMajorCondition::getScore, BandingTaskMajorConditionListVo::getScore)
-                        .leftJoin(BandingTaskMajorCondition.class, BandingTaskMajorCondition::getMajorSetId, BaseMajorSet::getId)
-        );
+        List<BandingTaskMajorConditionListVo> page = conditionService.getList(dto);
         return RT.ok(page);
     }
 

src/main/java/com/xjrsoft/module/banding/mapper/BandingTaskMajorConditionMapper.java

@@ -1,8 +1,13 @@
 package com.xjrsoft.module.banding.mapper;
 
 import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.banding.dto.BandingTaskMajorConditionListDto;
 import com.xjrsoft.module.banding.entity.BandingTaskMajorCondition;
+import com.xjrsoft.module.banding.vo.BandingTaskMajorConditionListVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
 * @title: 新生分班任务规则
@@ -13,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BandingTaskMajorConditionMapper extends MPJBaseMapper<BandingTaskMajorCondition> {
 
+    List<BandingTaskMajorConditionListVo> getList(@Param("dto") BandingTaskMajorConditionListDto dto);
 }

src/main/java/com/xjrsoft/module/banding/service/IBandingTaskMajorConditionService.java

@@ -1,8 +1,11 @@
 package com.xjrsoft.module.banding.service;
 
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.banding.dto.BandingTaskMajorConditionListDto;
 import com.xjrsoft.module.banding.dto.SaveMajorConditionDto;
 import com.xjrsoft.module.banding.entity.BandingTaskMajorCondition;
+import com.xjrsoft.module.banding.vo.BandingTaskMajorConditionListVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -21,4 +24,7 @@ public interface IBandingTaskMajorConditionService extends MPJBaseService<Bandin
     Boolean delete(List<Long> ids);
 
     Boolean save(SaveMajorConditionDto dto);
+
+
+    List<BandingTaskMajorConditionListVo> getList(BandingTaskMajorConditionListDto dto);
 }

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskMajorConditionServiceImpl.java

@@ -3,10 +3,12 @@ package com.xjrsoft.module.banding.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.banding.dto.BandingTaskMajorConditionDto;
+import com.xjrsoft.module.banding.dto.BandingTaskMajorConditionListDto;
 import com.xjrsoft.module.banding.dto.SaveMajorConditionDto;
 import com.xjrsoft.module.banding.entity.BandingTaskMajorCondition;
 import com.xjrsoft.module.banding.mapper.BandingTaskMajorConditionMapper;
 import com.xjrsoft.module.banding.service.IBandingTaskMajorConditionService;
+import com.xjrsoft.module.banding.vo.BandingTaskMajorConditionListVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -65,4 +67,9 @@ public class BandingTaskMajorConditionServiceImpl extends MPJBaseServiceImpl<Ban
         }
         return true;
     }
+
+    @Override
+    public List<BandingTaskMajorConditionListVo> getList(BandingTaskMajorConditionListDto dto) {
+        return this.baseMapper.getList(dto);
+    }
 }

src/main/java/com/xjrsoft/module/banding/service/impl/BandingTaskServiceImpl.java

@@ -171,7 +171,9 @@ public class BandingTaskServiceImpl extends MPJBaseServiceImpl<BandingTaskMapper
         }
 
         if(ruleCodes.contains("BR0002")){
-
+            /**
+             * 1、先把每个专业匹配的学生
+             */
         }
         //存班级和学生的关系
         Map<Long, Long> studentClassMap = new HashMap<>();

src/main/resources/mapper/banding/BandingTaskMajorConditionMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.banding.mapper.BandingTaskMajorConditionMapper">
+    <select id="getList" parameterType="com.xjrsoft.module.banding.dto.BandingTaskMajorConditionListDto"
+            resultType="com.xjrsoft.module.banding.vo.BandingTaskMajorConditionListVo">
+        SELECT t1.id, t.id AS major_set_id, t.name AS major_set_name,t1.banding_task_id,t1.height,t1.score, t1.sort_code FROM base_major_set t
+        LEFT JOIN banding_task_major_condition t1 ON t1.major_set_id = t.id and t1.banding_task_id = #{dto.bandingTaskId}
+        WHERE t.delete_mark = 0
+    </select>
+
+</mapper>