Преглед изворни кода

fix(*): 当年未开票金额问题修复

likai пре 1 година
родитељ
комит
c0224a1e63
1 измењених фајлова са 10 додато и 2 уклоњено
  1. 10 2
      opms_parent/app/service/home/home.go

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

@@ -223,8 +223,16 @@ func (s *HomeService) getNumStatisticsData(id int64, params *map[string]interfac
 	case 10015: //当年未开票金额,数据=2023年未开票金额
 		count, err := contractDao.DataScope(s.Ctx, "incharge_id").
 			Where("year(contract_sign_time) = ?", time.Now().Year()).
-			Sum(contractDao.C.ContractAmount + " - " + contractDao.C.InvoiceAmount)
-		return gconv.String(count), err
+			Sum(contractDao.C.ContractAmount)
+		if err != nil {
+			return "", err
+		}
+		count1, 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")
+		if err != nil {
+			return "", err
+		}
+		return gconv.String(count - count1), err
 
 	case 10016: //当年签约未回款金额,数据=2023年合同中未回款金额,过程中有实际回款时数据
 		count, err := contractDao.DataScope(s.Ctx, "incharge_id").