Merge branch 'eta_2.1.9_index_phase_shift_0909@guomengyuan' into debug

controllers/base_from_calculate.go

@@ -1076,6 +1076,9 @@ func (this *CalculateController) BatchEdit() {
 	case utils.DATA_SOURCE_CALCULATE_TIME_SHIFT:
 		sourName = "时间移位"
 		err = models.EditCalculateTimeShift(edbInfo, &req, fromEdbInfo)
+	case utils.DATA_SOURCE_CALCULATE_PHASE_SHIFT:
+		sourName = "期数移位"
+		err = models.EditCalculatePhaseShift(edbInfo, &req, fromEdbInfo)
 	case utils.DATA_SOURCE_CALCULATE_ZJPJ:
 		sourName = "直接拼接"
 

models/edb_data_calculate_phase_shift.go

@@ -115,7 +115,7 @@ func AddCalculatePhaseShift(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbI
 	return
 }
 
-// EditCalculatePhaseShift 修改时间移位
+// EditCalculatePhaseShift 修改期数移位
 func EditCalculatePhaseShift(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo) (err error) {
 	o := orm.NewOrm()
 	to, err := o.Begin()
@@ -125,7 +125,7 @@ func EditCalculatePhaseShift(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq
 
 	defer func() {
 		if err != nil {
-			fmt.Println("EditCalculateTimeShift,Err:" + err.Error())
+			fmt.Println("EditCalculatePhaseShift,Err:" + err.Error())
 			_ = to.Rollback()
 		} else {
 			_ = to.Commit()
@@ -177,8 +177,8 @@ func EditCalculatePhaseShift(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq
 				calculateMappingItem := &EdbInfoCalculateMapping{
 					EdbInfoCalculateMappingId: 0,
 					EdbInfoId:                 edbInfo.EdbInfoId,
-					Source:                    utils.DATA_SOURCE_CALCULATE_TIME_SHIFT,
-					SourceName:                "时间移位",
+					Source:                    utils.DATA_SOURCE_CALCULATE_PHASE_SHIFT,
+					SourceName:                "期数移位",
 					EdbCode:                   edbInfo.EdbCode,
 					FromEdbInfoId:             fromEdbInfo.EdbInfoId,
 					FromEdbCode:               fromEdbInfo.EdbCode,