Merge branch 'BI_Dashboard' of http://8.136.199.33:3000/eta_gn_server/eta_api into BI_Dashboard

models/bi_approve/bi_approve.go

@@ -164,7 +164,7 @@ func GetApprovedBiApprovePageList(cond string, pars []interface{}, orderRule str
 
 // GetApplyBiApproveCount 获取我发起的审批分页列表总数
 func GetApplyBiApproveCount(cond string, pars []interface{}) (count int, err error) {
-	base := fmt.Sprintf(`SELECT a.* FROM Bi_approve AS a WHERE 1 = 1 %s`, cond)
+	base := fmt.Sprintf(`SELECT a.* FROM bi_approve AS a WHERE 1 = 1 %s`, cond)
 	sql := fmt.Sprintf(`SELECT COUNT(1) FROM (%s) t`, base)
 	err = global.DmSQL["rddp"].Raw(sql, pars...).Scan(&count).Error
 	return

services/bi_approve/bi_approve.go

@@ -593,9 +593,9 @@ func MyApplyBiApproves(adminId, classifyId, timeType, sortField, sortRule, appro
 			err = e
 			return
 		}
-		tmpEndTime = tmpEndTime.AddDate(0, 0, 1)
-		cond += fmt.Sprintf(` AND (%s BETWEEN ? AND ?)`, timeField[timeType])
-		pars = append(pars, startTime, tmpEndTime)
+		tmpEndTimeStr := tmpEndTime.AddDate(0, 0, 1).Format(utils.FormatDate)
+		cond += fmt.Sprintf(` AND (%s BETWEEN ? AND ?)`, myTimeField[timeType])
+		pars = append(pars, startTime, tmpEndTimeStr)
 	}
 	keyword = strings.TrimSpace(keyword)
 	if keyword != "" {