Browse Source

fix(当年已开票金额): 当年已开票金额统计关联发票表

likai 2 years ago
parent
commit
4524f6075a
1 changed files with 2 additions and 2 deletions
  1. 2 2
      opms_parent/app/service/home/home.go

+ 2 - 2
opms_parent/app/service/home/home.go

@@ -263,8 +263,8 @@ func (s *HomeService) getNumStatisticsData(id int64, params *map[string]interfac
 		return gconv.String(count), err
 
 	case 10021: //当年的已开票金额(维度:年)
-		count, err := contractDao.DataScope(s.Ctx, "incharge_id").WhereGTE(contractDao.C.ContractStartTime, yearStart).WhereLTE(contractDao.C.ContractStartTime, yearEnd).
-			Sum(contractDao.C.InvoiceAmount)
+		count, err := contractDao.As("a").DataScope(s.Ctx, "incharge_id").InnerJoin("ctr_contract_invoice b", "a.id=b.contract_id").Where("b.invoice_date>=? AND b.invoice_date<=? AND b.appro_status='30'", yearStart, yearEnd).
+			Sum("b.invoice_amount")
 		return gconv.String(count), err
 	}
 	return "", nil