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] =?UTF-8?q?=E5=BD=93=E4=BF=9D=E5=AD=98=E8=80=83=E8=AF=84?=
 =?UTF-8?q?=E7=BB=84=E6=97=B6=E4=B8=80=E4=B8=AA=E7=BB=B4=E5=BA=A6=E9=83=BD?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=EF=BC=8C=E6=88=96=E8=80=85=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E5=88=A0=E9=99=A4=E6=97=B6=E7=9A=84=E5=A4=84?=
 =?UTF-8?q?=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();
 	}