Merge branch 'eta/3.0' into debug

controllers/excel.go

@@ -37,7 +37,7 @@ func (this *ExcelController) ExcelDetail() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	url := fmt.Sprintf(utils.ChartLibUrl+`/excel_info/detail?UniqueCode=%s&FromScene=%d`, req.UniqueCode, req.FromScene)
+	url := fmt.Sprintf(utils.ChartLibUrl+`/excel_info/detail?UniqueCode=%s&FromScene=%d&ReferencedId=%d&Uuid=%s`, req.UniqueCode, req.FromScene, req.ReferencedId, req.Uuid)
 
 	resp, e := http.Get(url)
 	if e != nil {

controllers/report_open.go

@@ -816,7 +816,7 @@ func (this *ReportOpenController) ReportKnowledgeUpload() {
 		br.ErrMsg = fmt.Sprintf("参数解析失败，%v", e)
 		return
 	}
-	pushTime, err := time.Parse(utils.FormatDateTime, req.PushTime)
+	pushTime, err := time.ParseInLocation(utils.FormatDateTime, req.PushTime, time.Local)
 	if err != nil {
 		br.Msg = "发布时间格式不正确"
 		return

services/excel.go

@@ -1,6 +1,8 @@
 package services
 
 type ExcelDetailReq struct {
-	UniqueCode string //"表格表唯一编码,如果是管理后台访问，传固定字符串:7c69b590249049942070ae9dcd5bf6dc"
-	FromScene  int    //"场景来源，1：智能研报，2：研报列表；3：英文研报；4：中文PPT；5：英文PPT"
+	UniqueCode   string //"表格表唯一编码,如果是管理后台访问，传固定字符串:7c69b590249049942070ae9dcd5bf6dc"
+	FromScene    int    //"场景来源，1：智能研报，2：研报列表；3：英文研报；4：中文PPT；5：英文PPT"
+	ReferencedId int    `description:"被引用的ID"`
+	Uuid         string `description:"引用唯一标识"`
 }