From c706c343b6dafe22e6d8b27bcbec41385de9614d Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 4 Nov 2020 14:48:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E9=99=90=E6=9D=83=E9=87=8D=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/ResultRecordController.java |  7 ++++++-
 .../service/impl/ResultModelServiceImpl.java   | 18 ++++++++++++------
 .../controller/ResultModelController.java      |  3 +++
 3 files changed, 21 insertions(+), 7 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 4f51d89e..cf35373d 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -411,6 +411,9 @@ public class ResultRecordController extends AbstractController {
             setCalculateValue(calculateModels, model);
             ResultRecortModelDto resultRecortModelDto = new ResultRecortModelDto();
             BeanUtils.copyProperties(model, resultRecortModelDto);
+            if(resultRecortModelDto.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重的
+                resultRecortModelDto.setWeight(null);
+            }
             List<ResultDetailDto> detailDtos =
                     resultDetailService.selectDtosByRecordId(resultRecord.getId(), model.getType());
             for (ResultDetailDto dto:detailDtos
@@ -614,7 +617,9 @@ public class ResultRecordController extends AbstractController {
                 }
 
             }
-            if(weight.compareTo(model.getWeight()) == 1){
+            //下面不限权重的，计算权重之和是否超标
+            if(model.getWeight() != null && model.getWeight().compareTo(BigDecimal.ZERO) != 0
+                    && weight.compareTo(model.getWeight()) == 1){
                 return R.error(model.getName() + "的指标之和不能超过" + model.getWeight().multiply(BigDecimal.valueOf(100)) + "%");
             }
         }
diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java
index 61765ffa..e44dd566 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/ResultModelServiceImpl.java
@@ -124,7 +124,10 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 		}
 		for (ResultModelItemReq itemReq:
 				resultModelDetailReq.getModelItems()) {
-			modelWeight = modelWeight.add(itemReq.getWeight());
+			if(itemReq.getWeight() != null){
+				modelWeight = modelWeight.add(itemReq.getWeight());
+			}
+
 			if(modelWeight.compareTo(BigDecimal.ONE) == 1){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
 				return R.error("维度权重之和不能能超过100%");
@@ -156,12 +159,15 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 					BeanUtils.copyProperties(req, resultTagetLib);
 					resultTagetLib.setModelId(resultModel.getId());
 					resultTagetLib.setOrderBy(libOrderBy);
-					tagLibWeight = tagLibWeight.add(req.getWeight());
-					if(tagLibWeight.compareTo(resultModel.getWeight()) == 1){
-						TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
-						return R.error(resultModel.getName() +
-								"维度的指标之和不能大于" + (resultModel.getWeight().multiply(BigDecimal.valueOf(100))) + "%");
+					if(req.getWeight() != null){
+						tagLibWeight = tagLibWeight.add(req.getWeight());
+						if(resultModel.getWeight() != null && tagLibWeight.compareTo(resultModel.getWeight()) == 1){
+							TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//事务回滚
+							return R.error(resultModel.getName() +
+									"维度的指标之和不能大于" + (resultModel.getWeight().multiply(BigDecimal.valueOf(100))) + "%");
+						}
 					}
+
 					if(resultTagetLib.getId() != null && resultTagetLib.getId().intValue() > 0){
 						updates.add(resultTagetLib);
 					}else{
diff --git a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java
index bdd1c40f..420a77d4 100644
--- a/src/main/java/com/lz/modules/performance/controller/ResultModelController.java
+++ b/src/main/java/com/lz/modules/performance/controller/ResultModelController.java
@@ -53,6 +53,9 @@ public class ResultModelController {
             resultModelDetailReq.setGradeGroupId(dto.getGradeGroupId());
             ResultModelItemReq itemReq = new ResultModelItemReq();
             BeanUtils.copyProperties(dto, itemReq);
+            if(itemReq.getWeight().compareTo(BigDecimal.ZERO) == 0){//不限权重
+                itemReq.setWeight(null);
+            }
             if(dto.getMaxCount().intValue() == 10000){
                 itemReq.setMaxCount(null);
             }