Roc 1 week ago
parent
commit
eeeebdb58e
1 changed files with 4 additions and 2 deletions
  1. 4 2
      models/report_v2.go

+ 4 - 2
models/report_v2.go

@@ -468,6 +468,7 @@ type ExportReportItem struct {
 }
 
 func GetExportReportList(startDate, endDate string, otherReportClassifyIdList []int) (items []*ExportReportItem, err error) {
+	otherReportClassifyIdList = append(otherReportClassifyIdList, 229) //固收报告,权益的
 	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT
 	count(1) total,admin_id,admin_real_name admin_name,classify_id_first,classify_name_first
@@ -526,6 +527,7 @@ WHERE
 }
 
 func GetExportReportChapterList(startDate, endDate string, otherReportClassifyIdList []int) (items []*ExportReportItem, err error) {
+	otherReportClassifyIdList = append(otherReportClassifyIdList, 229) //固收报告,权益的
 	o := global.DbMap[utils.DbNameReport]
 	sql := `SELECT count(1) total,b.last_modify_admin_id admin_id,b.last_modify_admin_name admin_name,a.classify_id_first,a.classify_name_first
 FROM report as a
@@ -587,8 +589,8 @@ func GetExportEnglishReportList(startDate, endDate string) (items []*ExportEngli
 
 	sql := `select count(1) total,admin_id,admin_real_name admin_name,classify_id_first second_classify_id,classify_name_first second_classify_name,classify_id_second third_classify_id,classify_name_second third_classify_name
  from english_report where 
-	create_time >= ?
-	AND create_time < ?
+	publish_time >= ?
+	AND publish_time < ?
 	AND state IN (2,6)
 group by classify_id_first ,classify_id_second,admin_id`