fix

models/edb_data_calculate_ljztbpj.go

@@ -335,7 +335,7 @@ func EditCalculateLjztbpj(req *EdbInfoCalculateBatchEditReq, edbInfo, firstEdbIn
 				err = tmpErr
 				return
 			}
-			existItemA.EdbInfoCalculateMappingId = int(insertId)
+			existItemB.EdbInfoCalculateMappingId = int(insertId)
 
 			isNeedCalculateData = true
 		}

models/edb_data_calculate_nhcc.go

@@ -229,12 +229,12 @@ func EditCalculateNhcc(req *EdbInfoCalculateBatchEditReq, edbInfo, firstEdbInfo,
 	//第一个指标数据
 	{
 		// 如果指标变了，那么需要删除关系，并重新计算
-		if existItemA.FromEdbInfoId != firstEdbInfo.EdbInfoId || existItemA.MoveValue != req.EdbInfoIdArr[0].MoveValue {
+		if existItemA.FromEdbInfoId != firstEdbInfo.EdbInfoId {
 			//删除之前的A指标关联关系
 			sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id = ?`
 			_, err = to.Raw(sql, edbInfo.EdbInfoId, existItemA.FromEdbInfoId).Exec()
 			if err != nil {
-				err = fmt.Errorf("删除拼接日期之前的指标关联关系失败,Err:" + err.Error())
+				err = fmt.Errorf("删除指标A关联关系失败,Err:" + err.Error())
 				return
 			}
 
@@ -266,18 +266,27 @@ func EditCalculateNhcc(req *EdbInfoCalculateBatchEditReq, edbInfo, firstEdbInfo,
 
 				isNeedCalculateData = true
 			}
+		} else if existItemA.MoveValue != req.EdbInfoIdArr[0].MoveValue {
+			// 如果平移天数不一致的话，
+			existItemA.ModifyTime = time.Now()
+			existItemA.MoveValue = req.EdbInfoIdArr[0].MoveValue
+			_, err = to.Update(existItemA, "ModifyTime", "MoveValue")
+			if err != nil {
+				return
+			}
+			isNeedCalculateData = true
 		}
 	}
 
 	//第二个指标数据
 	{
 		// 如果指标变了，那么需要删除关系，并重新计算
-		if existItemB.FromEdbInfoId != secondEdbInfo.EdbInfoId || existItemB.MoveValue != req.EdbInfoIdArr[1].MoveValue {
+		if existItemB.FromEdbInfoId != secondEdbInfo.EdbInfoId {
 			//删除之前的B指标关联关系
 			sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id = ?`
 			_, err = to.Raw(sql, edbInfo.EdbInfoId, existItemB.FromEdbInfoId).Exec()
 			if err != nil {
-				err = fmt.Errorf("删除拼接日期之后的指标关联关系失败,Err:" + err.Error())
+				err = fmt.Errorf("删除指标B关联关系失败,Err:" + err.Error())
 				return
 			}
 
@@ -304,8 +313,17 @@ func EditCalculateNhcc(req *EdbInfoCalculateBatchEditReq, edbInfo, firstEdbInfo,
 				err = tmpErr
 				return
 			}
-			existItemA.EdbInfoCalculateMappingId = int(insertId)
+			existItemB.EdbInfoCalculateMappingId = int(insertId)
 
+			isNeedCalculateData = true
+		} else if existItemB.MoveValue != req.EdbInfoIdArr[1].MoveValue {
+			// 如果平移天数不一致的话，
+			existItemB.ModifyTime = time.Now()
+			existItemB.MoveValue = req.EdbInfoIdArr[1].MoveValue
+			_, err = to.Update(existItemB, "ModifyTime", "MoveValue")
+			if err != nil {
+				return
+			}
 			isNeedCalculateData = true
 		}
 	}

models/edb_data_calculate_zjpj.go

@@ -292,7 +292,7 @@ func EditCalculateZjpj(req *EdbInfoCalculateBatchEditReq, edbInfo, firstEdbInfo,
 				err = tmpErr
 				return
 			}
-			existItemA.EdbInfoCalculateMappingId = int(insertId)
+			existItemB.EdbInfoCalculateMappingId = int(insertId)
 
 			isNeedCalculateData = true
 		}