no message

controllers/statistic/rai_data_summary.go

@@ -182,7 +182,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	//续约部分的数据
 	var conditionInherit string
 	var parsInherit []interface{}
-	conditionInherit = ` AND  a.product_id = 2  AND  a.status = 1  AND  a.inherit_end_date >= ?  AND  a.inherit_end_date <= ?  AND a.rai_contract_type = '续约合同'   AND  a.company_contract_id NOT IN (` + utils.GetOrmInReplace(len(companyContractIds)) + `) `
+	conditionInherit = ` AND  c.product_id = 2  AND  a.status = 1  AND  a.inherit_end_date >= ?  AND  a.inherit_end_date <= ?  AND a.rai_contract_type = '续约合同'   AND  a.company_contract_id NOT IN (` + utils.GetOrmInReplace(len(companyContractIds)) + `) `
 	parsInherit = append(parsInherit, startDate, endDate, companyContractIds)
 	listInheritData, err := statistic_report.GetRaiDataSummaryInheritList(conditionInherit, parsInherit)
 	if err != nil {
@@ -194,7 +194,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	//确认不续约、到期合同部分的数据
 	var conditionEnd string
 	var parsEnd []interface{}
-	conditionEnd = " AND  a.product_id = 2  AND  a.status = 1  AND  a.due_end_date >= ?  AND  a.due_end_date <= ? AND  a.end_date < ? "
+	conditionEnd = " AND  c.product_id = 2  AND  a.status = 1  AND  a.due_end_date >= ?  AND  a.due_end_date <= ? AND  a.end_date < ? "
 	parsEnd = append(parsEnd, startDate, endDate, time.Now().Format(utils.FormatDate))
 	listEndData, err := statistic_report.GetRaiDataSummaryList(conditionEnd, parsEnd)
 	if err != nil {
@@ -1093,7 +1093,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			} else {
 				condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
 			}
-
 		}
 
 		condition += ` 	AND a.product_id = 2  AND  a.status = 1  AND a.due_end_date >= ?  AND a.due_end_date <= ?   AND a.end_date < ? `
@@ -1581,7 +1580,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		if sellerId != "" {
 			condition += ` AND a.seller_id  IN (` + sellerId + `) `
 		}
-		condition += " AND  b.is_deleted = 0    AND a.invoice_type IN  (1,3)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   "
+		condition += " AND  a.is_deleted = 0    AND a.invoice_type IN  (1,3)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   "
 		pars = append(pars, startDate, endDate)
 		total, err := fms.GetContractInvoiceCount(condition, pars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1613,7 +1612,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		if sellerId != "" {
 			condition += ` AND a.seller_id  IN (` + sellerId + `) `
 		}
-		condition += " AND  b.is_deleted = 0    AND a.invoice_type IN  (2,4)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   "
+		condition += " AND  a.is_deleted = 0    AND a.invoice_type IN  (2,4)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   "
 		pars = append(pars, startDate, endDate)
 		total, err := fms.GetContractInvoiceCount(condition, pars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1647,10 +1646,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		}
 		var condition2 string
 		var pars2 []interface{}
-		condition2 = condition + " AND  b.is_deleted = 0      AND a.invoice_type  IN  (2,4)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   "
+		condition2 = condition + " AND  a.is_deleted = 0      AND a.invoice_type  IN  (2,4)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   "
 		pars2 = append(pars2, startDate, endDate)
 
-		condition += " AND  b.is_deleted = 0   AND a.invoice_type IN  (1,3)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   "
+		condition += " AND  a.is_deleted = 0   AND a.invoice_type IN  (1,3)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   "
 		pars = append(pars, startDate, endDate)
 		amount1, err := fms.GetContractInvoiceAmountCount(condition, pars) //开票金额总计
 		if err != nil {
@@ -1676,7 +1675,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		if sellerId != "" {
 			condition += ` AND a.seller_id  IN (` + sellerId + `) `
 		}
-		condition += ` AND  b.is_deleted = 0   AND  b.contract_type = 1  AND a.invoice_type IN  (1,3)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?  `
+		condition += ` AND  a.is_deleted = 0   AND  b.contract_type = 1  AND a.invoice_type IN  (1,3)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?  `
 		pars = append(pars, startDate, endDate)
 		total, err := fms.GetContractInvoiceCount(condition, pars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1706,14 +1705,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		}
 
 	case "新客到款":
-		//if sellerId != "" {
-		//	condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
-		//}
-		//condition += " AND  a.is_deleted = 0    AND a.contract_type = 1   AND  a.payment_amount > 0  AND b.invoice_type = 2   AND  b.invoice_time >= ?  AND  b.invoice_time <= ?   "
 		if sellerId != "" {
 			condition += ` AND a.seller_id  IN (` + sellerId + `) `
 		}
-		condition += ` AND  b.is_deleted = 0   AND  b.contract_type = 1  AND a.invoice_type IN  (2,4)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   `
+		condition += ` AND  a.is_deleted = 0   AND  b.contract_type = 1  AND a.invoice_type IN  (2,4)   AND  a.invoice_time >= ?  AND  a.invoice_time <= ?   `
 		pars = append(pars, startDate, endDate)
 		total, err := fms.GetContractInvoiceCount(condition, pars)
 		if err != nil && err.Error() != utils.ErrNoRow() {

models/statistic_report.go

@@ -966,14 +966,16 @@ type CompanyContractGroupList struct {
 func GetCompanyContractGroupList(condition string, pars []interface{}) (items []*CompanyContractGroupList, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			company_id,
-			COUNT( company_id )  company_count 
+			a.company_id,
+			COUNT( a.company_id )  company_count 
 		FROM
-			company_contract AS a  WHERE  product_id = 2  `
+			company_contract AS a  
+		INNER  JOIN company_product  AS b ON a.company_id = b.company_id 
+		WHERE  b.product_id = 2   `
 	if condition != "" {
 		sql += condition
 	}
-	sql += ` GROUP BY company_id `
+	sql += ` GROUP BY a.company_id `
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }