Merge branch 'crm/crm_16.7' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/statistic/rai_data_summary.go

@@ -1573,9 +1573,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 
 	case "开票金额":
 		if sellerId != "" {
-			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
+			condition += ` AND a.seller_id  IN (` + sellerId + `) `
 		}
-		condition += " AND  a.is_deleted = 0    AND  a.invoiced_amount > 0  AND b.invoice_type = 1   AND  b.invoice_time >= ?  AND  b.invoice_time <= ?   "
+		condition += " AND  b.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() {
@@ -1584,7 +1584,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			return
 		}
 		trialTotal = total
-		condition += " GROUP BY b.contract_invoice_id   ORDER BY invoice_time  DESC "
+		condition += " GROUP BY a.contract_invoice_id   ORDER BY a.invoice_time  DESC "
 		listFmsData, err := fms.GetContractRegisterList(condition, pars, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取数据信息失败"
@@ -1605,9 +1605,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 
 	case "到款金额":
 		if sellerId != "" {
-			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
+			condition += ` AND a.seller_id  IN (` + sellerId + `) `
 		}
-		condition += " AND  a.is_deleted = 0    AND  a.payment_amount > 0  AND b.invoice_type = 2   AND  b.invoice_time >= ?  AND  b.invoice_time <= ?   "
+		condition += " AND  b.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() {
@@ -1616,7 +1616,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			return
 		}
 		trialTotal = total
-		condition += " GROUP BY b.contract_invoice_id   ORDER BY invoice_time  DESC "
+		condition += " GROUP BY a.contract_invoice_id   ORDER BY invoice_time  DESC "
 		listFmsData, err := fms.GetContractRegisterList(condition, pars, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取数据信息失败"
@@ -1637,14 +1637,14 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 
 	case "未到款比例":
 		if sellerId != "" {
-			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
+			condition += ` AND a.seller_id  IN (` + sellerId + `) `
 		}
 		var condition2 string
 		var pars2 []interface{}
-		condition2 = condition + " AND  a.is_deleted = 0    AND  a.payment_amount > 0  AND b.invoice_type = 2   AND  b.invoice_time >= ?  AND  b.invoice_time <= ?   "
+		condition2 = condition + " AND  b.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  a.is_deleted = 0    AND  a.invoiced_amount > 0  AND b.invoice_type = 1   AND  b.invoice_time >= ?  AND  b.invoice_time <= ?   "
+		condition += " AND  b.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 {
@@ -1668,9 +1668,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 
 	case "新客开票":
 		if sellerId != "" {
-			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
+			condition += ` AND a.seller_id  IN (` + sellerId + `) `
 		}
-		condition += " AND  a.is_deleted = 0    AND  a.contract_type = 1 AND  a.invoiced_amount > 0  AND b.invoice_type = 1   AND  b.invoice_time >= ?  AND  b.invoice_time <= ?   "
+		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 <= ?  `
 		pars = append(pars, startDate, endDate)
 		total, err := fms.GetContractInvoiceCount(condition, pars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1679,8 +1679,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			return
 		}
 		trialTotal = total
-		condition += " GROUP BY b.contract_invoice_id   ORDER BY invoice_time  DESC "
+		condition += " GROUP BY a.contract_invoice_id   ORDER BY a.invoice_time  DESC "
 		listFmsData, err := fms.GetContractRegisterList(condition, pars, startSize, pageSize)
+
 		if err != nil {
 			br.Msg = "获取数据信息失败"
 			br.ErrMsg = "获取数据信息失败,Err:" + err.Error()
@@ -1699,10 +1700,14 @@ 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.rai_seller_id  IN (` + sellerId + `) `
+			condition += ` AND a.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 <= ?   "
+		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 <= ?  `
 		pars = append(pars, startDate, endDate)
 		total, err := fms.GetContractInvoiceCount(condition, pars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1711,7 +1716,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			return
 		}
 		trialTotal = total
-		condition += " GROUP BY b.contract_invoice_id   ORDER BY invoice_time  DESC "
+		condition += ` GROUP BY a.contract_invoice_id   ORDER BY a.invoice_time  DESC `
 		listFmsData, err := fms.GetContractRegisterList(condition, pars, startSize, pageSize)
 		if err != nil {
 			br.Msg = "获取数据信息失败"

models/fms/invoice_payment_summary.go

@@ -175,13 +175,13 @@ type ContractRegisterRaiData struct {
 func GetContractRegisterList(condition string, pars []interface{}, startSize, pageSize int) (items []*ContractRegisterRaiData, err error) {
 	o := orm.NewOrmUsingDB("fms")
 	sql := `SELECT 
-    		a.company_name,
-			a.rai_seller_name,
-			a.contract_code,
-			b.amount,
-			b.invoice_time 
-		 FROM contract_register  as a 
-         INNER JOIN contract_invoice as b ON a.contract_register_id = b.contract_register_id  
+			a.amount,
+			a.invoice_time ,
+			b.company_name,
+			b.rai_seller_name,
+			b.contract_code
+		 FROM contract_invoice   as a 
+         INNER JOIN contract_register as b ON a.contract_register_id = b.contract_register_id  
          WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
@@ -227,8 +227,8 @@ func GetContractInvoiceList(condition string, pars []interface{}, startSize, pag
 // 获取数量
 func GetContractInvoiceCount(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrmUsingDB("fms")
-	sqlCount := ` SELECT COUNT(1) AS count  FROM contract_register as a
-                  INNER JOIN contract_invoice as b ON a.contract_register_id = b.contract_register_id  
+	sqlCount := ` SELECT COUNT(1) AS count   FROM  contract_invoice as a
+                  INNER JOIN contract_register  as b ON a.contract_register_id = b.contract_register_id  
                   WHERE 1= 1  `
 	if condition != "" {
 		sqlCount += condition
@@ -241,8 +241,8 @@ func GetContractInvoiceCount(condition string, pars []interface{}) (count int, e
 func GetContractInvoiceAmountCount(condition string, pars []interface{}) (amount float64, err error) {
 	o := orm.NewOrmUsingDB("fms")
 	sql := `SELECT
-			SUM( amount ) AS amount FROM contract_register  as a
-			INNER JOIN contract_invoice as b ON a.contract_register_id = b.contract_register_id  
+			SUM( amount ) AS amount FROM contract_invoice    as a
+			INNER JOIN contract_register as b ON a.contract_register_id = b.contract_register_id  
 			WHERE 1= 1  `
 	if condition != "" {
 		sql += condition
@@ -255,13 +255,13 @@ func GetContractInvoiceAmountCount(condition string, pars []interface{}) (amount
 func GetContractRegisterListByStartDate(startDate, endDate string) (results []*ContractRegisterRaiData, err error) {
 	o := orm.NewOrmUsingDB("fms")
 	sql := `SELECT 
-			a.rai_seller_id,
-			a.contract_type,
-			b.amount,
-			b.invoice_time,
-			b.invoice_type
-		 FROM contract_register  as a 
-         INNER JOIN contract_invoice as b ON a.contract_register_id = b.contract_register_id    AND a.is_deleted = 0  AND  b.invoice_time >= ?  AND  b.invoice_time <= ?    `
+			a.seller_id as  rai_seller_id ,
+			b.contract_type,
+			a.amount,
+			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 <= ?    `
 	_, err = o.Raw(sql, startDate, endDate).QueryRows(&results)
 	return
 }