Merge branch 'pool/341' into debug

# Conflicts:
#	routers/router.go

controllers/report_v2.go

@@ -866,6 +866,7 @@ func (this *ReportController) SaveReportContent() {
 // @Param   ClassifyIdFirst   query   int  true       "一级分类id"
 // @Param   ClassifyIdSecond   query   int  true       "二级分类id"
 // @Param   ClassifyIdThird   query   int  true       "三级分类id"
+// @Param   State   query   string  true       "报告状态，多状态用英文,隔开"
 // @Success 200 {object} models.ReportListResp
 // @router /list/authorized [get]
 func (this *ReportController) AuthorizedListReport() {
@@ -880,6 +881,7 @@ func (this *ReportController) AuthorizedListReport() {
 	classifyIdFirst, _ := this.GetInt("ClassifyIdFirst", 0)
 	classifyIdSecond, _ := this.GetInt("ClassifyIdSecond", 0)
 	classifyIdThird, _ := this.GetInt("ClassifyIdThird", 0)
+	stateStr := this.GetString("State")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -940,6 +942,12 @@ func (this *ReportController) AuthorizedListReport() {
 		pars = utils.GetLikeKeywordPars(pars, keyword, 1)
 	}
 
+	if stateStr != `` {
+		stateStrList := strings.Split(stateStr, ",")
+		condition += ` AND a.state in (` + utils.GetOrmInReplace(len(stateStrList)) + `) `
+		pars = append(pars, stateStrList)
+	}
+
 	var err error
 	var total int
 

models/report_v2.go

@@ -369,7 +369,7 @@ func GetReportListCountByAuthorized(condition string, pars []interface{}) (count
 func GetReportListByAuthorized(condition string, pars []interface{}, startSize, pageSize int) (items []*ReportList, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 
-	sql := `SELECT id,classify_id_first,classify_name_first,classify_id_second,classify_name_second,classify_id_third,classify_name_third,title,stage,create_time,author,report_layout,collaborate_type,is_public_publish,abstract,has_chapter,publish_time FROM report as a WHERE 1=1  `
+	sql := `SELECT id,classify_id_first,classify_name_first,classify_id_second,classify_name_second,classify_id_third,classify_name_third,title,stage,create_time,state,author,report_layout,collaborate_type,is_public_publish,abstract,has_chapter,publish_time FROM report as a WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}

routers/router.go

@@ -327,7 +327,6 @@ func init() {
 				&document_manage.DocumentManageController{},
 			),
 		),
-
 		web.NSNamespace("/material",
 			web.NSInclude(
 				&material.MaterialController{},