From 66d13ad1545ea87952862da5ba559b4f1908d5ef Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 9 Nov 2020 15:22:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/ResultRecordController.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 008916e0..8273505c 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -408,7 +408,6 @@ public class ResultRecordController extends AbstractController { BigDecimal weight = BigDecimal.ZERO; for (ResultModel model:resultModels ) { - setCalculateValue(calculateModels, model); ResultRecortModelDto resultRecortModelDto = new ResultRecortModelDto(); BeanUtils.copyProperties(model, resultRecortModelDto); if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的 @@ -421,6 +420,7 @@ public class ResultRecordController extends AbstractController { resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType()); for (ResultDetailDto dto:detailDtos ) { + //下面设置计算公式 dto.setCalculate(setCalculateValue(calculateModels, dto)) ; weight = weight.add(dto.getCheckWeight()); //获取评分详细 @@ -460,7 +460,7 @@ public class ResultRecordController extends AbstractController { dto.setScoreDtos(scoreDtos); } } - //下面设置计算公式 + resultRecortModelDto.setDetailDtos(detailDtos); resultRecortModelDtos.add(resultRecortModelDto); @@ -476,8 +476,10 @@ public class ResultRecordController extends AbstractController { private String setCalculateValue(List calculateModels, Object model){ String mName = model.getClass().getName();//.replace("req", "dto"); 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 //获取值 try { @@ -487,8 +489,9 @@ public class ResultRecordController extends AbstractController { if(obj != null){ calculate.setFieldValue(obj.toString()); } - if(calculate.getFieldValue() == null){ - cal += calculate.getFieldBeanName(); + //最后一个对象为自己，或者获取的对象中的属性为null + if(calculate.getFieldValue() == null || i == calculateModels.size()){ + cal += ("{" + calculate.getFieldBeanName() + "}"); }else{ cal += calculate.getFieldValue(); } From c68e866d8f8f3d28b10d400e238266abb65dfe90 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 9 Nov 2020 15:32:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 8273505c..7ee27ecd 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -490,7 +490,7 @@ public class ResultRecordController extends AbstractController { calculate.setFieldValue(obj.toString()); } //最后一个对象为自己，或者获取的对象中的属性为null - if(calculate.getFieldValue() == null || i == calculateModels.size()){ + if(calculate.getFieldValue() == null || i == calculateModels.size() - 1){ cal += ("{" + calculate.getFieldBeanName() + "}"); }else{ cal += calculate.getFieldValue(); From 55ced3dc09cc52346bfcd8ac24bc071c175aa368 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 9 Nov 2020 15:45:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/ResultRecordController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 7ee27ecd..d0c8afe8 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -491,7 +491,7 @@ public class ResultRecordController extends AbstractController { } //最后一个对象为自己，或者获取的对象中的属性为null if(calculate.getFieldValue() == null || i == calculateModels.size() - 1){ - cal += ("{" + calculate.getFieldBeanName() + "}"); + cal += ("{" + calculate.getFieldBeanName().substring(0, 1).toLowerCase() + calculate.getFieldBeanName().substring(1) + "}"); }else{ cal += calculate.getFieldValue(); }