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

updates

This commit is contained in:
zhouwentao 2024-03-13 23:17:45 +08:00
parent 7dc5ff949d
commit 521bdbc1bf
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java
View File

@ -3,6 +3,7 @@ package org.jeecg.modules.yx.constant;
import org.apache.commons.collections.CollectionUtils;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -13,6 +14,7 @@ import java.util.List;
* @Date 2024/2/28 12:42
*/
public class YxConstant {
public static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
/**
* 当前年
*/
@ -59,4 +61,7 @@ public class YxConstant {
public static List<String> defaultRulesEnrollProbabilityList =Arrays.asList("文过专排","专过文排");
//当天最多修改成绩次数
public static final Integer todayMaxEditScoreCount =5;
}

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

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.gson.JsonObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
@ -63,6 +64,7 @@ public class YxScoreController {
BigDecimal professionalScore = yxUserScore.getProfessionalScore();
BigDecimal oldProfessionalScore = yxUserScore.getProfessionalScore();
String professionalCategoryChildren = yxUserScore.getProfessionalCategoryChildren();
AssertUtils.notNull(professionalCategory, "请选择[专业类别]");
AssertUtils.notNull(cognitioPolyclinic, "请选择[选考科目]");
//先判断当前用户是否直接提交过得分
@ -254,4 +256,26 @@ public class YxScoreController {
jsonObject.put("volunteer",yxVolunteer);
return Result.OK(jsonObject);
}
@ApiOperation(value = "今日编辑成绩的次数")
@GetMapping(value = "/todayOfEditScoreCount")
public Result<?> todayOfEditScoreCount(){
LoginUser loginUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
JSONObject jsonObject = new JSONObject();
Date date = new Date();
String format = YxConstant.sdf.format(date);
String startTime = format+" 00:00:00";
String endTime = format+" 23:59:59";
LambdaQueryWrapper<YxUserScore> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.between(YxUserScore::getCreateTime,startTime,endTime);
lambdaQueryWrapper.eq(YxUserScore::getCreateBy,loginUser.getId());
long useCount = yxUserScoreService.count(lambdaQueryWrapper);
long residueCount = YxConstant.todayMaxEditScoreCount - useCount;
jsonObject.put("useCount",useCount);
jsonObject.put("residueCount",residueCount);
return Result.OK(jsonObject);
}
}

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/util/ScoreUtil.java
View File

@ -444,13 +444,13 @@ public class ScoreUtil {
*/
public static boolean crossingControlLine(String rulesEnrollProbability,BigDecimal culturalScore,BigDecimal professionalScore,BigDecimal culturalControlLine,BigDecimal specialControlLine){
if (YxConstant.culturalControlLineGuo.equals(rulesEnrollProbability)) {
return culturalScore.compareTo(culturalControlLine)>0;
return culturalScore.compareTo(culturalControlLine)>=0;
}else if(YxConstant.specialControlLineGuo.equals(rulesEnrollProbability)){
return professionalScore.compareTo(specialControlLine)>0;
return professionalScore.compareTo(specialControlLine)>=0;
}else if(YxConstant.culturalControlLineGuo2.equals(rulesEnrollProbability)){
return culturalScore.compareTo(specialControlLine)>0;
return culturalScore.compareTo(specialControlLine)>=0;
}
return culturalScore.compareTo(culturalControlLine)>0 && professionalScore.compareTo(specialControlLine)>0;
return culturalScore.compareTo(culturalControlLine)>=0 && professionalScore.compareTo(specialControlLine)>=0;
}
/**