|
@@ -371,13 +371,13 @@ func UpdateSmartReportsStateBySecondIds(oldState, newState int, secondIds []int)
|
|
}
|
|
}
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
o := orm.NewOrmUsingDB("rddp")
|
|
// (有审批流的)未发布->待提交
|
|
// (有审批流的)未发布->待提交
|
|
- sql := fmt.Sprintf(`UPDATE smart_report SET state = ? WHERE state = ?, pre_publish_time = NULL AND classify_id_second IN (%s)`, utils.GetOrmInReplace(len(secondIds)))
|
|
|
|
|
|
+ sql := fmt.Sprintf(`UPDATE smart_report SET state = ?, pre_publish_time = NULL WHERE state = ? AND classify_id_second IN (%s)`, utils.GetOrmInReplace(len(secondIds)))
|
|
_, err = o.Raw(sql, newState, oldState, secondIds).Exec()
|
|
_, err = o.Raw(sql, newState, oldState, secondIds).Exec()
|
|
if err != nil {
|
|
if err != nil {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
// (无审批流的)待提交->未发布
|
|
// (无审批流的)待提交->未发布
|
|
- sql = fmt.Sprintf(`UPDATE smart_report SET state = ? WHERE state = ?, pre_publish_time = NULL AND classify_id_second NOT IN (%s)`, utils.GetOrmInReplace(len(secondIds)))
|
|
|
|
|
|
+ sql = fmt.Sprintf(`UPDATE smart_report SET state = ?, pre_publish_time = NULL WHERE state = ? AND classify_id_second NOT IN (%s)`, utils.GetOrmInReplace(len(secondIds)))
|
|
_, err = o.Raw(sql, oldState, newState, secondIds).Exec()
|
|
_, err = o.Raw(sql, oldState, newState, secondIds).Exec()
|
|
return
|
|
return
|
|
}
|
|
}
|