|
@@ -210,7 +210,9 @@ type IncomeSummaryItem struct {
|
|
|
// GetContractSummaryIncomeAmount 获取汇总金额合计信息
|
|
|
func GetContractSummaryIncomeAmount(condition string, pars []interface{}) (results []*IncomeSummaryItem, err error) {
|
|
|
query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
|
|
|
- Select("IF(a.invoice_id=0,d.amount, b.amount) AS amount,IF(a.invoice_id=0,d.invoice_time, b.invoice_time) AS invoice_date,"+
|
|
|
+ Select("IF(a.invoice_id=0,d.amount, b.amount) AS amount,"+
|
|
|
+ "IF(a.invoice_id=0,d.origin_amount, b.origin_amount) AS origin_amount,"+
|
|
|
+ "IF(a.invoice_id=0,d.invoice_time, b.invoice_time) AS invoice_date,"+
|
|
|
" c.contract_type,c.company_name,"+
|
|
|
"IF(a.invoice_id=0,d.seller_name, b.seller_name) AS seller_name,"+
|
|
|
"IF(a.invoice_id=0,d.seller_id, b.seller_id) AS final_seller_id,"+
|