diff --git a/WebContent/WEB-INF/etc/jbo/jbo_loan.xml b/WebContent/WEB-INF/etc/jbo/jbo_loan.xml
index 9da54e692..37709a161 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_loan.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_loan.xml
@@ -592,6 +592,7 @@
+
diff --git a/src_jbo/jbo/loan/VI_RENT_COLLECT.java b/src_jbo/jbo/loan/VI_RENT_COLLECT.java
index 4dc9fde9b..9e3c652e3 100644
--- a/src_jbo/jbo/loan/VI_RENT_COLLECT.java
+++ b/src_jbo/jbo/loan/VI_RENT_COLLECT.java
@@ -105,4 +105,8 @@ public interface VI_RENT_COLLECT{
* Ϣ DOUBLE(32)
*/
public static final String penalty_over = "penalty_over";
+ /**
+ * ۿ STRING(32)
+ */
+ public static final String collect_type = "collect_type";
}
\ No newline at end of file
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index 4fbc72c33..03a5f9ea0 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -942,7 +942,7 @@ public class CollectAuditInfoCache {
parms.append(",'"+str+"'");
}
}
- List bolist = bm.createQuery("select distinct O.BATCH_NO,O.BATCH_SN,O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.PENALTY from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false);
+ List bolist = bm.createQuery("select distinct O.BATCH_NO,O.BATCH_SN,O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.PENALTY from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.collect_type='YLcollect' and O.id in ("+parms.toString()+")").getResultList(false);
for (BizObject bo : bolist) {
String query_sn = bo.getAttribute("BATCH_NO").toString();
String sn = bo.getAttribute("BATCH_SN").toString();
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
index e41485e9c..a7eec50c5 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCacheTj.java
@@ -944,7 +944,7 @@ public class CollectAuditInfoCacheTj {
parms.append(",'"+str+"'");
}
}
- List bolist = bm.createQuery("select distinct O.BATCH_NO,O.BATCH_SN,O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.PENALTY from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.id in ("+parms.toString()+")").getResultList(false);
+ List bolist = bm.createQuery("select distinct O.BATCH_NO,O.BATCH_SN,O.contract_id,O.plan_date,O.id,ca.ACC_NUMBER,ca.ACCOUNT,ca.BANK_NAME,O.rent,O.PENALTY from O , jbo.app.tenwa.customer.CUSTOMER_ACCOUNT ca where O.contract_id=ca.contract_id and ca.acc_type = 'Debit' and O.collect_type='YLcollect' and O.id in ("+parms.toString()+")").getResultList(false);
for (BizObject bo : bolist) {
String query_sn = bo.getAttribute("BATCH_NO").toString();
String sn = bo.getAttribute("BATCH_SN").toString();
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/AutoRefresh.java b/src_tenwa/com/tenwa/lease/app/quartzmession/AutoRefresh.java
index 0051347ff..f4428f86a 100644
--- a/src_tenwa/com/tenwa/lease/app/quartzmession/AutoRefresh.java
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/AutoRefresh.java
@@ -30,7 +30,7 @@ public class AutoRefresh implements Job{
String curUserId = userId == null? "system" : userId.toString();
try {
tx = JBOFactory.createJBOTransaction();
- List bos = JBOFactory.getBizObjectManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME, tx).createQuery("O.COLLECT_STATUS IN ('δտ', 'տ','') and O.SUBJECTID='aa740e4111c111eaaa0000163e0e11e6' and collect_type='YLcollect' and O.BATCH_STATUS='process' and O.PLAN_DATE <= '"+plan_date+"'").getResultList(true);
+ List bos = JBOFactory.getBizObjectManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME, tx).createQuery("O.COLLECT_STATUS IN ('δտ', 'տ','') and O.SUBJECTID='aa740e4111c111eaaa0000163e0e11e6' and O.collect_type='YLcollect' and O.BATCH_STATUS='process' and O.PLAN_DATE <= '"+plan_date+"'").getResultList(true);
StringBuffer ids = new StringBuffer();
if(bos!=null && bos.size()>0){
for (BizObject bo : bos) {
@@ -45,7 +45,7 @@ public class AutoRefresh implements Job{
}
//Զ
CollectAuditInfoCacheTj caTj = new CollectAuditInfoCacheTj();
- List bosTj = JBOFactory.getBizObjectManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME, tx).createQuery("O.COLLECT_STATUS IN ('δտ', 'տ','') and O.SUBJECTID='d989246c11c111eaaa0000163e0e11e6' and collect_type='YLcollect' and O.BATCH_STATUS='process' and O.PLAN_DATE <= '"+plan_date+"'").getResultList(true);
+ List bosTj = JBOFactory.getBizObjectManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME, tx).createQuery("O.COLLECT_STATUS IN ('δտ', 'տ','') and O.SUBJECTID='d989246c11c111eaaa0000163e0e11e6' and O.collect_type='YLcollect' and O.BATCH_STATUS='process' and O.PLAN_DATE <= '"+plan_date+"'").getResultList(true);
StringBuffer idsTj = new StringBuffer();
if(bosTj!=null && bosTj.size()>0){
for (BizObject bo : bosTj) {