|
|
@@ -58,8 +58,8 @@ func (ct *SellerController) GroupInvoiceList(c *gin.Context) {
|
|
|
}
|
|
|
outCond := ` department_id = %d AND parent_id = 0 `
|
|
|
outCond = fmt.Sprintf(outCond, departmentId)
|
|
|
- cond := ` invoice_type = %d AND is_deleted = 0 AND seller_group_id != 0 `
|
|
|
- cond = fmt.Sprintf(cond, fms.ContractInvoiceTypeMake)
|
|
|
+ cond := ` (invoice_type = %d OR invoice_type = %d) AND is_deleted = 0 AND seller_group_id != 0 `
|
|
|
+ cond = fmt.Sprintf(cond, fms.ContractInvoiceTypeMake, fms.ContractInvoiceTypePreMake)
|
|
|
pars := make([]interface{}, 0)
|
|
|
// 开票日期
|
|
|
if req.StartDate != "" && req.EndDate != "" {
|
|
|
@@ -282,13 +282,13 @@ func (ct *SellerController) InvoiceList(c *gin.Context) {
|
|
|
totalCond += ` AND group_id IN (?) `
|
|
|
totalPars = append(totalPars, groupIds)
|
|
|
}
|
|
|
- sumCond := ` invoice_type = ? AND is_deleted = 0 AND seller_id != 0 `
|
|
|
+ sumCond := ` (invoice_type = ? OR invoice_type = ? ) AND is_deleted = 0 AND seller_id != 0 `
|
|
|
sumPars := make([]interface{}, 0)
|
|
|
- sumPars = append(sumPars, fms.ContractInvoiceTypeMake)
|
|
|
- cond := ` c.invoice_type = %d AND c.is_deleted = 0 AND c.seller_id != 0 `
|
|
|
- inCond := ` invoice_type = %d AND is_deleted = 0 AND seller_id != 0 `
|
|
|
- cond = fmt.Sprintf(cond, fms.ContractInvoiceTypeMake)
|
|
|
- inCond = fmt.Sprintf(inCond, fms.ContractInvoiceTypeMake)
|
|
|
+ sumPars = append(sumPars, fms.ContractInvoiceTypeMake, fms.ContractInvoiceTypePreMake)
|
|
|
+ cond := ` (c.invoice_type = %d OR c.invoice_type = %d) AND c.is_deleted = 0 AND c.seller_id != 0 `
|
|
|
+ inCond := ` (invoice_type = %d OR invoice_type = %d) AND is_deleted = 0 AND seller_id != 0 `
|
|
|
+ cond = fmt.Sprintf(cond, fms.ContractInvoiceTypeMake, fms.ContractInvoiceTypePreMake)
|
|
|
+ inCond = fmt.Sprintf(inCond, fms.ContractInvoiceTypeMake, fms.ContractInvoiceTypePreMake)
|
|
|
// 开票日期
|
|
|
if req.StartDate != "" && req.EndDate != "" {
|
|
|
st := fmt.Sprint(req.StartDate, " 00:00:00")
|
ziwen