Browse Source

no message

zhangchuanxing 1 tuần trước cách đây
mục cha
commit
46125d1ddc

+ 7 - 7
controllers/statistic/rai_data_summary.go

@@ -275,13 +275,13 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 	//新签部分的数据(服务组)
 	for _, v := range listRaiData {
-		if !mapsellerDevelop[v.ShareSellerInit] {
+		if !mapsellerDevelop[v.ShareSellerIdInit] {
 			continue
 		}
 		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType)
 
-		keyMap = fmt.Sprint(yearStr, "_Server_", v.ShareSellerInit)
-		keySigned = fmt.Sprint(yearStr, "_Server_", v.CompanyId, "_SID_", v.ShareSellerInit)
+		keyMap = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdInit)
+		keySigned = fmt.Sprint(yearStr, "_Server_", v.CompanyId, "_SID_", v.ShareSellerIdInit)
 		keyMapTtoal = fmt.Sprint(yearStr, "_Server_")
 
 		if v.RaiContractType == "新签合同" {
@@ -1400,11 +1400,11 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		var parsInherit []interface{}
 		if sellerId != "" {
 			if isServerSeller {
-				condition += ` AND a.share_seller_id_last  IN (` + sellerId + `) `
-				conditionInherit += ` AND a.share_seller_id_last  IN (` + sellerId + `) `
+				condition += ` AND a.share_seller_id_init  IN (` + sellerId + `) `
+				conditionInherit += ` AND a.share_seller_id_init  IN (` + sellerId + `) `
 			} else {
-				condition += ` AND a.seller_id_last IN (` + sellerId + `) `
-				conditionInherit += ` AND a.seller_id_last  IN (` + sellerId + `) `
+				condition += ` AND a.seller_id_init IN (` + sellerId + `) `
+				conditionInherit += ` AND a.seller_id_init  IN (` + sellerId + `) `
 			}
 		}
 		condition += " AND  a.product_id = 2  AND  a.status = 1  AND  a.start_date >= ?  AND  a.start_date <= ?  AND a.rai_contract_type = '新签合同' "

+ 1 - 1
models/statistic_report/rai_data_summary.go

@@ -85,7 +85,7 @@ type IncrementalList struct {
 	SellerNameInit    string `description:"权益初始化销售"`
 	SellerIdInit      int    `description:"权益初始化销售ID"`
 	SellerIdLast      int    `description:"合同到期之前最后所属销售ID"`
-	ShareSellerInit   int    `description:"共享销售员"`
+	ShareSellerIdInit int    `description:"共享销售员"`
 	ShareSellerIdLast int    `description:"合同到期之前最后共享销售员ID"`
 	SysRealName       string `description:"操作者名称"`
 	Operation         string `description:"操作"`