fix：报告章节的创建时间调整

controllers/report.go

@@ -13,7 +13,6 @@ import (
 	"github.com/tealeg/xlsx"
 	"html"
 	"io"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -253,7 +252,7 @@ func (this *ReportController) Upload() {
 		return
 	}
 
-	fileData, e := ioutil.ReadAll(f)
+	fileData, e := io.ReadAll(f)
 	if e != nil {
 		br.Msg = "上传失败"
 		br.ErrMsg = "读取文件失败, Err: " + e.Error()

controllers/report_chapter.go

@@ -120,6 +120,7 @@ func (this *ReportController) AddChapter() {
 	reportChapterInfo.IsEdit = 1
 	//reportChapterInfo.CreateTime = req.CreateTime
 	reportChapterInfo.CreateTime = reportInfo.CreateTime
+	reportChapterInfo.ReportCreateTime = time.Now()
 	reportChapterInfo.VideoKind = 2
 	reportChapterInfo.Stage = reportInfo.Stage
 
@@ -350,7 +351,9 @@ func (this *ReportController) EditDayWeekChapter() {
 	reportChapterInfo.Content = html.EscapeString(req.Content)
 	reportChapterInfo.ContentSub = html.EscapeString(contentSub)
 	reportChapterInfo.IsEdit = 1
-	reportChapterInfo.CreateTime = req.CreateTime
+	if req.CreateTime != `` {
+		reportChapterInfo.CreateTime = req.CreateTime
+	}
 
 	reportChapterInfo.LastModifyAdminId = sysUser.AdminId
 	reportChapterInfo.LastModifyAdminName = sysUser.RealName

models/wechat_send_msg.go

@@ -21,7 +21,7 @@ func GetOpenIdArr() (items []string, err error) {
 	return
 }
 
-func GetOpenIdArrByClassifyNameSecond(classifyId int) (items []string, err error) {
+func GetOpenIdArrByClassifyId(classifyId int) (items []string, err error) {
 	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu 
 			INNER JOIN company AS c ON c.company_id = wu.company_id 
 			INNER JOIN company_product AS d ON c.company_id=d.company_id

services/report.go

@@ -150,8 +150,12 @@ func UpdateReportEs(reportId int, publishState int) (err error) {
 			}
 		}
 	} else {
-		//if utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox {
-		permissionList, tmpErr := models.GetChartPermissionNameFromMappingByKeyword("rddp", reportInfo.ClassifyIdSecond)
+		// 获取最小分类的id
+		minClassifyId, _, tmpErr := getMinClassify(reportInfo)
+		if tmpErr != nil {
+			return
+		}
+		permissionList, tmpErr := models.GetChartPermissionNameFromMappingByKeyword("rddp", minClassifyId)
 		if tmpErr != nil {
 			return
 		}

services/wechat_send_msg.go

@@ -8,23 +8,12 @@ import (
 	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strconv"
 	"strings"
 )
 
-type SendTemplateResponse struct {
-	Errcode int    `json:"errcode"`
-	Errmsg  string `json:"errmsg"`
-	MsgID   int    `json:"msgid"`
-}
-
-type ClearQuotaResponse struct {
-	Errcode int    `json:"errcode"`
-	Errmsg  string `json:"errmsg"`
-}
-
 // SendMiniProgramReportWxMsg 推送报告微信模板消息-小程序链接
 func SendMiniProgramReportWxMsg(reportId int) (err error) {
 	var msg string
@@ -86,7 +75,7 @@ func SendMiniProgramReportWxMsg(reportId int) (err error) {
 		}
 
 		// 获取该分类关联的openid列表
-		openIdArr, err = models.GetOpenIdArrByClassifyNameSecond(minClassifyId)
+		openIdArr, err = models.GetOpenIdArrByClassifyId(minClassifyId)
 		if err != nil {
 			msg = "GetOpenIdArrByClassifyNameSecond err:" + err.Error()
 			return err
@@ -205,7 +194,7 @@ func SendTemplateMsg(sendInfo *SendWxTemplate) (err error) {
 		alarm_msg.SendAlarmMsg("SendTemplateMsg json.Marshal Err:"+err.Error(), 1)
 		return err
 	}
-	body := ioutil.NopCloser(strings.NewReader(string(postData)))
+	body := io.NopCloser(strings.NewReader(string(postData)))
 	client := &http.Client{}
 	req, err := http.NewRequest("POST", utils.SendWxTemplateMsgUrl, body)
 	if err != nil {
@@ -221,7 +210,7 @@ func SendTemplateMsg(sendInfo *SendWxTemplate) (err error) {
 		return err
 	}
 	defer resp.Body.Close()
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}