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

updates

This commit is contained in:
zhouwentao 2025-06-26 14:02:44 +08:00
parent 02bfd920b4
commit ab334e0e03
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java
View File

@ -243,7 +243,8 @@ public class YxScoreController {
LambdaUpdateWrapper<YxCalculationMajor> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<YxCalculationMajor> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(YxCalculationMajor::getScoreId,scoreId); updateWrapper.eq(YxCalculationMajor::getScoreId,scoreId);
updateWrapper.set(YxCalculationMajor::getScoreId,bakScoreId); updateWrapper.set(YxCalculationMajor::getScoreId,bakScoreId);
yxCalculationMajorService.update(updateWrapper); yxCalculationMajorService.updateScoreId(yxUserScore.getCalculationTableName() ,scoreId, bakScoreId);
// yxCalculationMajorService.update(updateWrapper);
try { try {
// 重新计算专业 // 重新计算专业
List<RecommendMajorDTO> recommendMajorDTOList = yxCalculationMajorService.calculationMajor(yxUserScore); List<RecommendMajorDTO> recommendMajorDTOList = yxCalculationMajorService.calculationMajor(yxUserScore);

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java
View File

@ -26,4 +26,6 @@ public interface YxCalculationMajorMapper extends BaseMapper<YxCalculationMajor>
List<String> groupByBatchNumber(@Param(value = "tableName")String tableName,@Param("queryvo") QueryRecommendMajorVO queryRecommendMajorVO); List<String> groupByBatchNumber(@Param(value = "tableName")String tableName,@Param("queryvo") QueryRecommendMajorVO queryRecommendMajorVO);
YxCalculationMajor getCalculationById(@Param("calculationTableName") String calculationTableName, @Param("calculationMajorId") String calculationMajorId); YxCalculationMajor getCalculationById(@Param("calculationTableName") String calculationTableName, @Param("calculationMajorId") String calculationMajorId);
int updateScoreId(@Param("calculationTableName") String calculationTableName,@Param("scoreId") String scoreId,@Param("bakScoreId") String bakScoreId);
} }

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml
View File

@ -32,6 +32,11 @@
) )
</foreach> </foreach>
</insert> </insert>
<update id="updateScoreId">
UPDATE ${calculationTableName}
SET score_id = #{scoreId}
WHERE score_id = #{bakScoreId}
</update>
<select id="recommendMajorList" resultType="org.jeecg.modules.web.dto.RecommendMajorDTO"> <select id="recommendMajorList" resultType="org.jeecg.modules.web.dto.RecommendMajorDTO">
SELECT SELECT

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java
View File

@ -64,4 +64,6 @@ public interface IYxCalculationMajorService extends IService<YxCalculationMajor>
List<String> groupByBatchNumber(QueryRecommendMajorVO queryRecommendMajorVO); List<String> groupByBatchNumber(QueryRecommendMajorVO queryRecommendMajorVO);
YxCalculationMajor getCalculationById(String calculationTableName, String calculationMajorId); YxCalculationMajor getCalculationById(String calculationTableName, String calculationMajorId);
boolean updateScoreId(String calculationTableName, String scoreId, String bakScoreId);
} }

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

@ -472,6 +472,11 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
return baseMapper.getCalculationById(calculationTableName, calculationMajorId); return baseMapper.getCalculationById(calculationTableName, calculationMajorId);
} }
@Override
public boolean updateScoreId(String calculationTableName, String scoreId, String bakScoreId) {
return baseMapper.updateScoreId(calculationTableName, scoreId, bakScoreId) >= 1;
}
private void setSchoolTagsList(List<RecommendMajorDTO> recommendMajorList) { private void setSchoolTagsList(List<RecommendMajorDTO> recommendMajorList) {
if (CollectionUtils.isNotEmpty(recommendMajorList)) { if (CollectionUtils.isNotEmpty(recommendMajorList)) {
Set<String> schoolIdSet = recommendMajorList.stream().map(RecommendMajorDTO::getSchoolId).collect(Collectors.toSet()); Set<String> schoolIdSet = recommendMajorList.stream().map(RecommendMajorDTO::getSchoolId).collect(Collectors.toSet());
@ -604,7 +609,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0); recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
continue; continue;
} }
if("5000".equals(recommendMajorDTO.getSchoolCode())){ if("6195".equals(recommendMajorDTO.getSchoolCode()) && "高职高专".equals(recommendMajorDTO.getBatch())){
System.out.println("qvq"); System.out.println("qvq");
} }