From 054c991aea16730e94f7ef20897d6a49ff68f631 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Thu, 19 Nov 2020 18:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A8=A1=E6=9D=BF=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=BF=9D=E5=AD=98=E4=B8=8D=E9=99=90=E6=9D=83=E9=87=8D?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ResultModelServiceImpl.java  | 20 +++++++++++--------
 .../job/business/DingtalkBusiness.java        |  8 ++++----
 2 files changed, 16 insertions(+), 12 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 ce574515..ed1f0acd 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
@@ -129,15 +129,7 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 			resultModel.setGradeStatus(resultModelDetailReq.getGradeStatus());
 			resultModel.setEvaluationGroupId(resultModelDetailReq.getEvaluationGroupId());
 			resultModel.setOrderBy(resultModelOrderBy);
-			if(resultModel.getId() == null){
-				resultModelMapper.insertResultModel(resultModel);
 
-			}else{
-				resultModelMapper.updateCoverWeightResultModelById(resultModel);
-				if(resultModel.getIsDelete() != null && resultModel.getIsDelete().intValue() == 1){
-					delCount--;
-				}
-			}
 			if(itemReq.getTagetLibItems() != null){
 				int libOrderBy = 0;
 				List<ResultTagetLib> inserts = new ArrayList<>();
@@ -179,6 +171,18 @@ public class ResultModelServiceImpl extends ServiceImpl<ResultModelMapper, Resul
 					resultModelOrderBy++;
 				}
 			}
+			if(resultModel.getId() == null){
+				resultModelMapper.insertResultModel(resultModel);
+
+			}else{
+				if(resultModel.getWeight() == null){
+					resultModel.setWeight(BigDecimal.ZERO);
+				}
+				resultModelMapper.updateResultModelById(resultModel);
+				if(resultModel.getIsDelete() != null && resultModel.getIsDelete().intValue() == 1){
+					delCount--;
+				}
+			}
 
 		}
 		/*if(delCount == 0){
diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
index 141e899e..c60638c7 100644
--- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
+++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
@@ -441,7 +441,7 @@ public class DingtalkBusiness {
                                     info.getId(), 0);
                             ThirdMsgSendRecord thirdMsgSendRecord =
                                     thirdMsgSendRecordService.selectThirdMsgSendRecordByWorkIdAndStaffIdAndTypeAndStatus(
-                                            info.getResultRecord().getId(), flowChange.getApprovalId(), 1, 0);
+                                            info.getResultRecord().getId(), flowChange.getApprovalId(), 1, 1);
                             if(thirdMsgSendRecord != null){//把原来的任务更新掉
                                 dingTalkUtil.updateWorkMSG(thirdMsgSendRecord, token);
                             }
@@ -461,7 +461,7 @@ public class DingtalkBusiness {
                             ThirdMsgSendRecord thirdMsgSendRecord =
                                     thirdMsgSendRecordService.selectThirdMsgSendRecordByWorkIdAndStaffIdAndTypeAndStatus(
                                             info.getResultRecord().getId(),
-                                            flowChange.getApprovalId(), 1, 0);
+                                            flowChange.getApprovalId(), 1, 1);
                             if(thirdMsgSendRecord != null){//把原来的任务更新掉
                                 dingTalkUtil.updateWorkMSG(thirdMsgSendRecord, token);
                             }
@@ -479,7 +479,7 @@ public class DingtalkBusiness {
                                             thirdMsgSendRecord =
                                                     thirdMsgSendRecordService.selectThirdMsgSendRecordByWorkIdAndStaffIdAndTypeAndStatus(
                                                             info.getResultRecord().getId(),
-                                                            flowRecord.getApprovalStaffId(), 1, 0);
+                                                            flowRecord.getApprovalStaffId(), 1, 1);
                                             if(thirdMsgSendRecord != null){//把原来的任务更新掉
                                                 dingTalkUtil.updateWorkMSG(thirdMsgSendRecord, token);
                                             }
@@ -523,7 +523,7 @@ public class DingtalkBusiness {
                                         ThirdMsgSendRecord thirdMsgSendRecord =
                                                 thirdMsgSendRecordService.selectThirdMsgSendRecordByWorkIdAndStaffIdAndTypeAndStatus(
                                                         info.getResultRecord().getId(),
-                                                        flowRecord.getApprovalStaffId(), 1, 0);
+                                                        flowRecord.getApprovalStaffId(), 1, 1);
                                         if(thirdMsgSendRecord != null){//把原来的任务更新掉
                                             dingTalkUtil.updateWorkMSG(thirdMsgSendRecord, token);
                                         }else{