From c2dab9703a26c3addc44c735ca0d96b7c5d1fd75 Mon Sep 17 00:00:00 2001
From: maliang <maliang@ap-leasing.com.cn>
Date: Tue, 14 Dec 2021 18:42:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E5=82=AC=E5=91=8A?=
 =?UTF-8?q?=E5=87=BD\=E5=82=AC=E6=94=B6=E6=9C=8D=E5=8A=A1=E5=A7=94?=
 =?UTF-8?q?=E6=89=98=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Flow/Comm/LBContract/AttorneyLetter.jsp   | 149 ++++++++++++++++
 .../Flow/Comm/LBContract/ReminderLetter.jsp   | 160 +++++++++++++++++
 WebContent/WEB-INF/etc/jbo/jbo_lease.xml      |  49 ++++-
 .../controller/FindNotifyAction.java          |  94 ++++++++++
 .../controller/RentNotinyDeleteAction.java    |   4 +
 .../lease/carbrand/REPORT_RENT_PLAN.java      | 168 ++++++++++++++++++
 .../v20211231/maliang20211214_已上线.sql      |  30 ++++
 7 files changed, 653 insertions(+), 1 deletion(-)
 create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp
 create mode 100644 WebContent/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp
 create mode 100644 src_jbo/jbo/com/tenwa/lease/carbrand/REPORT_RENT_PLAN.java
 create mode 100644 src_sql/投产SQL/v20211231/maliang20211214_已上线.sql

diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp
new file mode 100644
index 000000000..17309ef8d
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp
@@ -0,0 +1,149 @@
+<%@page import="jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%@ page import="com.amarsoft.app.util.*"  %>
+<%
+    /*
+        Author: undefined 2016-09-01
+        Content:  ���շ���ί����  AttorneyLetter.jsp
+        History Log:
+    */
+
+    String userId = CurUser.getUserID();
+    String orgId =CurUser.getOrgID();
+    System.out.print(orgId);
+    String falg = "true";
+    String compClientID = request.getParameter("CompClientID");
+    ASObjectModel doTemp = new ASObjectModel("AttorneyLetter");
+
+
+    ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+    dwTemp.Style="1";      	     //--����ΪGrid���--
+    dwTemp.ReadOnly = "1";
+    dwTemp.setPageSize(15);
+    dwTemp.MultiSelect = true;
+    dwTemp.genHTMLObjectWindow(userId);
+
+    //0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+    String sButtons[][] =null;
+    sButtons=new String[][]{
+            {"true","All","Button","���ɴ��շ���ί����","���ɴ��շ���ί����","generateQuotation()","","","","btn_icon_generate"},
+            {"true","All","Button","��������","��������","lotdown()","","","","btn_icon_down"},
+            {"false","All","Button","��˾����","��˾����","stamp()","","","",""},
+    };
+
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+
+    //�ڼ������������
+    function afterSearch(){
+        for(var i=0;i<getRowCount(0);i++){
+            var html="";
+            html+='<a onclick=downloadFile(\''+getItemValue(0,i,"attrid")+'\')><font color="blue">'+"����&nbsp&nbsp&nbsp&nbsp&nbsp"+'</font></a>';
+            getObj(0,i,"FILENAME").innerHTML=html+'<font >'+getObj(0,i,"FILENAME").innerHTML+'</font>';
+        };
+
+    }
+    function downloadFile(id){
+        if(typeof(id)==undefined || id=='') {
+            alert("�������ɴ��շ���ί���������أ�");
+            return;
+        }
+        if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+        window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+    }
+    function generateQuotation(){
+        var projectId=getItemValueArray(0,"PROJECT_ID");
+        //var contractNos=getItemValueArray(0,"CONTRACT_NUMBER");
+       // var subjectIds=getItemValueArray(0,"SUBJECTID");
+        var number = 0;
+        if(typeof(projectId)=="undefined"||projectId==null||projectId==""){alert("��ѡ������");return;}
+        for(var i=0;i<projectId.length;i++){
+            var param={};
+            var tempParam={};
+            var sparam="";
+
+            param["templateNo"]="69f0423f984a46128292fbd8768f557f";
+            //�����ļ�������ϵ
+            tempParam["OBJECTTYPE"]="AttorneyLetter";
+            tempParam["PROJECTID"]=projectId[i];
+            tempParam["PROJ_ID"]=projectId[i];
+
+            //����ģ��̶�����
+            tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
+            tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
+            tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
+
+            param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//����ģ��IJ�����
+            for(var key in param){
+                if(sparam.length>0){sparam+=",";}
+                sparam+=key+"="+param[key];
+            }
+            var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentNotinyDeleteAction","deletequtation","projectId="+projectId[i]+",objecttype=AttorneyLetter");
+            var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+            number++;
+        }
+        if(projectId.length==0){
+            alert("����ѡ�����ݣ�����");
+            return;
+        }else if(number==0){
+            alert("����ʧ�ܣ�����");
+        }else if(number==projectId.length){
+            alert("���ɳɹ�������");
+        }else{
+            alert("�������ɳɹ�������");
+        }
+        reloadSelf();
+    }
+    function lotdown(){
+        var attrids=getItemValueArray(0,"attrid");
+        if(typeof(attrids)=="undefined"||attrids==null||attrids==""){alert("��ѡ��");return;}
+        for( var i=0;i<attrids.length;i++){
+            if(typeof(attrids[i])=="undefined"||attrids[i]==null||attrids[i]==""){
+                alert("�������ɴ��շ���ί���������أ�");
+                return;
+            }
+        }
+        lotdownloadFile(attrids);
+
+    }
+    function lotdownloadFile(id){
+        if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+        window.open(sWebRootPath+"/servlet/view/DownloadZipServlet?CompClientID=<%=sCompClientID%>&id="+id, "downloadTemplate");
+    }
+
+
+    function stamp(){
+        var flie = getItemValue(0,getRow(0),"FILENAME");
+        if(typeof(flie)=="undefined"||flie==null||flie==""){
+            alert("�������ɴ��շ���ί���飡");
+            return;
+        }
+        var number = 0;
+        var projectIds=getItemValueArray(0,"ID");
+
+        for(var i=0;i<projectIds.length;i++){
+            var projectId=projectIds[i];
+            var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","ProjectId="+projectId+",flagType=AttorneyLetter");
+            if("success"==result){
+                number++;
+            }
+        }
+
+        if(projectIds.length==0){
+            alert("����ѡ�����ݣ�����");
+            return;
+        }else if(number==0){
+            alert("����ʧ�ܣ�����");
+        }else if(number==projectIds.length){
+            alert("���³ɹ�������");
+        }else{
+            alert("���ָ��³ɹ�������");
+        }
+        location.reload();
+
+    }
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp
new file mode 100644
index 000000000..adfa2b118
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp
@@ -0,0 +1,160 @@
+<%@page import="jbo.app.tenwa.calc.LC_CALC_CONDITION_TEMP"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+<%@ page import="com.tenwa.doc.action.DocListInitAction" %>
+<%@ page import="com.amarsoft.app.lc.workflow.action.GetFlowAction" %>
+<%@ page import="com.amarsoft.app.util.*"  %>
+<%
+    /*
+        Author: undefined 2016-09-01
+        Content:  �߸溯  ReminderLetter.jsp
+        History Log:
+    */
+
+    String userId = CurUser.getUserID();
+    String orgId =CurUser.getOrgID();
+    System.out.print(orgId);
+    String falg = "true";
+    String compClientID = request.getParameter("CompClientID");
+    ASObjectModel doTemp = new ASObjectModel("ReminderLetter");
+
+
+    ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+    dwTemp.Style="1";      	     //--����ΪGrid���--
+    dwTemp.ReadOnly = "1";
+    dwTemp.setPageSize(15);
+    dwTemp.MultiSelect = true;
+    dwTemp.genHTMLObjectWindow(userId);
+
+    //0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+    String sButtons[][] =null;
+    sButtons=new String[][]{
+            {"true","All","Button","���ɴ߸溯","���ɴ߸溯","generateQuotation()","","","","btn_icon_generate"},
+            {"true","All","Button","��������","��������","lotdown()","","","","btn_icon_down"},
+            {"false","All","Button","��˾����","��˾����","stamp()","","","",""},
+    };
+
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<script type="text/javascript">
+
+    //�ڼ������������
+    function afterSearch(){
+        for(var i=0;i<getRowCount(0);i++){
+            var html="";
+            html+='<a onclick=downloadFile(\''+getItemValue(0,i,"attrid")+'\')><font color="blue">'+"����&nbsp&nbsp&nbsp&nbsp&nbsp"+'</font></a>';
+            getObj(0,i,"FILENAME").innerHTML=html+'<font >'+getObj(0,i,"FILENAME").innerHTML+'</font>';
+        };
+
+    }
+    function downloadFile(id){
+        if(typeof(id)==undefined || id=='') {
+            alert("�������ɴ߸溯�����أ�");
+            return;
+        }
+        if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+        window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
+    }
+    function generateQuotation(){
+        var projectId=getItemValueArray(0,"PROJECT_ID");
+        //var contractNos=getItemValueArray(0,"CONTRACT_NUMBER");
+        //var subjectIds=getItemValueArray(0,"SUBJECTID");
+        var number = 0;
+        if(typeof(projectId)=="undefined"||projectId==null||projectId==""){alert("��ѡ������");return;}
+        for(var i=0;i<projectId.length;i++){
+            var param={};
+            var tempParam={};
+            var sparam="";
+            //���ݺ�ͬ��� ��ȡ������Ϣ
+            //var subjectId = RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","selectSubjectId","contractNo="+contractNos[i]);
+
+            //ģ���
+            // if("aa740e4111c111eaaa0000163e0e11e6" == subjectIds[i]){//���ڴ߸溯ģ��
+            //     param["templateNo"]="69f0423f984a46128292fbd8768fcd2f";
+            // }else if("d989246c11c111eaaa0000163e0e11e6" == subjectIds[i]){//���߸溯ģ��
+            //     param["templateNo"]="5edc6ce108494e5982c1aa0cc5c117a0";
+            // }else{
+            //     alert("δ�ҵ���Ӧ������Ϣ������");
+            //     break;
+            // }
+            param["templateNo"]="69f0423f984a46128292fbd8768f556f";
+            //�����ļ�������ϵ
+            tempParam["OBJECTTYPE"]="ReminderLetter";
+            tempParam["PROJECTID"]=projectId[i];
+            tempParam["PROJ_ID"]=projectId[i];
+
+            //����ģ��̶�����
+            tempParam["CurUserId"]="<%=CurUser.getUserID()%>";
+            tempParam["CurOrgId"]="<%=CurUser.getOrgID()%>";
+            tempParam["fileSavePath"]="<%=CurConfig.getConfigure("FileSavePath")%>";
+
+            param["templateParam"]=JSON.stringify(tempParam).replace(/,/g,"@");//����ģ��IJ�����
+            for(var key in param){
+                if(sparam.length>0){sparam+=",";}
+                sparam+=key+"="+param[key];
+            }
+            var deleteresult=RunJavaMethodTrans("com.tenwa.officetempalte.controller.RentNotinyDeleteAction","deletequtation","projectId="+projectId[i]+",objecttype=ReminderLetter");
+            var result=RunJavaMethodTrans("com.tenwa.officetempalte.action.CreateOfficeAction","createOfficeByTemplate",sparam);
+            number++;
+        }
+        if(projectId.length==0){
+            alert("����ѡ�����ݣ�����");
+            return;
+        }else if(number==0){
+            alert("����ʧ�ܣ�����");
+        }else if(number==projectId.length){
+            alert("���ɳɹ�������");
+        }else{
+            alert("�������ɳɹ�������");
+        }
+        reloadSelf();
+    }
+    function lotdown(){
+        var attrids=getItemValueArray(0,"attrid");
+        if(typeof(attrids)=="undefined"||attrids==null||attrids==""){alert("��ѡ��");return;}
+        for( var i=0;i<attrids.length;i++){
+            if(typeof(attrids[i])=="undefined"||attrids[i]==null||attrids[i]==""){
+                alert("�������ɴ߸溯�����أ�");
+                return;
+            }
+        }
+        lotdownloadFile(attrids);
+
+    }
+    function lotdownloadFile(id){
+        if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
+        window.open(sWebRootPath+"/servlet/view/DownloadZipServlet?CompClientID=<%=sCompClientID%>&id="+id, "downloadTemplate");
+    }
+
+
+    function stamp(){
+        var flie = getItemValue(0,getRow(0),"FILENAME");
+        if(typeof(flie)=="undefined"||flie==null||flie==""){
+            alert("�������ɴ߸溯��");
+            return;
+        }
+        var number = 0;
+        var projectIds=getItemValueArray(0,"ID");
+
+        for(var i=0;i<projectIds.length;i++){
+            var projectId=projectIds[i];
+            var result=RunJavaMethodTrans("com.tenwa.channelportal.action.ContractSignAction","TcollectionSignA","ProjectId="+projectId+",flagType=ReminderLetter");
+            if("success"==result){
+                number++;
+            }
+        }
+
+        if(projectIds.length==0){
+            alert("����ѡ�����ݣ�����");
+            return;
+        }else if(number==0){
+            alert("����ʧ�ܣ�����");
+        }else if(number==projectIds.length){
+            alert("���³ɹ�������");
+        }else{
+            alert("���ָ��³ɹ�������");
+        }
+        location.reload();
+
+    }
+</script>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
index 9dcd8c0ef..9a1fbbc18 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml
@@ -5940,6 +5940,53 @@
 			</manager>
 		</class>
 
-
+		<class name="REPORT_RENT_PLAN" label="租金计划-汽车" keyAttributes="">
+			<attributes>
+				<attribute name="rent_plan_id" label="标识" type="STRING" length="32"/>
+				<attribute name="subjectname" label="主体名称" type="STRING" length="100"/>
+				<attribute name="start_date" label="收支日期" type="STRING" length="32"/>
+				<attribute name="contract_number" label="业务合同号" type="STRING" length="50"/>
+				<attribute name="payment_number" label="投放编号" type="STRING" length="32"/>
+				<attribute name="customer_name" label="承租人名称" type="STRING" length="200"/>
+				<attribute name="mobile" label="手机号" type="STRING" length="32"/>
+				<attribute name="project_manage" label="项目经理" type="STRING" length="32"/>
+				<attribute name="project_manage_name" label="用户姓名" type="STRING" length="32"/>
+				<attribute name="plan_list" label="期次" type="INT" length="10"/>
+				<attribute name="plan_date" label="计划日期" type="STRING" length="32"/>
+				<attribute name="rent" label="租金" type="DOUBLE" length="18" scale="2"/>
+				<attribute name="corpus" label="财务本金" type="DOUBLE" length="18" scale="2"/>
+				<attribute name="interest" label="财务租息" type="DOUBLE" length="18" scale="2"/>
+				<attribute name="ALL_REMAIN_CORPUS" label="本期后本金余额" type="DOUBLE" length="18" scale="2"/>
+				<attribute name="collect_status" label="收款状态" type="STRING" length="32"/>
+				<attribute name="collect_msg" label="收款描述" type="STRING" length="200"/>
+				<attribute name="batch_no" label="批量交易流水号,若拆分，以,分割" type="STRING" length="200"/>
+				<attribute name="year_rate" label="年利率" type="DOUBLE" length="18" scale="6"/>
+				<attribute name="batch_status" label="batch_status" type="STRING" length="3"/>
+				<attribute name="batch_sn" label="batch_sn" type="STRING" length="200"/>
+				<attribute name="fact_rent" label="fact_rent" type="DOUBLE" length="45" scale="2"/>
+				<attribute name="fact_corpus" label="fact_corpus" type="DOUBLE" length="45" scale="2"/>
+				<attribute name="fact_interest" label="fact_interest" type="DOUBLE" length="45" scale="2"/>
+				<attribute name="rent_over" label="rent_over" type="DOUBLE" length="46" scale="2"/>
+				<attribute name="corpus_over" label="corpus_over" type="DOUBLE" length="48" scale="2"/>
+				<attribute name="interest_adjust" label="interest_adjust" type="DOUBLE" length="45" scale="2"/>
+				<attribute name="interest_over" label="interest_over" type="DOUBLE" length="48" scale="2"/>
+				<attribute name="fact_penalty" label="fact_penalty" type="DOUBLE" length="45" scale="2"/>
+				<attribute name="penalty_adjust" label="penalty_adjust" type="DOUBLE" length="45" scale="2"/>
+				<attribute name="penalty" label="penalty" type="DOUBLE" length="56" scale="2"/>
+				<attribute name="distributor_name" label="经销商名称" type="STRING" length="200"/>
+				<attribute name="over_days" label="over_days" type="INT" length="10"/>
+				<attribute name="own_bank" label="本方银行" type="STRING" length="100"/>
+				<attribute name="HIRE_DATE" label="核销日期" type="STRING" length="32"/>
+				<attribute name="RemainInterest" label="RemainInterest" type="DOUBLE" length="18" scale="2"/>
+				<attribute name="num" label="num" type="LONG" length="19"/>
+				<attribute name="ACHIEVED_DATE" label="ACHIEVED_DATE" type="STRING" length="96"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="report_rent_plan" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>
diff --git a/src_core/com/tenwa/officetempalte/controller/FindNotifyAction.java b/src_core/com/tenwa/officetempalte/controller/FindNotifyAction.java
index f1532c93c..022c13727 100644
--- a/src_core/com/tenwa/officetempalte/controller/FindNotifyAction.java
+++ b/src_core/com/tenwa/officetempalte/controller/FindNotifyAction.java
@@ -1,10 +1,12 @@
 package com.tenwa.officetempalte.controller;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.tenwa.channelportal.action.generativecontract.WordToPDFUtil;
 import jbo.com.tenwa.entity.comm.officetempalte.BF_TEMPLATE;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_TEMPLATE;
 
@@ -210,4 +212,96 @@ public class FindNotifyAction {
 		return attributeid;
 	}
 
+
+	//�߸溯 ���շ���ί����
+	public static String findFileNameByType(String projectId,String objectType) throws JBOException{
+		BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+		BizObject DOCRELATIVE=bom.createQuery("PROJ_ID=:porjectId and OBJECTTYPE='"+objectType+"'").setParameter("porjectId",projectId).getSingleResult(false);
+		String filename="";
+		if(DOCRELATIVE!=null){
+			String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
+			BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+			filename=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("filename").toString();
+		}
+		return filename;
+	}
+
+	public static String findCreatimeByType(String projectId,String objectType) throws JBOException{
+		String creatime="";
+
+		BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+		BizObject DOCRELATIVE=bom.createQuery("PROJ_ID=:porjectId and OBJECTTYPE='"+objectType+"'").setParameter("porjectId",projectId).getSingleResult(false);
+
+		if(DOCRELATIVE!=null){
+			String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
+			BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+			creatime=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("inputtime").toString();
+		}
+		return creatime;
+	}
+	public static String findAttributeidByType(String projectId,String objectType) throws JBOException{
+		String attributeid="";
+
+		BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+		BizObject DOCRELATIVE=bom.createQuery("PROJ_ID=:porjectId and OBJECTTYPE='"+objectType+"'").setParameter("porjectId",projectId).getSingleResult(false);
+
+		if(DOCRELATIVE!=null){
+			String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
+			BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+			String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString();
+			BizObjectManager bom2=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+			attributeid=bom2.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(false).getAttribute("id").toString();
+		}
+		return attributeid;
+	}
+
+
+	/**
+	 * ���֪ͨ�鸽����LibreOfficeʵ��wordת��pdf
+	 * wordת��pdf
+	 * @throws JBOException
+	 */
+	public String wordToPdfAnnex(String projectId,String objectType) throws JBOException {
+
+		BizObjectManager bom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
+		BizObject DOCRELATIVE = null;
+		if("ReminderLetter".equals(objectType)){//�߸溯
+			DOCRELATIVE=bom.createQuery(" OBJECTTYPE='ReminderLetter' and PROJ_ID=:projectId ").setParameter("projectId",projectId).getSingleResult(false);
+		}else if("AttorneyLetter".equals(objectType)){//���շ���ί����
+			DOCRELATIVE=bom.createQuery(" OBJECTTYPE='AttorneyLetter' and PROJ_ID=:projectId ").setParameter("projectId",projectId).getSingleResult(false);
+		}
+
+		BizObjectManager attrBom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
+		BizObject attrBo=null;
+		WordToPDFUtil wordTopdf = new WordToPDFUtil();
+		File file = null;
+		Boolean result = null;
+		String sql = "";
+		try {
+			if (DOCRELATIVE != null) {
+
+				String DOCRELATIVEid=DOCRELATIVE.getAttribute("id").toString();
+				BizObjectManager bom1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
+				String DOCLIBRARYid=bom1.createQuery("relative_id=:relative_id").setParameter("relative_id", DOCRELATIVEid).getSingleResult(false).getAttribute("id").toString();
+				attrBo = attrBom.createQuery("library_id=:library_id").setParameter("library_id", DOCLIBRARYid).getSingleResult(true);
+
+				String path =  attrBo.getAttribute("FULLPATH").toString();
+					file =new File(path);
+					attrBo.setAttributeValue("FULLPATH",attrBo.getAttribute("FULLPATH").toString());
+					attrBo.setAttributeValue("FILENAME",attrBo.getAttribute("FILENAME").toString());
+					attrBo.setAttributeValue("FILEPATH",attrBo.getAttribute("FILEPATH").toString());
+					attrBo.setAttributeValue("FileSize",file.length());
+					attrBo.setAttributeValue("CONTENT_TYPE","application/pdf");
+					attrBom.saveObject(attrBo);
+			}
+
+		} catch (JBOException e) {
+			e.printStackTrace();
+		}
+		return attrBo.getAttribute("ID").toString();
+	}
 }
\ No newline at end of file
diff --git a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
index 629eef786..ccd3179f1 100644
--- a/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
+++ b/src_core/com/tenwa/officetempalte/controller/RentNotinyDeleteAction.java
@@ -78,6 +78,10 @@ public class RentNotinyDeleteAction {
 	    	DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='LoanNotice'").setParameter("projectId",projectId).getSingleResult(false);
 	    }else if("ElectronicSigningConfirmation".equals(objecttype)){//����ǩԼȷ����
 			DOCRELATIVE=bom.createQuery(" PROJ_ID=:projectId and OBJECTTYPE='ElectronicSigningConfirmation'").setParameter("projectId",projectId).getSingleResult(false);
+		}else if("ReminderLetter".equals(objecttype)){//�߸溯
+			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("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/com/tenwa/lease/carbrand/REPORT_RENT_PLAN.java b/src_jbo/jbo/com/tenwa/lease/carbrand/REPORT_RENT_PLAN.java
new file mode 100644
index 000000000..d2adf32e9
--- /dev/null
+++ b/src_jbo/jbo/com/tenwa/lease/carbrand/REPORT_RENT_PLAN.java
@@ -0,0 +1,168 @@
+package jbo.com.tenwa.lease.carbrand;
+
+import java.lang.String;
+
+/**
+*  - JBO����������<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface REPORT_RENT_PLAN{
+	/**
+	* <br><br>
+	* ��������ӳ���BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.com.tenwa.lease.carbrand.REPORT_RENT_PLAN";
+	/**
+	* ��ʶ STRING(32)<br>
+	*/
+	public static final String rent_plan_id = "rent_plan_id";
+	/**
+	* �������� STRING(100)<br>
+	*/
+	public static final String subjectname = "subjectname";
+	/**
+	* ��֧���� STRING(32)<br>
+	*/
+	public static final String start_date = "start_date";
+	/**
+	* ҵ���ͬ�� STRING(50)<br>
+	*/
+	public static final String contract_number = "contract_number";
+	/**
+	* Ͷ�ű�� STRING(32)<br>
+	*/
+	public static final String payment_number = "payment_number";
+	/**
+	* ���������� STRING(200)<br>
+	*/
+	public static final String customer_name = "customer_name";
+	/**
+	* �ֻ��� STRING(32)<br>
+	*/
+	public static final String mobile = "mobile";
+	/**
+	* ��Ŀ���� STRING(32)<br>
+	*/
+	public static final String project_manage = "project_manage";
+	/**
+	* �û����� STRING(32)<br>
+	*/
+	public static final String project_manage_name = "project_manage_name";
+	/**
+	* �ڴ� INT(10)<br>
+	*/
+	public static final String plan_list = "plan_list";
+	/**
+	* �ƻ����� STRING(32)<br>
+	*/
+	public static final String plan_date = "plan_date";
+	/**
+	* ��� DOUBLE(18)<br>
+	*/
+	public static final String rent = "rent";
+	/**
+	* ���񱾽� DOUBLE(18)<br>
+	*/
+	public static final String corpus = "corpus";
+	/**
+	* ������Ϣ DOUBLE(18)<br>
+	*/
+	public static final String interest = "interest";
+	/**
+	* ���ں󱾽���� DOUBLE(18)<br>
+	*/
+	public static final String ALL_REMAIN_CORPUS = "ALL_REMAIN_CORPUS";
+	/**
+	* �տ�״̬ STRING(32)<br>
+	*/
+	public static final String collect_status = "collect_status";
+	/**
+	* �տ����� STRING(200)<br>
+	*/
+	public static final String collect_msg = "collect_msg";
+	/**
+	* ����������ˮ��,����֣���,�ָ� STRING(200)<br>
+	*/
+	public static final String batch_no = "batch_no";
+	/**
+	* ������ DOUBLE(18)<br>
+	*/
+	public static final String year_rate = "year_rate";
+	/**
+	* batch_status STRING(3)<br>
+	*/
+	public static final String batch_status = "batch_status";
+	/**
+	* batch_sn STRING(200)<br>
+	*/
+	public static final String batch_sn = "batch_sn";
+	/**
+	* fact_rent DOUBLE(45)<br>
+	*/
+	public static final String fact_rent = "fact_rent";
+	/**
+	* fact_corpus DOUBLE(45)<br>
+	*/
+	public static final String fact_corpus = "fact_corpus";
+	/**
+	* fact_interest DOUBLE(45)<br>
+	*/
+	public static final String fact_interest = "fact_interest";
+	/**
+	* rent_over DOUBLE(46)<br>
+	*/
+	public static final String rent_over = "rent_over";
+	/**
+	* corpus_over DOUBLE(48)<br>
+	*/
+	public static final String corpus_over = "corpus_over";
+	/**
+	* interest_adjust DOUBLE(45)<br>
+	*/
+	public static final String interest_adjust = "interest_adjust";
+	/**
+	* interest_over DOUBLE(48)<br>
+	*/
+	public static final String interest_over = "interest_over";
+	/**
+	* fact_penalty DOUBLE(45)<br>
+	*/
+	public static final String fact_penalty = "fact_penalty";
+	/**
+	* penalty_adjust DOUBLE(45)<br>
+	*/
+	public static final String penalty_adjust = "penalty_adjust";
+	/**
+	* penalty DOUBLE(56)<br>
+	*/
+	public static final String penalty = "penalty";
+	/**
+	* ���������� STRING(200)<br>
+	*/
+	public static final String distributor_name = "distributor_name";
+	/**
+	* over_days INT(10)<br>
+	*/
+	public static final String over_days = "over_days";
+	/**
+	* �������� STRING(100)<br>
+	*/
+	public static final String own_bank = "own_bank";
+	/**
+	* �������� STRING(32)<br>
+	*/
+	public static final String HIRE_DATE = "HIRE_DATE";
+	/**
+	* RemainInterest DOUBLE(18)<br>
+	*/
+	public static final String RemainInterest = "RemainInterest";
+	/**
+	* num LONG(19)<br>
+	*/
+	public static final String num = "num";
+	/**
+	* ACHIEVED_DATE STRING(96)<br>
+	*/
+	public static final String ACHIEVED_DATE = "ACHIEVED_DATE";
+}
\ No newline at end of file
diff --git a/src_sql/投产SQL/v20211231/maliang20211214_已上线.sql b/src_sql/投产SQL/v20211231/maliang20211214_已上线.sql
new file mode 100644
index 000000000..85d742e98
--- /dev/null
+++ b/src_sql/投产SQL/v20211231/maliang20211214_已上线.sql
@@ -0,0 +1,30 @@
+INSERT INTO `apzl`.`awe_do_catalog`(`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) VALUES ('AttorneyLetter', '�ϳ�ί����', NULL, '30', NULL, '1', '1', 'default', 'jbo.com.tenwa.lease.carbrand.REPORT_RENT_PLAN', 'O LEFT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci ON O.contract_number = lci.contract_number', 'O.batch_status=\'δ���\' and O.over_days>2 ', 'O.subjectname,O.contract_number,O.customer_name,mobile,lci.project_id', '', NULL, NULL, 'SYS_Designer', '2018/12/12 10:42:17', 'SYS_Designer', '2018/12/21 15:24:35', NULL, '1', NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('AttorneyLetter', '1010', '1010', '1', 'O', 'subjectname', 'subjectname', 'String', NULL, '��������', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('AttorneyLetter', '1020', '1020', '1', 'O', 'contract_number', 'contract_number', 'String', NULL, '��ͬ��', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('AttorneyLetter', '1030', '1030', '1', 'O', 'customer_name', 'customer_name', 'String', NULL, '����������', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('AttorneyLetter', '1040', '1040', '1', 'O', 'mobile', 'mobile', 'String', NULL, '�绰����', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('AttorneyLetter', '1050', '1050', '1', 'lci', 'PROJECT_ID', 'PROJECT_ID', 'String', NULL, '��Ŀ���', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:04:55', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('AttorneyLetter', '1090', '1090', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findFileNameByType(PROJECT_ID,\'AttorneyLetter\')', 'FILENAME', 'String', NULL, '�ļ�����', NULL, '1', 'Text', '1', '1', NULL, NULL, 'style={width:200px;}', NULL, '1', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:38:18', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('AttorneyLetter', '1100', '1100', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findCreatimeByType(PROJECT_ID,\'AttorneyLetter\')', 'creatime', 'String', NULL, '��������', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, NULL, '1', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:38:18', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('AttorneyLetter', '1110', '1110', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findAttributeidByType(PROJECT_ID,\'AttorneyLetter\')', 'attrid', 'String', NULL, 'attrid', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, NULL, '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/13 10:05:23', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_catalog`(`dono`, `doname`, `dodescribe`, `dotype`, `doclass`, `isinuse`, `colcount`, `modeid`, `jboclass`, `jbofrom`, `jbowhere`, `jbogroup`, `jboorder`, `businessprocess`, `exportflag`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `remark`, `isvalidate`, `parent`) VALUES ('ReminderLetter', '�߸溯', NULL, '30', NULL, '1', '1', 'default', 'jbo.com.tenwa.lease.carbrand.REPORT_RENT_PLAN', 'O LEFT JOIN jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO lci ON O.contract_number = lci.contract_number', 'O.batch_status=\'δ���\' and O.over_days>2 ', 'O.subjectname,O.contract_number,O.customer_name,mobile,lci.project_id', '', NULL, NULL, 'SYS_Designer', '2018/12/12 10:42:17', 'SYS_Designer', '2018/12/21 15:24:35', NULL, '1', NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ReminderLetter', '1010', '1010', '1', 'O', 'subjectname', 'subjectname', 'String', NULL, '��������', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ReminderLetter', '1020', '1020', '1', 'O', 'contract_number', 'contract_number', 'String', NULL, '��ͬ��', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ReminderLetter', '1030', '1030', '1', 'O', 'customer_name', 'customer_name', 'String', NULL, '����������', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ReminderLetter', '1040', '1040', '1', 'O', 'mobile', 'mobile', 'String', NULL, '�绰����', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '200', '1', '0', '0', '1', '1', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:00:03', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ReminderLetter', '1050', '1050', '1', 'lci', 'PROJECT_ID', 'PROJECT_ID', 'String', NULL, '��Ŀ���', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:04:55', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ReminderLetter', '1090', '1090', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findFileNameByType(PROJECT_ID,\'ReminderLetter\')', 'FILENAME', 'String', NULL, '�ļ�����', NULL, '1', 'Text', '1', '1', NULL, NULL, 'style={width:200px;}', NULL, '1', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:38:18', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ReminderLetter', '1100', '1100', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findCreatimeByType(PROJECT_ID,\'ReminderLetter\')', 'creatime', 'String', NULL, '��������', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, NULL, '1', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/12 11:38:18', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`awe_do_library`(`dono`, `colindex`, `sortno`, `isinuse`, `coltablename`, `colactualname`, `colname`, `coltype`, `coldefaultvalue`, `colheader`, `colunit`, `colcolumntype`, `coleditstyle`, `colcheckformat`, `colalign`, `coleditsourcetype`, `coleditsource`, `colhtmlstyle`, `collimit`, `colvisible`, `colreadonly`, `colrequired`, `colsortable`, `isfilter`, `colspan`, `isautocomplete`, `groupid`, `colfilterrefid`, `inputuser`, `inputtime`, `updateuser`, `updatetime`, `isaudit`, `colfilterattrs`, `isupdate`, `parentcolindex`, `tips`, `colinnerbtevent`, `colfilteroptions`) VALUES ('ReminderLetter', '1110', '1110', '1', NULL, 'com.tenwa.officetempalte.controller.FindNotifyAction.findAttributeidByType(PROJECT_ID,\'ReminderLetter\')', 'attrid', 'String', NULL, 'attrid', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, NULL, '0', '0', '0', '1', '0', 0, NULL, NULL, NULL, 'SYS_Designer', '2018/12/13 10:05:23', 'administrator', '2021/09/02 13:05:47', NULL, NULL, '1', NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_template`(`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('69f0423f984a46128292fbd8768f556f', NULL, '', '�߸溯', '�߸溯{contractNo}.docx', '�߸溯.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2021/05/17 15:09:11', 'administrator', '8009001', '2021/12/09 10:03:08', '', '');
+INSERT INTO `apzl`.`bf_template`(`ID`, `SERIALNO`, `SORTNUMBER`, `TEMPLATENAME`, `TEMPLATESHOWNAME`, `TEMPLATEPATH`, `TEMPLATETYPE`, `OPERATETYPE`, `CALLBACK`, `CREATEMETHOD`, `DOCTYPE`, `ONECLASSIFY`, `TWOCLASSIFY`, `THREECLASSIFY`, `FOURCLASSIFY`, `TEMPLATEVERSION`, `STATUS`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `CREATECONDITION`, `CREATESHEETCONDITION`) VALUES ('69f0423f984a46128292fbd8768f557f', NULL, '', '���շ���ί����', '���շ���ί����{contractNo}.docx', '���շ���ί����.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2021/05/17 15:09:11', 'administrator', '8009001', '2021/12/09 16:48:04', '', '');
+INSERT INTO `apzl`.`awe_menu_info`(`menuid`, `menuname`, `displayname`, `sortno`, `url`, `urlparam`, `target`, `style`, `isinuse`, `remark`, `inputorgid`, `inputuserid`, `inputtime`, `updateorgid`, `updateuserid`, `updatetime`, `accesstype`, `icon`, `appicon`) VALUES ('2500700060', '�߸溯', '�߸溯', '3500500060', '/Tenwa/Lease/Flow/Comm/LBContract/ReminderLetter.jsp', 'isCache=false', NULL, NULL, '1', '', '', '', '', '', '', '', '10', '', '');
+INSERT INTO `apzl`.`awe_menu_info`(`menuid`, `menuname`, `displayname`, `sortno`, `url`, `urlparam`, `target`, `style`, `isinuse`, `remark`, `inputorgid`, `inputuserid`, `inputtime`, `updateorgid`, `updateuserid`, `updatetime`, `accesstype`, `icon`, `appicon`) VALUES ('2500700070', '���շ���ί����', '���շ���ί����', '3500500070', '/Tenwa/Lease/Flow/Comm/LBContract/AttorneyLetter.jsp', 'isCache=false', NULL, NULL, '1', '', '', '', '', '', '', '', '10', '', '');
+INSERT INTO `apzl`.`bf_lableconfig`(`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('975294b526544d83b806e3fc2f2', '1000280', 'AttorneyLetter', '���շ���ί����', 'tag_type2', 'value_type3', 'subjectname,customername,certid,contract_number,td30,td1', 'SELECT\r\n	lci.subjectname,\r\n	ci.customername,\r\n	ci.certid,\r\n	lci.contract_number,\r\n	date_format( date_add( now(), INTERVAL 30 DAY ), \'%Y��%m��%d��\' ) td30,\r\n	date_format( now(), \'%Y��%m��%d��\' ) td1\r\nFROM\r\n	LB_CONTRACT_INFO lci\r\n	LEFT JOIN lb_union_lessee lul ON lci.id = lul.contract_id\r\n	LEFT JOIN customer_info ci ON ci.customerid = lul.customer_id \r\nWHERE\r\n	lci.project_id =:{PROJECTID}', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig`(`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('975294b526544d83b806e3fc2f2', '1000280', 'AttorneyLetter', '���շ���ί����', 'tag_type2', 'value_type3', 'subjectname,customername,certid,contract_number,td30,td1', 'SELECT\r\n	lci.subjectname,\r\n	ci.customername,\r\n	ci.certid,\r\n	lci.contract_number,\r\n	date_format( date_add( now(), INTERVAL 30 DAY ), \'%Y��%m��%d��\' ) td30,\r\n	date_format( now(), \'%Y��%m��%d��\' ) td1\r\nFROM\r\n	LB_CONTRACT_INFO lci\r\n	LEFT JOIN lb_union_lessee lul ON lci.id = lul.contract_id\r\n	LEFT JOIN customer_info ci ON ci.customerid = lul.customer_id \r\nWHERE\r\n	lci.project_id =:{PROJECTID}', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig`(`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('975294b526544d83b806e3f2', '1000281', 'AttorneyCarOne', '���շ���ί���鳵����Ϣ1', 'tag_type2', 'value_type3', 'CONTRACT_NO,PLATE_NUMBER,FRAME_NUMBER', 'SELECT\r\n	lcit.CONTRACT_NO CONTRACT_NO,\r\n	lclpit.plate_number PLATE_NUMBER,\r\n	lect.FRAME_NUMBER FRAME_NUMBER\r\nFROM\r\n	LB_CONTRACT_INFO lcit\r\n	LEFT JOIN LB_EQUIPMENT_CAR lect ON lcit.id = lect.contract_id \r\n	AND lect.car_attribute = \'head\'\r\n	LEFT JOIN LB_CAR_LICENSE_PLATE_INFO lclpit ON lcit.id = lclpit.contract_id \r\n	AND lect.frame_number = lclpit.frame_number \r\nWHERE\r\n	lcit.project_id =:{PROJECTID}\r\n	LIMIT 0,1', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_lableconfig`(`ID`, `TAGNUMBER`, `TAGNAME`, `TITLE`, `TAGTYPE`, `VALUETYPE`, `VALUEFIELD`, `VALUEMETHOD`, `THOUSANDSFIELD`, `ISSHOEINDEX`, `REMARK`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`, `OPERATORCLASS`) VALUES ('975294b526544d83b806e3f3', '1000282', 'AttorneyCarTwo', '���շ���ί���鳵����Ϣ2', 'tag_type2', 'value_type3', 'CONTRACT_NO,PLATE_NUMBER,FRAME_NUMBER', 'SELECT\r\n	lcit.CONTRACT_NO CONTRACT_NO,\r\n	lclpit.plate_number PLATE_NUMBER,\r\n	lect.FRAME_NUMBER FRAME_NUMBER\r\nFROM\r\n	LB_CONTRACT_INFO lcit\r\n	LEFT JOIN LB_EQUIPMENT_CAR lect ON lcit.id = lect.contract_id \r\n	AND lect.car_attribute = \'tail\'\r\n	LEFT JOIN LB_CAR_LICENSE_PLATE_INFO lclpit ON lcit.id = lclpit.contract_id \r\n	AND lect.frame_number = lclpit.frame_number \r\nWHERE\r\n	lcit.project_id =:{PROJECTID}\r\n	LIMIT 0,1', NULL, 'N', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'word_default_class');
+INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('0d5f5dd7d43f4dcc80eee08d45321f3a', '975294b526544d83b806e3fc2f1', '69f0423f984a46128292fbd8768f556f', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('09430d898da243a993c004a61a0ea2b3', '975294b526544d83b806e3fc2f2', '69f0423f984a46128292fbd8768f557f', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('97dad5d3eff9456aa4a50f6e2b1a1f20', '975294b526544d83b806e3f3', '69f0423f984a46128292fbd8768f557f', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable`(`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('b0f90f03866740e4b6b731e1c85d5062', '975294b526544d83b806e3f2', '69f0423f984a46128292fbd8768f557f', NULL, NULL, NULL, NULL, NULL, NULL);

From 30c9770f87f0fade0d482d42de3930a91d29da54 Mon Sep 17 00:00:00 2001
From: zhanglei <zhanglei@ap-leasing.com.cn>
Date: Wed, 15 Dec 2021 09:33:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=8F=E9=94=80=E5=95=86=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=88=B0=E6=9C=9F=E6=97=A5=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/commcheck/OrgOrderApplyCheck.java | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 src_tenwa/com/tenwa/lease/flow/project/commcheck/OrgOrderApplyCheck.java

diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/OrgOrderApplyCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/OrgOrderApplyCheck.java
new file mode 100644
index 000000000..48dccafcb
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/OrgOrderApplyCheck.java
@@ -0,0 +1,85 @@
+/**
+ * 
+ */
+package com.tenwa.lease.flow.project.commcheck;
+
+import com.tenwa.reckon.util.DateUtil;
+import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
+import jbo.app.tenwa.customer.CUSTOMER_PERSON_TEMP;
+import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
+import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.comm.LB_GUARANTEE_UNIT_TEMP;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.template.check.DefaultBussinessCheck;
+import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ����ҵ������ʱ���жϾ����̡�Э�鵽�ڡ�������
+ *	1. Э�鵽��ǰһ���£�����ʱ��ʾ����Э�鼴�����ڣ��뾡�����������ǩ������
+ *  2. �����տ�ʼ��ֹ�����ᵥ����ʾ��Э�鵽�ڡ�
+ */
+public class OrgOrderApplyCheck extends DefaultBussinessCheck  {
+	private static final Logger logger = LoggerFactory.getLogger(OrgOrderApplyCheck.class);
+	@Override
+	public Object run(Transaction transaction) throws Exception {
+		logger.info("����ҵ������ʱ���жϾ����̡�Э�鵽�ڡ�������");
+		StringBuffer Message = new StringBuffer();
+		Message.append("δ��д��");
+		String flowunid=this.getAttribute("ObjectNo").toString();
+		BizObjectManager lpitMange = JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME, transaction);
+		BizObject lpit = lpitMange.createQuery("FLOWUNID=:flowunid").setParameter("FLOWUNID", flowunid).getSingleResult(false);
+        //LIMIT_END_DATE
+        BizObjectManager distributorInfoMange = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME, transaction);
+        BizObject distributorInfo = distributorInfoMange.createQuery("DISTRIBUTOR_NO=:distributorNo").setParameter("distributorNo",
+                lpit.getAttribute("distributor_id").getString()).getSingleResult(false);
+        if(distributorInfo == null || distributorInfo.getAttribute("LIMIT_END_DATE") == null){
+            //Э�鵽��
+            putMsg("����Э���ѵ��ڣ���ʱ�޷�����������ϵ��˾ҵ����Ա��");
+            setPass(false);
+            return null;
+        }
+        String limitEndDateStr = distributorInfo.getAttribute("LIMIT_END_DATE").getString();
+        // 2019/12/31
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");
+        String nowStr = sdf.format(new Date());
+        if(nowStr.equals(limitEndDateStr)){
+            //Э�鼴�����ڣ��뾡�����������ǩ����
+            putMsg("����Э�鼴�����ڣ�����ϵ��˾ҵ����Ա������������ǩ������");
+            setPass(true);
+            return null;
+        }
+        Date limitEndDate = sdf.parse(limitEndDateStr);
+        int days = DateUtil.getIntervalDays(new Date(), limitEndDate);
+        logger.info("����ҵ������ʱ���жϾ����̡�Э�鵽�ڡ������ڣ�Ŀǰ���������days= " + days);
+        if(days < 0){
+            //Э�鵽��
+            putMsg("����Э���ѵ��ڣ���ʱ�޷�����������ϵ��˾ҵ����Ա��");
+            setPass(false);
+            return null;
+        }else if(days <= 30){
+            //Э�鼴�����ڣ��뾡�����������ǩ����
+            putMsg("����Э�鼴�����ڣ�����ϵ��˾ҵ����Ա������������ǩ������");
+            setPass(true);
+            return null;
+        }else {
+            // > 30��
+            putMsg("ͨ��");
+            setPass(true);
+            return null;
+        }
+	}
+}
\ No newline at end of file