fix

controllers/report_approval.go

@@ -103,7 +103,7 @@ func (this *ReportController) ListReport() {
 	//	condition += ` AND state = ? `
 	//	pars = append(pars, state)
 	//}
-	condition += ` AND state <> 2 `
+	condition += ` AND state <> 1 `
 
 	total, err := models.GetReportListCount(condition, pars, "")
 	if err != nil {

controllers/smart_report_approval.go

@@ -5,7 +5,6 @@ import (
 	"eta/eta_hub/models"
 	"eta/eta_hub/services"
 	"eta/eta_hub/utils"
-	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"strconv"
 	"strings"
@@ -76,36 +75,36 @@ func (this *SmartReportController) List() {
 	var pars []interface{}
 	// 筛选项
 	{
-		keyword := strings.TrimSpace(params.Keyword)
-		if keyword != "" {
-			kw := fmt.Sprint("%", keyword, "%")
-			condition += fmt.Sprintf(` AND (title LIKE ? OR admin_real_name LIKE ? OR last_modify_admin_name LIKE ?)`)
-			pars = append(pars, kw, kw, kw)
-		}
-		if params.StartDate != "" && params.EndDate != "" {
-			st := fmt.Sprintf("%s 00:00:00", params.StartDate)
-			ed := fmt.Sprintf("%s 23:59:59", params.EndDate)
-			condition += fmt.Sprintf(` AND %s >= ? AND %s <= ?`, params.TimeType, params.TimeType)
-			pars = append(pars, st, ed)
-		}
-		if params.Frequency != "" {
-			condition += ` AND frequency = ?`
-			pars = append(pars, params.Frequency)
-		}
-		if params.ClassifyIdFirst > 0 {
-			condition += ` AND classify_id_first = ?`
-			pars = append(pars, params.ClassifyIdFirst)
-		}
-		if params.ClassifyIdSecond > 0 {
-			condition += ` AND classify_id_second = ?`
-			pars = append(pars, params.ClassifyIdSecond)
-		}
-		if params.State > 0 {
-			condition += ` AND state = ?`
-			pars = append(pars, params.State)
-		}
+		//keyword := strings.TrimSpace(params.Keyword)
+		//if keyword != "" {
+		//	kw := fmt.Sprint("%", keyword, "%")
+		//	condition += fmt.Sprintf(` AND (title LIKE ? OR admin_real_name LIKE ? OR last_modify_admin_name LIKE ?)`)
+		//	pars = append(pars, kw, kw, kw)
+		//}
+		//if params.StartDate != "" && params.EndDate != "" {
+		//	st := fmt.Sprintf("%s 00:00:00", params.StartDate)
+		//	ed := fmt.Sprintf("%s 23:59:59", params.EndDate)
+		//	condition += fmt.Sprintf(` AND %s >= ? AND %s <= ?`, params.TimeType, params.TimeType)
+		//	pars = append(pars, st, ed)
+		//}
+		//if params.Frequency != "" {
+		//	condition += ` AND frequency = ?`
+		//	pars = append(pars, params.Frequency)
+		//}
+		//if params.ClassifyIdFirst > 0 {
+		//	condition += ` AND classify_id_first = ?`
+		//	pars = append(pars, params.ClassifyIdFirst)
+		//}
+		//if params.ClassifyIdSecond > 0 {
+		//	condition += ` AND classify_id_second = ?`
+		//	pars = append(pars, params.ClassifyIdSecond)
+		//}
+		//if params.State > 0 {
+		//	condition += ` AND state = ?`
+		//	pars = append(pars, params.State)
+		//}
 	}
-
+	condition += ` AND state <> 1 `
 	resp := new(models.SmartReportListResp)
 	reportOB := new(models.SmartReport)
 	total, e := reportOB.GetCountByCondition(condition, pars)