diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp
index 17309ef8d..5c92f1a6b 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp
@@ -22,7 +22,7 @@
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1";
- dwTemp.setPageSize(15);
+ dwTemp.setPageSize(pageSize==null?50:Integer.parseInt(pageSize));
dwTemp.MultiSelect = true;
dwTemp.genHTMLObjectWindow(userId);
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp
index adfa2b118..3897ab3e9 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp
@@ -22,7 +22,7 @@
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.ReadOnly = "1";
- dwTemp.setPageSize(15);
+ dwTemp.setPageSize(pageSize==null?50:Integer.parseInt(pageSize));
dwTemp.MultiSelect = true;
dwTemp.genHTMLObjectWindow(userId);
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
index cacb4318d..67578d710 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
@@ -1,170 +1,170 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -186,7 +186,7 @@
-
+
@@ -195,23 +195,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -223,8 +223,8 @@
-
-
+
+
@@ -233,11 +233,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -258,8 +258,8 @@
-
-
+
+
@@ -268,12 +268,12 @@
-
-
+
+
-
-
-
+
+
+
@@ -381,5 +381,19 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
index ccd3179f1..2c777409b 100644
--- a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
+++ b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
@@ -82,6 +82,10 @@ public class RentNotinyDeleteAction {
DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='ReminderLetter'").setParameter("projectId",projectId).getSingleResult(false);
}else if("AttorneyLetter".equals(objecttype)){//催收服务委托书
DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='AttorneyLetter'").setParameter("projectId",projectId).getSingleResult(false);
+ }else if("IndictmentAcceleration".equals(objecttype)){//起诉状-加速到期
+ DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='IndictmentAcceleration'").setParameter("projectId",projectId).getSingleResult(false);
+ }else if("IndictmentCancelContract".equals(objecttype)){//起诉状-解除合同
+ DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='IndictmentCancelContract'").setParameter("projectId",projectId).getSingleResult(false);
}else if("contractInsurance".equals(objecttype)){
DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='contractInsurance' and PLAN_NUMBER=:plan_number").setParameter("projectId",projectId).setParameter("plan_number",plan_number).getSingleResult(false);
}
diff --git a/src_jbo/jbo/app/tenwa/doc/REMINDER_LETTER.java b/src_jbo/jbo/app/tenwa/doc/REMINDER_LETTER.java
new file mode 100644
index 000000000..d64384377
--- /dev/null
+++ b/src_jbo/jbo/app/tenwa/doc/REMINDER_LETTER.java
@@ -0,0 +1,27 @@
+package jbo.app.tenwa.doc;
+
+/**
+* 文档附件详情 - JBO命名常量类
+* Note: This file is generated by ADE tools, dont modify it.
+
+*/
+public interface REMINDER_LETTER {
+ /**
+ * 文档附件详情
+ * 代表本类映射的BizObjectClass
+ */
+ public static final String CLASS_NAME = "jbo.app.tenwa.doc.REMINDER_LETTER";
+ /**
+ * 主键 STRING(32)
+ */
+ public static final String ID = "ID";
+ /**
+ * 附件编号 STRING(32)
+ */
+ public static final String LIBRARY_ID = "CONTRACT_ID";
+ /**
+ * 文档路径 STRING(500)
+ */
+ public static final String FILEPATH = "TYPE";
+
+}
\ No newline at end of file