From 7703dbe61a7604b19301fe80bdf1434602b3f60c Mon Sep 17 00:00:00 2001
From: tangfutang <3218982385@qq.com>
Date: Thu, 2 Jun 2022 15:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=8F=90=E5=89=8D=E7=BB=93?=
 =?UTF-8?q?=E6=B8=85=EF=BC=8C=E7=BD=91=E9=93=B6=E6=94=B6=E6=AC=BE=E3=80=81?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=BF=98=E6=AC=BE=E4=B8=8D=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E8=87=AA=E5=8A=A8=E6=8A=B5=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tenwa/lease/app/quartzmession/MarginDeduction.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/MarginDeduction.java b/src_tenwa/com/tenwa/lease/app/quartzmession/MarginDeduction.java
index a826b16ba..152ed0106 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/MarginDeduction.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/MarginDeduction.java
@@ -48,7 +48,7 @@ public class MarginDeduction implements Job{
 					"from  lc_fund_plan lfp left join lb_contract_info lci on lci.id=lfp.CONTRACT_ID " +
 					" left join (select sum(fact_money) fact_money,PAYMENT_NUMBER from lc_fund_income_temp where FEE_TYPE='feetype16' and is_flowing='0' and ROLL_BACK='0' group by PAYMENT_NUMBER) lfit on lfp.PAYMENT_NUMBER=lfit.PAYMENT_NUMBER " +
 					" LEFT JOIN (SELECT SUM(fact_money) fact_money,PAYMENT_NUMBER FROM lc_fund_income WHERE FEE_TYPE='feetype16' AND ROLL_BACK='0' group by PAYMENT_NUMBER) lfi on lfp.PAYMENT_NUMBER=lfi.PAYMENT_NUMBER " +
-					"where lci.BUSINESSTYPE='1' and lci.CONTRACT_STATUS='31' and  lfp.FEE_TYPE='feetype16' and lfp.SETTLE_METHOD is not null group by lci.id ");
+					"where lci.BUSINESSTYPE='1' and lci.CONTRACT_STATUS='31' and  lfp.FEE_TYPE='feetype16' and lfp.SETTLE_METHOD is not null  AND NOT EXISTS (SELECT 1 FROM  lc_occupy_rent_list lorl WHERE lfp.PAYMENT_NUMBER = lorl.PAYMENT_NUMBER AND  lorl.flow_name IN ('合同中途终止','微信银联收款','微信支付收款','网银收款','提前结清申请')) group by lci.id HAVING fact_money>0");
 			if(listData!=null && listData.size() > 0 ){
 				for (int i = 0; i < listData.size(); i++) {
 					try {