fix

models/edb_data_calculate_cjjx.go

@@ -139,7 +139,7 @@ func EditCalculateCjjx(req *EdbInfoCalculateBatchEditReq, edbInfo, fromEdbInfo *
 		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
 		return
 	}
-	if count > 0 && oldCalculateFormula != req.Formula { // 指标未被替换，同时N值未修改，无需重新计算
+	if count > 0 && oldCalculateFormula == req.Formula { // 指标未被替换，同时N值未修改，无需重新计算
 		return
 	}
 

models/edb_data_calculate_hbz.go

@@ -130,7 +130,7 @@ func EditCalculateHbz(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq, fromE
 		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
 		return
 	}
-	if count > 0 && strconv.Itoa(formulaInt) != edbInfo.CalculateFormula { // 指标未被替换，同时N值未修改，无需重新计算
+	if count > 0 && strconv.Itoa(formulaInt) == edbInfo.CalculateFormula { // 指标未被替换，同时N值未修改，无需重新计算
 		return
 	}
 

models/edb_data_calculate_hcz.go

@@ -131,7 +131,7 @@ func EditCalculateHcz(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq, fromE
 		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
 		return
 	}
-	if count > 0 && strconv.Itoa(formulaInt) != edbInfo.CalculateFormula { // 指标未被替换，同时N值未修改，无需重新计算
+	if count > 0 && strconv.Itoa(formulaInt) == edbInfo.CalculateFormula { // 指标未被替换，同时N值未修改，无需重新计算
 		return
 	}
 

models/edb_data_calculate_ljzzy.go

@@ -122,11 +122,8 @@ func EditCalculateLjzzy(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq, fro
 
 	var existCondition string
 	var existPars []interface{}
-	existCondition += " AND edb_info_id=? "
-	existPars = append(existPars, edbInfo.EdbInfoId)
-
-	existCondition += " AND from_edb_info_id=? "
-	existPars = append(existPars, req.FromEdbInfoId)
+	existCondition += " AND edb_info_id=? AND from_edb_info_id=? "
+	existPars = append(existPars, edbInfo.EdbInfoId, req.FromEdbInfoId)
 
 	//判断计算指标是否被更换
 	count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)

models/edb_data_calculate_nszydbpjjs.go

@@ -93,7 +93,7 @@ func EditCalculateNszydpjjs(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq,
 	to, err := o.Begin()
 	defer func() {
 		if err != nil {
-			fmt.Println("AddCalculateNszydpjjs,Err:" + err.Error())
+			fmt.Println("EditCalculateNszydpjjs,Err:" + err.Error())
 			_ = to.Rollback()
 		} else {
 			_ = to.Commit()
@@ -124,7 +124,10 @@ func EditCalculateNszydpjjs(edbInfo *EdbInfo, req *EdbInfoCalculateBatchEditReq,
 		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
 		return
 	}
-	if count > 0 && oldCalculateFormula != req.Formula { // 指标未被替换，同时N值未修改，无需重新计算
+	fmt.Println("oldCalculateFormula:", oldCalculateFormula)
+	fmt.Println("req.Formula:", req.Formula)
+	fmt.Println("count:", count)
+	if count > 0 && oldCalculateFormula == req.Formula { // 指标未被替换，同时N值未修改，无需重新计算
 		return
 	}
 
@@ -202,7 +205,7 @@ func refreshAllCalculateNszydpjjs(to orm.TxOrmer, edbInfoId, source, formulaInt
 	condition += " AND edb_info_id=? "
 	pars = append(pars, edbInfoId)
 
-	existDataList, err := GetEdbDataListAllV1(condition, pars, source, 0)
+	existDataList, err := GetEdbDataListAllByTo(to, condition, pars, source, 0)
 	if err != nil {
 		fmt.Println("existDataList GetEdbDataListAll Err:" + err.Error())
 		return err

models/edb_info.go

@@ -262,6 +262,25 @@ func GetEdbDataListAllV1(condition string, pars []interface{}, source, order int
 	return
 }
 
+// GetEdbDataListAllByTo 通过事务链接获取数据列表
+func GetEdbDataListAllByTo(to orm.TxOrmer, condition string, pars []interface{}, source, order int) (item []*EdbInfoSearchDataV1, err error) {
+	sql := ``
+	tableName := GetEdbDataTableName(source)
+	sql = ` SELECT * FROM %s WHERE 1=1 `
+	sql = fmt.Sprintf(sql, tableName)
+
+	if condition != "" {
+		sql += condition
+	}
+	if order == 1 {
+		sql += ` ORDER BY data_time ASC `
+	} else {
+		sql += ` ORDER BY data_time DESC `
+	}
+	_, err = to.Raw(sql, pars).QueryRows(&item)
+	return
+}
+
 // GetEdbInfoByCondition 获取指标列表
 func GetEdbInfoByCondition(condition string, pars []interface{}, order int) (item []*EdbInfo, err error) {
 	o := orm.NewOrm()

routers/commentsRouter.go

@@ -16,6 +16,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:CalculateController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:CalculateController"],
+        beego.ControllerComments{
+            Method: "BatchEdit",
+            Router: `/batch/edit`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:CalculateController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:CalculateController"],
         beego.ControllerComments{
             Method: "BatchSave",