|
@@ -9,10 +9,11 @@ import (
|
|
|
"eta_gn/eta_api/models/system"
|
|
|
"eta_gn/eta_api/utils"
|
|
|
"fmt"
|
|
|
- "github.com/rdlucklib/rdluck_tools/uuid"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
+
|
|
|
+ "github.com/rdlucklib/rdluck_tools/uuid"
|
|
|
)
|
|
|
|
|
|
// GetEdbChartClassifyList
|
|
@@ -1390,6 +1391,9 @@ func GetMoveEdbChartCount(userId, countType int) (sourceMap map[int]int, err err
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
|
|
|
+ condition += ` AND source = ? `
|
|
|
+ pars = append(pars, utils.CHART_SOURCE_DEFAULT)
|
|
|
+
|
|
|
if userId > 0 {
|
|
|
condition += ` AND sys_user_id = ? `
|
|
|
pars = append(pars, userId)
|
|
@@ -1417,7 +1421,9 @@ func GetMoveEdbChartCount(userId, countType int) (sourceMap map[int]int, err err
|
|
|
|
|
|
switch countType {
|
|
|
case 2:
|
|
|
- condition += ` AND source in (2,3) `
|
|
|
+ condition += ` AND source in (2,3,5) `
|
|
|
+ // 平衡表
|
|
|
+ condition += " AND (parent_id = 0 AND balance_type = 0)"
|
|
|
default:
|
|
|
condition += ` AND source in (2,3,4) `
|
|
|
}
|