From 4fc08e23287bbadf8867b5a169113310a990cfc0 Mon Sep 17 00:00:00 2001
From: tangfutang <tangft@tenwa.com.cn>
Date: Thu, 26 Dec 2019 10:32:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src_sql/投产SQL/v20191228/tft_20191228.sql    |  2 +-
 .../controller/group/CheckMessageSend.java    |  2 +-
 .../group/SelectSendMessageType.java          | 29 ++++++++++++
 .../lease/app/quartzmession/AutoBuckle.java   | 46 ++++++++++++++++---
 4 files changed, 71 insertions(+), 8 deletions(-)
 create mode 100644 src_tenwa/com/tenwa/customer/controller/group/SelectSendMessageType.java

diff --git a/src_sql/投产SQL/v20191228/tft_20191228.sql b/src_sql/投产SQL/v20191228/tft_20191228.sql
index 6c3a17d68..0e8900132 100644
--- a/src_sql/投产SQL/v20191228/tft_20191228.sql
+++ b/src_sql/投产SQL/v20191228/tft_20191228.sql
@@ -270,7 +270,7 @@ Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescr
 Insert Into Code_Library (codeno,itemno,itemname,bankno,sortno,isinuse,itemdescribe,itemattribute,relativecode,attribute1,attribute2,attribute3,attribute4,attribute5,attribute6,attribute7,attribute8,inputuser,inputorg,inputtime,updateuser,updatetime,remark,helptext) Values ('charge_channel','wysk','ÍøÒø»Ø¿î','','0030','1','','','','','','','','','','','','SYS_Designer',null,'2019/12/16 10:00:51','SYS_Designer','2019/12/16 11:56:51','','');
 
 -- È¡ÕÐÉÌÒøÐеÄʵ¼Ê¸¶ÈÕÆÚ
-ALTER TABLE lc_fund_income_callback_detail_temp ADD COLUMN isPaymentDate VARCHAR(5) NULL COMMENT 'ÊÇ·ñ²éѯ½»Ò×ÈÕ(01ÒѲéѯ)' AFTER contract_i, ADD COLUMN PaymentDate VARCHAR(32) NULL COMMENT 'Ö§¸¶Ê±¼ä' AFTER isPaymentDate; 
+ALTER TABLE lc_fund_income_callback_detail_temp ADD COLUMN isPaymentDate VARCHAR(5) NULL COMMENT 'ÊÇ·ñ²éѯ½»Ò×ÈÕ(01ÒѲéѯ)' AFTER contract_id, ADD COLUMN PaymentDate VARCHAR(32) NULL COMMENT 'Ö§¸¶Ê±¼ä' AFTER isPaymentDate; 
 -- ½«ÀúÊ·Êý¾Ý¸ÄΪÒѲéѯ
 update lc_fund_income_callback_detail_temp set isPaymentDate='01';
 
diff --git a/src_tenwa/com/tenwa/customer/controller/group/CheckMessageSend.java b/src_tenwa/com/tenwa/customer/controller/group/CheckMessageSend.java
index 9dd3b250f..28a1309e2 100644
--- a/src_tenwa/com/tenwa/customer/controller/group/CheckMessageSend.java
+++ b/src_tenwa/com/tenwa/customer/controller/group/CheckMessageSend.java
@@ -46,7 +46,7 @@ public class CheckMessageSend {
 	}
 
 
-	//УÑé¿Û¿îÊÖÐø·Ñά»¤ÈÕÆÚ
+	//УÑé·¢ËͶÌÐÅÉèÖþ­ÏúÉÌÊÇ·ñÖظ´
 	public String checkMessageSend(JBOTransaction tx) throws Exception{
 		Conn conn = new Conn(tx);
 		String sql = "select id from SEND_TEXT_MMESSAGE where channel_no=? and msg_type=?";
diff --git a/src_tenwa/com/tenwa/customer/controller/group/SelectSendMessageType.java b/src_tenwa/com/tenwa/customer/controller/group/SelectSendMessageType.java
new file mode 100644
index 000000000..e1548da0c
--- /dev/null
+++ b/src_tenwa/com/tenwa/customer/controller/group/SelectSendMessageType.java
@@ -0,0 +1,29 @@
+package com.tenwa.customer.controller.group;
+
+import java.util.List;
+import java.util.Map;
+
+import jbo.ui.system.CODE_LIBRARY;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+
+public class SelectSendMessageType {
+
+	public static String selectSendMessage(String messageType)throws Exception{
+		StringBuffer itemname = new StringBuffer();
+   		BizObjectManager clManage = JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME);
+   		messageType = messageType.replace(",", "','");
+   		List<BizObject> itemnameList = clManage.createQuery("codeno='MsgType' AND itemno IN ('"+messageType+"')").getResultList(false);
+		for (int i = 0 ;i<itemnameList.size();i++) {
+			if(i == (itemnameList.size()-1)){
+				itemname.append(itemnameList.get(i).getAttribute("itemname"));
+			}else{
+				itemname.append(itemnameList.get(i).getAttribute("itemname")).append(",");
+			} 
+		}
+		return itemname.toString();
+	}
+}
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java b/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java
index e59084a79..2d51c4cf0 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/AutoBuckle.java
@@ -1,7 +1,11 @@
 package com.tenwa.lease.app.quartzmession;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import jbo.app.tenwa.calc.LC_RENT_INCOME_TEMP;
+import jbo.com.tenwa.lease.comm.LC_OCCUPY_RENT_LIST;
+
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
@@ -29,14 +33,44 @@ public class AutoBuckle  implements Job {
 			//
 			tx = JBOFactory.createJBOTransaction();
 			//and (O.rent<>'' or O.rent<>'0' or O.rent<>'0.0')
-		      List<BizObject> bos = JBOFactory.getBizObjectManager("jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN", tx).createQuery("O.COLLECT_STATUS IN ('δÊÕ¿î', '²¿·ÖÊÕ¿î','´ú³¥') and O.PLAN_DATE <= '" + plan_date + "' and ( O.BATCH_STATUS<>'process' or  o.BATCH_STATUS IS NULL ) ").getResultList(true);
+		    List<BizObject> bos = JBOFactory.getBizObjectManager("jbo.com.tenwa.lease.comm.VI_LC_AUDIT_RENT_PLAN", tx).createQuery("O.COLLECT_STATUS IN ('δÊÕ¿î', '²¿·ÖÊÕ¿î','´ú³¥') and O.PLAN_DATE <= '" + plan_date + "' and ( O.BATCH_STATUS<>'process' or  o.BATCH_STATUS IS NULL )  and O.distributor_id not in (select dealers_number from DEDUCTIONS_WAY where Whether_to_enable='Y') ").getResultList(true);
 			
-			
-			StringBuffer ids = new StringBuffer();
-			if(bos.size()>0){
-				for(BizObject bo : bos){
-			         ids.append(bo.getAttribute("id").getString() + "@");
+		    List<BizObject> bol = JBOFactory.createBizObjectQuery(LC_OCCUPY_RENT_LIST.CLASS_NAME,"FLOW_NAME in ('ÍøÒøÊÕ¿î','΢ÐÅÒøÁªÊÕ¿î','΢ÐÅÖ§¸¶ÊÕ¿î')").getResultList(false);
+			//»ñÈ¡×â½ðÕ¼ÓñíÀïµÄÊý¾ÝÓÐÄÄЩÊÇÍøÒøÊÕ¿îÕ¼ÓõÄ
+			List<String> planIDs = new ArrayList<String>();
+			if(bol.size()>0){
+				for(int i=0;i<bol.size();i++){
+					String flowName = bol.get(i).getAttribute("FLOW_NAME").toString();
+					if("ÍøÒøÊÕ¿î".equals(flowName)){
+						//ÔÝʱûÓÐÈøüÐÂ
+						/*String flowunid = bol.get(i).getAttribute("FLOWUNID").toString();
+						List<BizObject> bof = JBOFactory.createBizObjectQuery(LC_RENT_INCOME_TEMP.CLASS_NAME,"FLOWUNID=:flowunid").setParameter("flowunid", flowunid).getResultList(false);
+						if(bof.size()>0){
+							for(int j=0;j<bof.size();j++){
+								String planID = bof.get(j).getAttribute("PLAN_ID").toString();
+								planIDs.add(planID);
+							}
+						}*/
+					}else if ("΢ÐÅÒøÁªÊÕ¿î".equals(flowName) || "΢ÐÅÖ§¸¶ÊÕ¿î".equals(flowName)){
+						planIDs.add(bol.get(i).getAttribute("PLAN_ID").toString());
+					}
 				}
+			}
+		    
+		    StringBuffer ids = new StringBuffer();
+			if(bos.size()>0){
+				a:for(BizObject bo : bos){
+					String pid = bo.getAttribute("id").getString();
+					if(planIDs.size()>0){
+						for(int i=0;i<planIDs.size();i++){
+							if(pid.equals(planIDs.get(i))){
+								continue a;
+							}
+						}
+					}
+					ids.append(pid+"@");
+				}
+				System.out.println("±¾´Î¿Û¿îµÄplan_id:"+ids.toString());
 				ca.setId(ids.toString().substring(0, ids.toString().length()-1));
 				Configure CurConfig = Configure.getInstance();
 				ca.setFileSavePath(CurConfig.getConfigure("InterfaceFileSavePath"));