fix:审批列表的时间

controllers/report_approve/report_approve.go

@@ -240,6 +240,7 @@ func (this *ReportApproveController) List() {
 		for _, v := range list {
 			// 这个时候的状态，用审批状态
 			v.RecordState = v.NodeState
+			v.ApproveTime = v.NodeApproveTime
 		}
 		ormList = list
 	}

controllers/report_chapter.go

@@ -12,13 +12,13 @@ import (
 	"time"
 )
 
-// EditDayWeekChapter
-// @Title 编辑晨周报章节内容
-// @Description 编辑晨周报章节内容
-// @Param	request	body models.EditReportChapterReq true "type json string"
+// AddChapter
+// @Title 新增晨周报章节内容
+// @Description 新增晨周报章节内容
+// @Param	request	body models.AddReportChapterReq true "type json string"
 // @Success 200 Ret=200 保存成功
-// @router /addChapter [post]
-func (this *ReportController) AddDayWeekChapter() {
+// @router /chapter/add [post]
+func (this *ReportController) AddChapter() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -54,8 +54,8 @@ func (this *ReportController) AddDayWeekChapter() {
 		return
 	}
 	if reportInfo.State == 2 {
-		br.Msg = "该报告已发布，不允许编辑"
-		br.ErrMsg = "该报告已发布，不允许编辑"
+		br.Msg = "该报告已发布，不允许新增"
+		br.ErrMsg = "该报告已发布，不允许新增"
 		return
 	}
 
@@ -736,6 +736,10 @@ func (this *ReportController) GetDayWeekChapter() {
 		chapterInfo.ContentStruct = html.UnescapeString(chapterInfo.ContentStruct)
 	}
 
+	chapterInfo.Content = html.UnescapeString(chapterInfo.Content)
+	chapterInfo.ContentSub = html.UnescapeString(chapterInfo.ContentSub)
+	chapterInfo.ContentStruct = html.UnescapeString(chapterInfo.ContentStruct)
+
 	// 授权用户列表map
 	chapterGrantIdList := make([]int, 0)
 	// 关联品种id列表map

models/chart_permission.go

@@ -246,6 +246,7 @@ func FormatChartPermission2Simple(origin *ChartPermission) (item *SimpleChartPer
 	item.ChartPermissionId = origin.ChartPermissionId
 	item.ChartPermissionName = origin.PermissionName
 	item.Sort = origin.Sort
+
 	return
 }
 
@@ -254,6 +255,7 @@ func GetChartPermissionsByProductId() (list []*ChartPermission, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission WHERE product_id = ? AND enabled = 1 ORDER BY parent_id ASC, sort ASC, created_time ASC`
 	_, err = o.Raw(sql, FiccProductId).QueryRows(&list)
+
 	return
 }
 
@@ -271,6 +273,7 @@ func GetChartPermissionByIdList(permissionIdList []int) (items []*ChartPermissio
 	}
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id in (` + utils.GetOrmInReplace(num) + `) `
-	err = o.Raw(sql, permissionIdList).QueryRow(&items)
+	_, err = o.Raw(sql, permissionIdList).QueryRows(&items)
+
 	return
 }

models/report_approve/report_approve.go

@@ -275,6 +275,7 @@ type ReportApproveItemOrm struct {
 	CreateTime            time.Time `description:"创建时间"`
 	ModifyTime            time.Time `description:"修改时间"`
 	NodeState             int       `description:"当前节点审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回" json:"-"`
+	NodeApproveTime       time.Time `description:"当前节点审批时间" json:"-"`
 }
 
 // GetApprovingReportApproveCount 获取待处理的审批分页列表总数
@@ -324,7 +325,7 @@ func GetApprovedReportApprovePageList(cond string, pars []interface{}, orderRule
 	if orderRule != "" {
 		order = ` ORDER BY ` + orderRule
 	}
-	sql := fmt.Sprintf(`SELECT a.report_approve_record_id, a.state AS record_state,a.node_state, a.approve_time AS handle_time, b.*
+	sql := fmt.Sprintf(`SELECT a.report_approve_record_id, a.state AS record_state,a.node_state,a.node_approve_time, a.approve_time AS handle_time, b.*
 		FROM report_approve_record AS a
 		JOIN report_approve AS b ON a.report_approve_id = b.report_approve_id
 		WHERE 1 = 1 %s %s

models/report_chapter.go

@@ -118,7 +118,7 @@ func GetPublishedChapterListByReportId(reportId int) (list []*ReportChapter, err
 // AddReportChapterReq
 // @Description: 新增报告章节请求体
 type AddReportChapterReq struct {
-	ReportId   int    `description:"报告章节ID"`
+	ReportId   int    `description:"报告ID"`
 	Title      string `description:"标题"`
 	Author     string `description:"作者"`
 	Content    string `description:"内容"`