|
|
@@ -649,7 +649,7 @@ func GetDuplicateContractInvoiceDetailItemList(companyName, startDate, endDate s
|
|
|
Joins(" JOIN contract_register as b ON a.contract_register_id = b.contract_register_id ").
|
|
|
Joins("JOIN contract_service AS c ON a.contract_register_id = c.contract_register_id").
|
|
|
Where(fmt.Sprintf("a.is_deleted = 0 AND b.company_name = '%s' AND b.start_date= '%s' AND b.end_date= '%s' AND b.is_deleted=0 AND (a.invoice_type=3 OR a.invoice_type=4) AND b.contract_type=? AND b.has_payment=?", companyName, startDate, endDate), contractType, hasPayment).
|
|
|
- Group("a.contract_register_id").
|
|
|
+ Group("a.contract_invoice_id").
|
|
|
Order("a.contract_invoice_id ASC").
|
|
|
Find(&list).Error
|
|
|
if err != nil {
|
ziwen