no message

controllers/statistic/rai_data_summary.go

@@ -254,6 +254,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	var keyMapTtoal string
 	var keyMapTtoalServer string
 	var keyMapCompany string
+	var keyMapCompanyTotal string
 	var keyMapCompanyNo string
 	//var keyMapCompanyNoServer string
 	var keySigned string
@@ -397,6 +398,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 	//确认不续约、到期合同部分的数据
 	mapKeyMapCompanyEndData := make(map[string]bool)
+	mapKeyMapCompanyEndDataTotal := make(map[string]bool)
 	mapKeyMapCompanyNoData := make(map[string]bool)
 	//到期部分开拓组数据
 	for _, v := range listEndData {
@@ -410,6 +412,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_", v.CompanyId)
+		keyMapCompanyTotal = fmt.Sprint(yearStr, "_CID_", v.CompanyId)
 		keyMapCompanyNo = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_NO", v.CompanyId)
 		keyMapTtoal = fmt.Sprint(yearStr, "_Develop")
 
@@ -424,9 +427,12 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		//一家公司同一个时间纬度，只统计一次
 		if !mapKeyMapCompanyEndData[keyMapCompany] {
 			mapExpiredContractCompanyNum[keyMap]++
-			mapExpiredContractCompanyNum[keyMapTtoal]++
 			mapKeyMapCompanyEndData[keyMapCompany] = true
 		}
+		if !mapKeyMapCompanyEndDataTotal[keyMapCompanyTotal] { //同一家共公司，在某个时段的多分合同下有不同的销售进行兼容
+			mapExpiredContractCompanyNum[keyMapTtoal]++
+			mapKeyMapCompanyEndDataTotal[keyMapCompanyTotal] = true
+		}
 
 		if mapNoRenewedcompanyContractIds[v.CompanyContractId] { // 确认不续约合同
 			confirmedNoRenewalContractMoney[keyMap] += v.Money

models/fms/invoice_payment_summary.go

@@ -263,7 +263,7 @@ func GetContractRegisterListByStartDate(startDate, endDate string) (results []*C
 			a.invoice_time,
 			a.invoice_type
 		 FROM contract_invoice   as a 
-         INNER JOIN contract_register as b ON a.contract_register_id = b.contract_register_id    AND b.is_deleted = 0  AND  a.invoice_time >= ?  AND  a.invoice_time <= ?    `
+         INNER JOIN contract_register as b ON a.contract_register_id = b.contract_register_id    AND a.is_deleted = 0  AND  a.invoice_time >= ?  AND  a.invoice_time <= ?    `
 	_, err = o.Raw(sql, startDate, endDate).QueryRows(&results)
 	return
 }

models/statistic_report/rai_data_summary.go

@@ -113,8 +113,9 @@ func GetRaiDataSummaryList(condition string, pars []interface{}) (items []*Incre
 			   a.share_seller_last,
 			   a.share_seller_id_last
        FROM company_contract a
+    	INNER JOIN  company_product c ON a.company_id = c.company_id and a.product_id=c.product_id and  c.product_id = 2 
 	   JOIN company b ON a.company_id = b.company_id
-	   JOIN company_product c ON a.company_id = c.company_id and a.product_id=c.product_id WHERE 1 = 1 `
+	   WHERE 1 = 1 `
 	if condition != "" {
 		sql += condition
 	}