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-09 16:42:18 +08:00
commit 0948d5f24f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,6 @@ public class ResultRecordController extends AbstractController {
BigDecimal weight = BigDecimal.ZERO; BigDecimal weight = BigDecimal.ZERO;
for (ResultModel model:resultModels for (ResultModel model:resultModels
) { ) {
setCalculateValue(calculateModels, model);
ResultRecortModelDto resultRecortModelDto = new ResultRecortModelDto(); ResultRecortModelDto resultRecortModelDto = new ResultRecortModelDto();
BeanUtils.copyProperties(model, resultRecortModelDto); BeanUtils.copyProperties(model, resultRecortModelDto);
if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的 if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的
@ -421,6 +420,7 @@ public class ResultRecordController extends AbstractController {
resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType()); resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType());
for (ResultDetailDto dto:detailDtos for (ResultDetailDto dto:detailDtos
) { ) {
//下面设置计算公式
dto.setCalculate(setCalculateValue(calculateModels, dto)) ; dto.setCalculate(setCalculateValue(calculateModels, dto)) ;
weight = weight.add(dto.getCheckWeight()); weight = weight.add(dto.getCheckWeight());
//获取评分详细 //获取评分详细
@ -460,7 +460,7 @@ public class ResultRecordController extends AbstractController {
dto.setScoreDtos(scoreDtos); dto.setScoreDtos(scoreDtos);
} }
} }
//下面设置计算公式
resultRecortModelDto.setDetailDtos(detailDtos); resultRecortModelDto.setDetailDtos(detailDtos);
resultRecortModelDtos.add(resultRecortModelDto); resultRecortModelDtos.add(resultRecortModelDto);
@ -476,8 +476,10 @@ public class ResultRecordController extends AbstractController {
private String setCalculateValue(List<CalculateModel> calculateModels, Object model){ private String setCalculateValue(List<CalculateModel> calculateModels, Object model){
String mName = model.getClass().getName();//.replace("req", "dto"); String mName = model.getClass().getName();//.replace("req", "dto");
String cal = ""; String cal = "";
for (CalculateModel calculate:calculateModels //for (CalculateModel calculate:calculateModels
) { //) {
for(int i = 0; i < calculateModels.size(); i++){
CalculateModel calculate = calculateModels.get(i);
if(mName.contains("." + calculate.getTaboleBeanName())){//支持表名生成的req和dto if(mName.contains("." + calculate.getTaboleBeanName())){//支持表名生成的req和dto
//获取值 //获取值
try { try {
@ -487,8 +489,9 @@ public class ResultRecordController extends AbstractController {
if(obj != null){ if(obj != null){
calculate.setFieldValue(obj.toString()); calculate.setFieldValue(obj.toString());
} }
if(calculate.getFieldValue() == null){ //最后一个对象为自己，或者获取的对象中的属性为null
cal += calculate.getFieldBeanName(); if(calculate.getFieldValue() == null || i == calculateModels.size() - 1){
cal += ("{" + calculate.getFieldBeanName().substring(0, 1).toLowerCase() + calculate.getFieldBeanName().substring(1) + "}");
}else{ }else{
cal += calculate.getFieldValue(); cal += calculate.getFieldValue();
} }