fix

controller/census/invoice_payment.go

@@ -1664,24 +1664,6 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 			}
 		}
 
-		// 获取汇总数据IDs, 用于查询合计数据
-		//summaryIdsCond := cond
-		//summaryIdsPars := pars
-		//if req.SellerIds != "" {
-		//	sellerIds := strings.Split(req.SellerIds, ",")
-		//	summaryIdsCond += ` AND c.seller_id in ?  AND (d.origin_amount > c.origin_amount OR c.origin_amount IS NULL) `
-		//	summaryIdsPars = append(summaryIdsPars, sellerIds)
-		//} else {
-		//	summaryIdsCond += `  AND (d.origin_amount > c.origin_amount OR c.origin_amount IS NULL) `
-		//	summaryIdsPars = append(summaryIdsPars)
-		//}
-		//summaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(summaryIdsCond, summaryIdsPars)
-		//if e != nil {
-		//	resp.FailMsg("获取失败", "获取商品到款汇总IDs失败, Err: "+e.Error(), c)
-		//	return
-		//}
-
-		//fmt.Println("summaryIds:",summaryIds)
 		var listErr, totalErr, totalGroupErr error
 		wg := sync.WaitGroup{}
 
@@ -1697,14 +1679,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 			summaryCond += ` AND a.register_id IN ?`
 			summaryPars := pars
 			summaryPars = append(summaryPars, queryRegisterIds)
-			//if req.SellerIds != "" {
-			//	sellerIds := strings.Split(req.SellerIds, ",")
-			//	summaryCond += ` AND c.seller_id in ? AND a.payment_id <> 0 AND (d.origin_amount > c.origin_amount OR c.origin_amount IS NULL) `
-			//	summaryPars = append(summaryPars, sellerIds, sellerIds)
-			//} else {
-			//	summaryCond += ` AND a.payment_id <> 0 AND (d.origin_amount > c.origin_amount OR c.origin_amount IS NULL) `
-			//	summaryPars = append(summaryPars)
-			//}
+
 
 			summaryData, e := fms.GetNotInvoicePaymentCensusSummaryData(summaryCond, summaryPars)
 			if e != nil {
@@ -1716,7 +1691,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 				notQueryRegisterIds = append(notQueryRegisterIds, v.ContractRegisterId)
 			}
 
-			noSummaryCond += ` AND b.is_deleted = 0`
+			noSummaryCond += ` AND b.is_deleted = 0 AND b.contract_status <> 4 `
 			noSummaryCond += ` AND b.contract_register_id IN ? AND b.contract_register_id NOT IN ?`
 			noSummaryPars = append(noSummaryPars, queryRegisterIds, notQueryRegisterIds)
 			noSummaryData, e := fms.GetNoInvoicePaymentCensusData(noSummaryCond, noSummaryPars)
@@ -1735,11 +1710,6 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 
 			summaryList = append(summaryList, noSummaryData...)
 
-			//summaryIds := make([]int, 0)
-			//paymentIds := make([]int, 0)
-			//for i := range summaryList {
-			//	//summaryIds = append(summaryIds, summaryList[i].SummaryId)
-			//}
 
 			//fmt.Println("len(NotInvoiceSummaryMap):", len(NotInvoiceSummaryMap))
 
@@ -1916,32 +1886,6 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 			}
 		}()
 
-		// 开票到款金额合计(换算后)
-		//var invoiceTotal, paymentTotal, contractAmount float64
-		//wg.Add(1)
-		//go func() {
-		//	defer wg.Done()
-		//
-		//	if len(summaryIds) == 0 {
-		//		return
-		//	}
-		//	amountTotalCond := `a.id IN ?`
-		//	amountTotalPars := make([]interface{}, 0)
-		//	amountTotalPars = append(amountTotalPars, summaryIds)
-		//	invoiceSum, e := fms.GetContractSummaryInvoicePaymentAmountTotal(amountTotalCond, amountTotalPars, 1)
-		//	if e != nil {
-		//		totalErr = fmt.Errorf("获取汇总开票金额合计失败, Err: %s", e.Error())
-		//		return
-		//	}
-		//	invoiceTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", invoiceSum), 64)
-		//	paymentSum, e := fms.GetContractSummaryInvoicePaymentAmountTotal(amountTotalCond, amountTotalPars, 2)
-		//	if e != nil {
-		//		totalErr = fmt.Errorf("获取汇总到款金额合计失败, Err: %s", e.Error())
-		//		return
-		//	}
-		//	paymentTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", paymentSum), 64)
-		//}()
-
 		// 开票到款金额合计(换算后)V2
 		var invoiceTotal, contractAmount float64
 		wg.Add(1)