wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-11-05 17:37:00 +08:00
commit f0020edfe7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/lz/config/ShiroConfig.java
View File

@ -70,7 +70,7 @@ public class ShiroConfig {
filterMap.put("/dtlg/jump", "anon"); filterMap.put("/dtlg/jump", "anon");
filterMap.put("/luck/getLuckById", "anon"); filterMap.put("/luck/getLuckById", "anon");
filterMap.put("/luck/updateLuck", "anon"); filterMap.put("/luck/updateLuck", "anon");
filterMap.put("/**", "anon"); filterMap.put("/**", "oauth2");
shiroFilter.setFilterChainDefinitionMap(filterMap); shiroFilter.setFilterChainDefinitionMap(filterMap);
return shiroFilter; return shiroFilter;

10
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -414,6 +414,9 @@ public class ResultRecordController extends AbstractController {
if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的 if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的
resultRecortModelDto.setWeight(null); resultRecortModelDto.setWeight(null);
} }
if(resultRecortModelDto.getMaxCount().intValue() == 10000){//不限制数量
resultRecortModelDto.setMaxCount(null);
}
List<ResultDetailDto> detailDtos = List<ResultDetailDto> detailDtos =
resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType()); resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType());
for (ResultDetailDto dto:detailDtos for (ResultDetailDto dto:detailDtos
@ -577,6 +580,9 @@ public class ResultRecordController extends AbstractController {
) { ) {
int index = 0; int index = 0;
BigDecimal weight = BigDecimal.ZERO; BigDecimal weight = BigDecimal.ZERO;
if(model.getMaxCount() != null && model.getDetailDtos().size() > model.getMaxCount().intValue()){
return R.error(model.getName() + "维度指标数量不能超过" + model.getMaxCount());
}
for (ResultDetailDto detailDto:model.getDetailDtos() for (ResultDetailDto detailDto:model.getDetailDtos()
) {//排序 ) {//排序
ResultDetail resultDetail = new ResultDetail(); ResultDetail resultDetail = new ResultDetail();
@ -618,10 +624,10 @@ public class ResultRecordController extends AbstractController {
} }
//下面不限权重的，计算权重之和是否超标 //下面不限权重的，计算权重之和是否超标
if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0 /*if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0
&& weight.compareTo(model.getWeight()) == 1){ && weight.compareTo(model.getWeight()) == 1){
return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%"); return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");
} }*/
} }
//下面更新指标记录 //下面更新指标记录
if(inserts.size() > 0){ if(inserts.size() > 0){