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 08:19:40 +08:00
parent 7a0891ba12
commit 792aa90388
4 changed files with 13 additions and 3 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

@ -79,6 +79,9 @@ public class YxScoreController {
AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal750) > 0, "[文化成绩]最高分为750"); AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal750) > 0, "[文化成绩]最高分为750");
AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal0) < 0, "[文化成绩]最低分为0"); AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal0) < 0, "[文化成绩]最低分为0");
if (professionalScore == null) {
professionalScore = YxConstant.bigDecimal0;
}
if ("音乐类".equals(professionalCategory)) { if ("音乐类".equals(professionalCategory)) {
AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal300) > 0, "[主项成绩]最高分为300"); AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal300) > 0, "[主项成绩]最高分为300");
AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal0) < 0, "[主项成绩]最低分为0"); AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal0) < 0, "[主项成绩]最低分为0");

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

@ -112,6 +112,9 @@ public class YxVipCardController extends JeecgController<YxVipCard, IYxVipCardSe
LambdaUpdateWrapper<YxVipCard> lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<YxVipCard> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
lambdaUpdateWrapper.eq(YxVipCard::getId,yxVipCard.getId()); lambdaUpdateWrapper.eq(YxVipCard::getId,yxVipCard.getId());
lambdaUpdateWrapper.set(YxVipCard::getCardNum,yxVipCard.getCardNum()); lambdaUpdateWrapper.set(YxVipCard::getCardNum,yxVipCard.getCardNum());
lambdaUpdateWrapper.set(YxVipCard::getValidTime,yxVipCard.getValidTime());
lambdaUpdateWrapper.set(YxVipCard::getValidDate,yxVipCard.getValidDate());
lambdaUpdateWrapper.set(YxVipCard::getSkuCode, yxVipCard.getSkuCode());
yxVipCardService.update(lambdaUpdateWrapper); yxVipCardService.update(lambdaUpdateWrapper);
//yxVipCardService.updateById(yxVipCard); //yxVipCardService.updateById(yxVipCard);
return Result.OK("编辑成功!"); return Result.OK("编辑成功!");

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxVipCard.java
View File

@ -50,9 +50,9 @@ public class YxVipCard implements Serializable {
@ApiModelProperty(value = "有效时长(天)") @ApiModelProperty(value = "有效时长(天)")
private Integer validTime; private Integer validTime;
/**有效期至*/ /**有效期至*/
@Excel(name = "有效期至", width = 15, format = "yyyy-MM-dd") @Excel(name = "有效期至", width = 15, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "有效期至") @ApiModelProperty(value = "有效期至")
private java.util.Date validDate; private java.util.Date validDate;
/**使用时间*/ /**使用时间*/

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

@ -62,6 +62,10 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
QueryRecommendMajorVO queryRecommendMajorVO = new QueryRecommendMajorVO(); QueryRecommendMajorVO queryRecommendMajorVO = new QueryRecommendMajorVO();
queryRecommendMajorVO.setProfessionalCategory(userScore.getProfessionalCategory()); // 专业类别 queryRecommendMajorVO.setProfessionalCategory(userScore.getProfessionalCategory()); // 专业类别
queryRecommendMajorVO.setCognitioPolyclinic(userScore.getCognitioPolyclinic()); // 文理分科 queryRecommendMajorVO.setCognitioPolyclinic(userScore.getCognitioPolyclinic()); // 文理分科
if (("音乐类".equals(userScore.getProfessionalCategory()) ||
"表演类".equals(userScore.getProfessionalCategory())) && StringUtils.isNotBlank(userScore.getProfessionalCategoryChildren())) {
queryRecommendMajorVO.setPCategoryChildrenList(Arrays.asList(userScore.getProfessionalCategoryChildren().split(",")));
}
long startTime = new Date().getTime(); long startTime = new Date().getTime();
recommendMajorDTOList = yxSchoolMajorMapper.recommendMajorList(queryRecommendMajorVO); // 获取到当前专业，文/理科的数据 recommendMajorDTOList = yxSchoolMajorMapper.recommendMajorList(queryRecommendMajorVO); // 获取到当前专业，文/理科的数据
//将历史录取信息合并到专业信息里 //将历史录取信息合并到专业信息里