yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: updates

This commit is contained in:
zhouwentao 2025-12-16 17:48:08 +08:00
parent 1cc2800238
commit 9dd3eb5714
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/service/WebMajorService.java
View File

@ -7,7 +7,6 @@ import org.jeecg.modules.web.dto.WebMajorDTO;
import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.web.vo.QueryRecommendMajorVO;
import org.jeecg.modules.yx.dto.UserScoreDTO; import org.jeecg.modules.yx.dto.UserScoreDTO;
import org.jeecg.modules.yx.mapper.YxMajorMapper; import org.jeecg.modules.yx.mapper.YxMajorMapper;
import org.jeecg.modules.yx.service.IYxUserScoreService;
import org.jeecg.modules.yx.service.impl.UserScoreService; import org.jeecg.modules.yx.service.impl.UserScoreService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
View File

@ -593,7 +593,8 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
} }
// && "美术学（师范）".equals(recommendMajorDTO.getMajorName()) // && "美术学（师范）".equals(recommendMajorDTO.getMajorName())
if("6501".equals(recommendMajorDTO.getSchoolCode())){ if("2565".equals(recommendMajorDTO.getSchoolCode())
&& "视觉传达设计".equals(recommendMajorDTO.getMajorName())){
System.out.println("qvq"); System.out.println("qvq");
} }

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxMajorServiceImpl.java
View File

@ -15,7 +15,6 @@ import org.jeecg.modules.yx.entity.YxHistoryMajorEnroll;
import org.jeecg.modules.yx.entity.YxMajor; import org.jeecg.modules.yx.entity.YxMajor;
import org.jeecg.modules.yx.entity.YxSchoolMajor; import org.jeecg.modules.yx.entity.YxSchoolMajor;
import org.jeecg.modules.yx.mapper.YxMajorMapper; import org.jeecg.modules.yx.mapper.YxMajorMapper;
import org.jeecg.modules.yx.service.IYxFirstLevelDisciplinesService;
import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService; import org.jeecg.modules.yx.service.IYxHistoryMajorEnrollService;
import org.jeecg.modules.yx.service.IYxMajorService; import org.jeecg.modules.yx.service.IYxMajorService;
import org.jeecg.modules.yx.service.IYxSchoolMajorService; import org.jeecg.modules.yx.service.IYxSchoolMajorService;
@ -36,8 +35,6 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class YxMajorServiceImpl extends ServiceImpl<YxMajorMapper, YxMajor> implements IYxMajorService { public class YxMajorServiceImpl extends ServiceImpl<YxMajorMapper, YxMajor> implements IYxMajorService {
@Resource
private IYxFirstLevelDisciplinesService yxFirstLevelDisciplinesService;
@Resource @Resource
private IYxSchoolMajorService yxSchoolMajorService; private IYxSchoolMajorService yxSchoolMajorService;
@Resource @Resource
@ -115,8 +112,6 @@ public class YxMajorServiceImpl extends ServiceImpl<YxMajorMapper, YxMajor> impl
} }
lambdaQueryWrapper.eq(StringUtils.isNotBlank(queryRecommendMajorVO.getEducationalLevel()),YxMajor::getEducationalLevel,queryRecommendMajorVO.getEducationalLevel()); lambdaQueryWrapper.eq(StringUtils.isNotBlank(queryRecommendMajorVO.getEducationalLevel()),YxMajor::getEducationalLevel,queryRecommendMajorVO.getEducationalLevel());
lambdaQueryWrapper.isNotNull(YxMajor::getXkfl).isNotNull(YxMajor::getZyl); lambdaQueryWrapper.isNotNull(YxMajor::getXkfl).isNotNull(YxMajor::getZyl);
//lambdaQueryWrapper.notLike(YxMajor::getMajorName,"类");//不要***类的
// lambdaQueryWrapper.eq(YxMajor::getMajorName,"音乐表演");
List<YxMajor> yxMajorList = this.list(lambdaQueryWrapper); List<YxMajor> yxMajorList = this.list(lambdaQueryWrapper);
//没有数据，返回空集合 //没有数据，返回空集合
if (CollectionUtils.isEmpty(yxMajorList)) { if (CollectionUtils.isEmpty(yxMajorList)) {