diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index 6ead18f64..bfe2aa368 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -740,6 +740,8 @@
+
+
@@ -771,6 +773,7 @@
+
@@ -800,6 +803,8 @@
+
+
diff --git a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
index a4e40e121..72b955219 100644
--- a/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
+++ b/src_tenwa/com/tenwa/collectaudit/cache/CollectAuditInfoCache.java
@@ -651,6 +651,7 @@ public class CollectAuditInfoCache {
int i = 0,j = 0;
String[] ids = id.split("@");
String[] penaltyArray = penaltys.split("@");
+ String COMPENSATORY_CON=null;
BizObjectManager bm = JBOFactory.getFactory().getManager(VI_LC_AUDIT_RENT_PLAN.CLASS_NAME,tx);
BizObjectManager bc = JBOFactory.getFactory().getManager(LC_RENT_PLAN.CLASS_NAME,tx);
@@ -663,9 +664,23 @@ public class CollectAuditInfoCache {
BigDecimal interest =new BigDecimal(bom.getAttribute("interest").getString());
BigDecimal penalty = new BigDecimal(penaltyArray[c]);
String t_rent = corpus.add(interest).add(penalty).toString();
+
+ /**
+ * ȡһǷд¼
+ */
+ String contract_id = bom.getAttribute("contract_id").toString();
+ int plan_list=Integer.parseInt(bom.getAttribute("plan_list").toString())-1;
+ // ѯǰҪڴεһڴ¼ ϵ¼1ûĬΪ1
+ BizObject ddi = bd.createQuery("SELECT O.COMPENSATORY_CON FROM O WHERE O.MONEY_TYPE='bondRepay' AND O.CONTRACT_ID='"+contract_id+"' AND O.PLAN_LIST='"+plan_list+"'").getSingleResult(false);
+ if(ddi!=null && !"".equals(ddi)) {
+ COMPENSATORY_CON=String.valueOf(Integer.parseInt(ddi.getAttribute("COMPENSATORY_CON").getString())+1);
+ }else {
+ COMPENSATORY_CON="1";
+ }
+
//handcraftsingleCollectMoenyһԭΪhire_listָΪͻϢǻԣ
//ʵձ
- // Map map = handcraftsingleCollectMoenyDistrbutor(tx,bc,bom,rent,penaltyArray[c]);
+ // Map map = handcraftsingleCollectMoenyDistrbutor(tx,bc,bom,rent,penaltyArray[c]);
i++;
//ո״̬
bc.createQuery("update O set O.COLLECT_STATUS=:COLLECT_STATUS ,O.COLLECT_MSG=:COLLECT_MSG,O.PENALTY=:PENALTY where O.id=:id")
@@ -688,6 +703,7 @@ public class CollectAuditInfoCache {
bod.setAttributeValue("CONTRACT_ID",bom.getAttribute("contract_id").toString());
bod.setAttributeValue("PLAN_LIST",bom.getAttribute("plan_list").toString());
bod.setAttributeValue("RENT_PLAN_ID",bom.getAttribute("id").toString());
+ bod.setAttributeValue("COMPENSATORY_CON",COMPENSATORY_CON);
bd.saveObject(bod);
//ľϢĽ
bdi.createQuery("update O set O.sums='"+account_balance+"' where O.distributor_no=:distributor_id").setParameter("distributor_id", distributor_id).executeUpdate();