From 3acb7a3efe34446cca0b0218b01f5789cd13d16f Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 4 Nov 2020 14:23:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=85=B7=E4=BD=93?=
 =?UTF-8?q?=E7=9A=84=E7=BB=B4=E5=BA=A6=E6=97=B6=E7=9A=84=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flow/service/impl/ResultModelServiceImpl.java | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 fd3876c4..61765ffa 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
@@ -107,6 +107,21 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 	public R saveDetail(ResultModelDetailReq resultModelDetailReq){
 		BigDecimal modelWeight = BigDecimal.ZERO;
 		int resultModelOrderBy = 0;
+		if(resultModelDetailReq.getModelItems() == null || resultModelDetailReq.getModelItems().size() == 0){
+			//没有穿具体的维度
+			ResultModel resultModel = new ResultModel();
+			resultModel.setGradeGroupId(resultModelDetailReq.getGradeGroupId());
+			resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus());
+			resultModel.setEvaluationGroupId(resultModelDetailReq.getEvaluationGroupId());
+			resultModel.setOrderBy(resultModelOrderBy);
+			if(resultModel.getId() == null){
+				resultModelMapper.insertResultModel(resultModel);
+
+			}else{
+				resultModelMapper.updateResultModelById(resultModel);
+			}
+			return R.ok();
+		}
 		for (ResultModelItemReq itemReq:
 				resultModelDetailReq.getModelItems()) {
 			modelWeight = modelWeight.add(itemReq.getWeight());

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 2/3] =?UTF-8?q?=E4=B8=8D=E9=99=90=E6=9D=83=E9=87=8D?=
 =?UTF-8?q?=E7=9A=84=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);
             }

From 62c3bd98837feb99d289fda609eaf0cfa549b48b Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 4 Nov 2020 14:54:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BD=93=E4=BF=9D=E5=AD=98=E8=80=83?=
 =?UTF-8?q?=E8=AF=84=E7=BB=84=E6=97=B6=E4=B8=80=E4=B8=AA=E7=BB=B4=E5=BA=A6?=
 =?UTF-8?q?=E9=83=BD=E6=B2=A1=E6=9C=89=EF=BC=8C=E6=88=96=E8=80=85=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E7=BB=B4=E5=BA=A6=E5=88=A0=E9=99=A4=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResultModelServiceImpl.java  | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

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 e44dd566..7c117d67 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
@@ -107,21 +107,8 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 	public R saveDetail(ResultModelDetailReq resultModelDetailReq){
 		BigDecimal modelWeight = BigDecimal.ZERO;
 		int resultModelOrderBy = 0;
-		if(resultModelDetailReq.getModelItems() == null || resultModelDetailReq.getModelItems().size() == 0){
-			//没有穿具体的维度
-			ResultModel resultModel = new ResultModel();
-			resultModel.setGradeGroupId(resultModelDetailReq.getGradeGroupId());
-			resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus());
-			resultModel.setEvaluationGroupId(resultModelDetailReq.getEvaluationGroupId());
-			resultModel.setOrderBy(resultModelOrderBy);
-			if(resultModel.getId() == null){
-				resultModelMapper.insertResultModel(resultModel);
 
-			}else{
-				resultModelMapper.updateResultModelById(resultModel);
-			}
-			return R.ok();
-		}
+		int delCount = resultModelDetailReq.getModelItems().size();//记录删除的条数。如果为0，那么插入一条记录
 		for (ResultModelItemReq itemReq:
 				resultModelDetailReq.getModelItems()) {
 			if(itemReq.getWeight() != null){
@@ -147,6 +134,9 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 
 			}else{
 				resultModelMapper.updateResultModelById(resultModel);
+				if(resultModel.getIsDelete() != null && resultModel.getIsDelete().intValue() == 1){
+					delCount--;
+				}
 			}
 			if(itemReq.getTagetLibItems() != null){
 				int libOrderBy = 0;
@@ -191,6 +181,18 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 			}
 
 		}
+		if(delCount == 0){
+			//如果全部被删除，或者没有传入具体维度，那么默认保存一个维度
+			//没有传具体的维度
+			ResultModel resultModel = new ResultModel();
+			resultModel.setCalculateId(resultModelDetailReq.getCalculateId());
+			resultModel.setGradeGroupId(resultModelDetailReq.getGradeGroupId());
+			resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus());
+			resultModel.setEvaluationGroupId(resultModelDetailReq.getEvaluationGroupId());
+			resultModel.setOrderBy(resultModelOrderBy);
+			resultModelMapper.insertResultModel(resultModel);
+			return R.ok();
+		}
 		return R.ok();
 	}