Merge branch 'ETA_1.2.6' into debug

controllers/report.go

@@ -265,7 +265,6 @@ func (this *ReportController) PublishReport() {
 		br.ErrMsg = "参数错误，报告id不可为空"
 		return
 	}
-
 	reportArr := strings.Split(reportIds, ",")
 	tips := ""
 	for _, v := range reportArr {
@@ -291,14 +290,6 @@ func (this *ReportController) PublishReport() {
 		} else {
 			publishTime = time.Now()
 		}
-		// 获取审批流设置
-		confKey := "approval_flow"
-		confTmp, e := company.GetConfigDetailByCode(confKey)
-		if e != nil {
-			br.Msg = "获取审批流配置失败"
-			br.ErrMsg = "获取审批流配置失败, Err: " + e.Error()
-			return
-		}
 		var tmpErr error
 		if report.HasChapter == 1 && (report.ChapterType == utils.REPORT_TYPE_DAY || report.ChapterType == utils.REPORT_TYPE_WEEK) {
 			// 发布晨周报
@@ -313,18 +304,10 @@ func (this *ReportController) PublishReport() {
 				br.ErrMsg = "报告内容为空，不需要生成,report_id:" + strconv.Itoa(report.Id)
 				return
 			}
-			if confTmp.ConfigValue == "1" || confTmp.ConfigValue == "3"{
-				if tmpErr = models.SubmitReportById(report.Id, publishTime); tmpErr != nil {
-					br.Msg = "提交审核失败"
-					br.ErrMsg = "提交审核失败, Err:" + tmpErr.Error() + ", report_id:" + strconv.Itoa(report.Id)
-					return
-				}
-			} else {
-				if tmpErr = models.PublishReportById(report.Id, publishTime); tmpErr != nil {
-					br.Msg = "报告发布失败"
-					br.ErrMsg = "报告发布失败, Err:" + tmpErr.Error() + ", report_id:" + strconv.Itoa(report.Id)
-					return
-				}
+			if tmpErr = models.PublishReportById(report.Id, publishTime); tmpErr != nil {
+				br.Msg = "报告发布失败"
+				br.ErrMsg = "报告发布失败, Err:" + tmpErr.Error() + ", report_id:" + strconv.Itoa(report.Id)
+				return
 			}
 
 			go func() {
@@ -337,11 +320,7 @@ func (this *ReportController) PublishReport() {
 				//	_ = services.ZhaoGangSend(report)
 				//}
 				// 更新报告Es
-				if report.HasChapter != 1 && (confTmp.ConfigValue == "1" || confTmp.ConfigValue == "3"){
-					_ = services.UpdateReportEs(report.Id, 3)
-				} else {
-					_ = services.UpdateReportEs(report.Id, 2)
-				}
+				_ = services.UpdateReportEs(report.Id, 2)
 			}()
 		}
 	}

controllers/smart_report/smart_report.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"eta/eta_api/controllers"
 	"eta/eta_api/models"
+	"eta/eta_api/models/company"
 	"eta/eta_api/models/smart_report"
 	"eta/eta_api/models/system"
 	"eta/eta_api/services"

models/report.go

@@ -1049,12 +1049,4 @@ func SetPrePublishReportById(reportId int, prePublishTime string, preMsgSend int
 	sql := `UPDATE report SET pre_publish_time=?, pre_msg_send=? WHERE id = ? and state = 1 `
 	_, err = o.Raw(sql, prePublishTime, preMsgSend, reportId).Exec()
 	return
-}
-
-// 报告提交审核
-func SubmitReportById(reportId int, publishTime time.Time) (err error) {
-	o := orm.NewOrmUsingDB("rddp")
-	sql := `UPDATE report SET state = 3, publish_time = ?, pre_publish_time=null, pre_msg_send=0, modify_time = NOW() WHERE id = ? `
-	_, err = o.Raw(sql, publishTime, reportId).Exec()
-	return
 }