diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index af3e50dac..08ee008fe 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -1277,6 +1277,30 @@
 			</manager>
 		</class>
 	</package>
+	<package name="jbo.com.tenwa.entity.comm.credit" >
+		<class name="ST_CREDIT_AUDIT_HOLIDAY" label="工作日节假日维护test" keyAttributes="id">
+			<attributes>
+				<attribute name="id" label="编号" type="String" length="32"/>
+				<attribute name="c_year" label="年" type="INT" length="10"/>
+				<attribute name="c_month" label="月" type="INT" length="10"/>
+				<attribute name="c_day" label="日" type="INT" length="10"/>
+				<attribute name="c_date" label="当前日期" type="STRING" length="32"/>
+				<attribute name="otype" label="班/休" type="STRING" length="21"/>
+				<attribute name="INPUTUSERID" label="登记人" type="STRING" length="32"/>
+				<attribute name="INPUTORGID" label="登记部门" type="STRING" length="32"/>
+				<attribute name="INPUTTIME" label="登记时间" type="STRING" length="32"/>
+				<attribute name="UPDATEUSERID" label="更新人" type="STRING" length="32"/>
+				<attribute name="UPDATEORGID" label="更新部门" type="STRING" length="32"/>
+				<attribute name="UPDATETIME" label="更新时间" type="STRING" length="32"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="ST_CREDIT_AUDIT_HOLIDAY" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
+	</package>
 	<package name="jbo.com.tenwa.entity.comm.insurance" >
 		<class name="VI_INSURANCE_INFO" label="保险信息" keyAttributes="">
 			<attributes>
diff --git a/WebContent/report/creditAduit/creditHolidayInfo.jsp b/WebContent/report/creditAduit/creditHolidayInfo.jsp
new file mode 100644
index 000000000..692d559b0
--- /dev/null
+++ b/WebContent/report/creditAduit/creditHolidayInfo.jsp
@@ -0,0 +1,78 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%>
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=Info00;Describe=ע����;]~*/%>
+<%
+	/*
+		Author:lzb 2017-5-12
+		Tester:
+		Content: ������Ϣ
+		Input Param:
+		Output param:
+		History Log: 
+	 */
+%>
+<%/*~END~*/%>
+
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=Info01;Describe=����ҳ������;]~*/%>
+<%
+	String PG_TITLE = "������Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+%>
+<%/*~END~*/%>
+
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=Info02;Describe=�����������ȡ����;]~*/%>
+
+
+<%
+	String rightType = CurPage.getParameter("rightType");
+	if(rightType ==null)rightType="";
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=Info03;Describe=�������ݶ���;]~*/%>
+<%
+	String sTempletNo = "creditHolidayInfo";//--ģ���--
+	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+	dwTemp.Style = "2";//freeform
+	if(rightType.equals("ReadOnly")){
+		dwTemp.ReadOnly = "1";//ֻ��ģʽ
+	}
+	dwTemp.genHTMLObjectWindow(CurPage.getParameter("id"));
+	CurPage.getCurComp().setAttribute("RightType", rightType);
+%>
+<%/*~END~*/%>
+	
+	
+	
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=Info04;Describe=���尴ť;]~*/%>
+<%
+//0���Ƿ�չʾ 1��	Ȩ�޿���  2�� չʾ���� 3����ť��ʾ���� 4����ť�������� 5����ť�����¼�����	6��	7��	8��	9��ͼ�꣬CSS�����ʽ 10�����
+		String sButtons[][] = {
+		{"true","All","Button","����","���������޸�","saveRecord()","","","","btn_icon_save"},
+		{"true","","Button","����","�����б�ҳ��","parent.AsDialog.ClosePage()","","","","btn_icon_return"}
+	};
+	sButtonPosition = "south";
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=Info05;Describe=����ҳ��;]~*/%>
+<%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=Info06;Describe=���尴ť�¼�-;]~*/%>
+<script type="text/javascript"> 
+/*~[Describe=�����¼;InputParam=��;OutPutParam=��;]~*/
+	function saveRecord(){		
+		as_save("myiframe0","parent.AsDialog.ClosePage()");
+	}
+</script>
+<%/*~END~*/%>
+
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/report/creditAduit/creditHolidayList.jsp b/WebContent/report/creditAduit/creditHolidayList.jsp
new file mode 100644
index 000000000..ad06bb8c0
--- /dev/null
+++ b/WebContent/report/creditAduit/creditHolidayList.jsp
@@ -0,0 +1,154 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List00;Describe=ע����;]~*/%>
+<%
+	/*
+        Author:lzb 2017-05-12
+        Tester:
+        Content: ������Ϣ
+        Input Param:
+        Output param:
+        History Log:
+     */
+%>
+<%/*~END~*/%>
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List01;Describe=����ҳ������;]~*/%>
+<%
+	String PG_TITLE = "������Ϣ"; // ��������ڱ��� <title> PG_TITLE </title>
+%>
+<%/*~END~*/%>
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List02;Describe=�����������ȡ����;]~*/%>
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List03;Describe=�������ݶ���;]~*/%>
+<%
+	ASObjectModel doTemp = new ASObjectModel("creditHolidayList");
+	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+	dwTemp.Style="1";      	     //--����ΪGrid���--
+	dwTemp.ReadOnly = "1";	 //ֻ��ģʽ
+	dwTemp.setPageSize(30);
+	dwTemp.genHTMLObjectWindow("");
+%>
+<%/*~END~*/%>
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=true;CodeAreaID=List04;Describe=���尴ť;]~*/%>
+<%
+	String sButtons[][] = {
+			{"true","All","Button","����","����","newRecord()","","","","btn_icon_add",""},
+			{"true","All","Button","�޸�","�޸�","edit()","","","","btn_icon_edit",""},
+			{"true","All","Button","ɾ��","ɾ��","deleteRecord()","","","","btn_icon_delete",""},
+			{"true","","Button","�����Ǽ�","�����Ǽ�","inExcel()","","","","btn_icon_detail",""},
+			{"true","","Button","����ģ��","����ģ��","downLoad()","","","","btn_icon_down",""}
+	};
+%>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~���ɱ༭��~[Editable=false;CodeAreaID=List05;Describe=����ҳ��;]~*/%>
+<%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<%/*~END~*/%>
+
+<form name=form1 method=post action="<%=sWebRootPath%>/servlet/view/fileTemplateView?CompClientID=<%=sCompClientID%>" target=MyAtt>
+	<div style="display:none">
+		<input id="sqlString" name="sqlString" value="">
+	</div>
+</form>
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List06;Describe=���尴ť�¼�;]~*/%>
+<script type="text/javascript">
+	/*~[Describe=������¼;InputParam=��;OutPutParam=��;]~*/
+	function newRecord(){
+		var sUrl = "/report/creditAduit/creditHolidayInfo.jsp";
+		AsDialog.PopView(sUrl,'',"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){
+			reloadSelf();
+		},"�����˻���Ϣ");
+	}
+
+
+	/*~[Describe=����;InputParam=��;OutPutParam=��;]~*/
+	function view(){
+		var sUrl = "/report/creditAduit/creditHolidayInfo.jsp";
+		var id = getItemValue(0,getRow(0),'id');
+		if(typeof(id)=="undefined" || id.length==0 ){
+			alert("��ѡ��һ����Ϣ��");
+			return ;
+		}
+		AsDialog.PopView(sUrl,'id='+id+'&rightType=ReadOnly',"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){
+			reloadSelf();
+		},"�˻���Ϣ����");
+	}
+
+
+	function edit(){
+		var sUrl = "/report/creditAduit/creditHolidayInfo.jsp";
+		var id = getItemValue(0,getRow(0),'id');
+		if(typeof(id)=="undefined" || id.length==0 ){
+			alert("��ѡ��һ����Ϣ��");
+			return ;
+		}
+		AsDialog.PopView(sUrl,'id='+id,"resizable=yes;dialogWidth=800px;dialogHeight=300px;center:yes;status:no;statusbar:no",function(){
+			reloadSelf();
+		},"�޸��˻���Ϣ");
+	}
+
+	function deleteRecord(){
+		var ownNumber = getItemValue(0,getRow(),'id');
+		if(typeof(ownNumber)=="undefined" || ownNumber.length==0 ){
+			alert("��ѡ��һ����Ϣ��");
+			return ;
+		}
+		if(confirm('ȷʵҪɾ����?')){
+
+			as_delete(0,'');
+		}
+	}
+	/*~[Describe=�����Ѻ��excel;InputParam=��;OutPutParam=��;]~*/
+	function inExcel(){
+		var importCondition = {};//��������
+		importCondition["templateNo"] = "da670c357a4f11eaae2500163e0ad612";//�����ģ���ű���
+		//������������
+
+		var sUrl = "/Tenwa/Core/OfficeTemplate/TemplateManager/BFTemplateTest/uploadExcel.jsp";
+		var sparam = JSON.stringify(importCondition).replace(/,/g,"@");//����ģ��IJ�����
+		AsDialog.PopView(sUrl,"importparam="+sparam,{width:"350px",height:"40px",title:"�ϴ��ڼ���ά��"},function(){reloadSelf();});
+	}
+
+
+	/*~[Describe=���ص�Ѻ��Excel;InputParam=��;OutPutParam=��;]~*/
+	function downLoad(){
+		var sId = "da670c357a4f11eaae2500163e0ad612";//���ص�ģ����
+		$("#sqlString").val("save@"+sId);
+		form1.submit();
+	}
+</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List07;Describe=�Զ��庯��;]~*/%>
+<script type="text/javascript">
+
+
+</script>
+<%/*~END~*/%>
+
+
+
+
+<%/*~BEGIN~�ɱ༭��~[Editable=false;CodeAreaID=List08;Describe=ҳ��װ��ʱ�����г�ʼ��;]~*/%>
+<script type="text/javascript">
+
+</script>
+<%/*~END~*/%>
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/report/creditAduit/creditHolidayMain.jsp b/WebContent/report/creditAduit/creditHolidayMain.jsp
new file mode 100644
index 000000000..d175d8b66
--- /dev/null
+++ b/WebContent/report/creditAduit/creditHolidayMain.jsp
@@ -0,0 +1,11 @@
+<%@ page contentType="text/html; charset=GBK"%><%@
+ include file="/IncludeBegin.jsp"%><%
+	String PG_TITLE = "������������Mainҳ��"; // ��������ڱ��� <title> PG_TITLE </title>
+	String PG_CONTENT_TITLE = "<strong class='pt9white'>������Ϣ</strong>"; //Ĭ�ϵ�����������
+	String PG_CONTNET_TEXT = "��������б�";//Ĭ�ϵ�����������
+	String PG_LEFT_WIDTH = "1";//Ĭ�ϵ�treeview����
+%><%@include file="/Resources/CodeParts/Main04.jsp"%>
+<script type="text/javascript">
+	AsControl.OpenView("/report/creditAduit/creditHolidayList.jsp","","right","");
+</script>
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java b/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java
new file mode 100644
index 000000000..dcba59b4a
--- /dev/null
+++ b/src_core/com/tenwa/holiday/handler/CreditAuditHolidayHandler.java
@@ -0,0 +1,59 @@
+package com.tenwa.holiday.handler;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.dw.handler.impl.CommonHandler;
+import jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY;
+import jbo.com.tenwa.entity.comm.holiday.BT_HOLIDAY;
+
+public class CreditAuditHolidayHandler extends CommonHandler{
+
+	@Override
+	protected void beforeInsert(JBOTransaction tx, BizObject bo)
+			throws Exception {
+		// TODO Auto-generated method stub
+		String cdate=bo.getAttribute("c_date").getString();
+		String[] vDate=cdate.split("/");
+		bo.setAttributeValue("c_year", vDate[0]);
+		bo.setAttributeValue("c_month", vDate[1]);
+		bo.setAttributeValue("c_day", vDate[2]);
+		super.beforeInsert(tx, bo);
+	}
+	@Override
+	protected void beforeUpdate(JBOTransaction tx, BizObject bo)throws Exception {
+		String cdate=bo.getAttribute("c_date").getString();
+		String[] vDate=cdate.split("/");
+		bo.setAttributeValue("c_year", vDate[0]);
+		bo.setAttributeValue("c_month", vDate[1]);
+		bo.setAttributeValue("c_day", vDate[2]);
+		super.beforeUpdate(tx, bo);
+	}
+	@Override
+	protected boolean validityCheck(BizObject bo, boolean isInsert) {
+		try{
+		if(isInsert){
+			BizObject bx=JBOFactory.createBizObjectQuery(ST_CREDIT_AUDIT_HOLIDAY.CLASS_NAME, "c_date=:c_date").setParameter("c_date", bo.getAttribute("c_date").getString()).getSingleResult(false);
+			if(bx!=null)
+			{
+				this.errors="�����ظ�";
+				return false;
+			}
+		}else{
+			BizObject bx=JBOFactory.createBizObjectQuery(ST_CREDIT_AUDIT_HOLIDAY.CLASS_NAME, "c_date=:c_date and id<>'"+bo.getAttribute("id").getString()+"'").setParameter("c_date", bo.getAttribute("c_date").getString()).getSingleResult(false);
+			if(bx!=null)
+			{
+				this.errors="�����ظ�";
+				return false;
+			}
+		}
+		}catch(Exception e){
+			e.printStackTrace();
+		}
+		
+		
+		return super.validityCheck(bo, isInsert);
+	}
+	
+
+}
diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java b/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java
new file mode 100644
index 000000000..91ea6277b
--- /dev/null
+++ b/src_core/com/tenwa/officetempalte/importcallback/impl/CreditAuditHolidayCallBack.java
@@ -0,0 +1,59 @@
+package com.tenwa.officetempalte.importcallback.impl;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.context.ASUser;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * Author: guoshanglei 2017��5��11��
+ * Tester:
+ * Describe:
+ * History Log:
+ */
+public class CreditAuditHolidayCallBack extends BaseImportExcelCallBack{
+	//��ȡ��������run����
+	@Override
+	public void run(ASUser CurUser, BizObject importObject,
+			Map<String, String> model, Integer rowIndex, JBOTransaction tx,
+			Transaction Sqlca) throws Exception {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
+			
+			
+			String INPUTUSERID = CurUser.getUserID();//��ȡ�Ǽ���
+			String INPUTORGID = CurUser.getOrgID();//��ȡ�ǼDz���
+			String INPUTTIME = sdf.format(new Date()).toString();//��ʽ���Ǽ�ʱ��
+			
+			String cdate=importObject.getAttribute("c_date").getString();
+			String strSplit=cdate.indexOf("/")>0?"/":"-";
+			String[] vDate=cdate.split(strSplit);
+			importObject.setAttributeValue("c_year", vDate[0]);
+			importObject.setAttributeValue("c_month", vDate[1]);
+			importObject.setAttributeValue("c_day", vDate[2]);
+		   
+			importObject.setAttributeValue("c_date", cdate.replaceAll("-", "/"));//��ʼ���Ǽ���
+			importObject.setAttributeValue("INPUTUSERID", INPUTUSERID);//��ʼ���Ǽ���
+			importObject.setAttributeValue("INPUTORGID", INPUTORGID);//��ʼ���ǼDz���
+			importObject.setAttributeValue("INPUTTIME", INPUTTIME);//��ʼ���Ǽ�ʱ��
+	}
+
+	//���ݱ�������ݿ�ǰrunBefor����
+	@Override
+	public void runBefore(ASUser CurUser, Map<String, String> model,List<BizObject> importObjects,
+			JBOTransaction tx, Transaction Sqlca) throws Exception {
+
+	}
+
+	//���ݱ�������ݿ��runAfter����
+	@Override
+	public void runAfter(ASUser CurUser, Map<String, String> model,List<BizObject> importObjects,
+			JBOTransaction tx, Transaction Sqlca) throws Exception {
+	
+	}
+}
\ No newline at end of file
diff --git a/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java b/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java
new file mode 100644
index 000000000..6768f9f68
--- /dev/null
+++ b/src_jbo/jbo/com/tenwa/entity/comm/credit/ST_CREDIT_AUDIT_HOLIDAY.java
@@ -0,0 +1,64 @@
+package jbo.com.tenwa.entity.comm.credit;
+
+import java.lang.String;
+
+/**
+* �����սڼ���ά��test - JBO����������<br><br>
+* Note: This file is generated by ADE tools, <em>dont</em> modify it.<br>
+
+*/
+public interface ST_CREDIT_AUDIT_HOLIDAY{
+	/**
+	* �����սڼ���ά��test<br><br>
+	* ��������ӳ���BizObjectClass
+	*/
+	public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY";
+	/**
+	* ��� STRING(32)<br>
+	*/
+	public static final String id = "id";
+	/**
+	* �� INT(10)<br>
+	*/
+	public static final String c_year = "c_year";
+	/**
+	* �� INT(10)<br>
+	*/
+	public static final String c_month = "c_month";
+	/**
+	* �� INT(10)<br>
+	*/
+	public static final String c_day = "c_day";
+	/**
+	* ��ǰ���� STRING(32)<br>
+	*/
+	public static final String c_date = "c_date";
+	/**
+	* ��/�� STRING(21)<br>
+	*/
+	public static final String otype = "otype";
+	/**
+	* �Ǽ��� STRING(32)<br>
+	*/
+	public static final String INPUTUSERID = "INPUTUSERID";
+	/**
+	* �ǼDz��� STRING(32)<br>
+	*/
+	public static final String INPUTORGID = "INPUTORGID";
+	/**
+	* �Ǽ�ʱ�� STRING(32)<br>
+	*/
+	public static final String INPUTTIME = "INPUTTIME";
+	/**
+	* ������ STRING(32)<br>
+	*/
+	public static final String UPDATEUSERID = "UPDATEUSERID";
+	/**
+	* ���²��� STRING(32)<br>
+	*/
+	public static final String UPDATEORGID = "UPDATEORGID";
+	/**
+	* ����ʱ�� STRING(32)<br>
+	*/
+	public static final String UPDATETIME = "UPDATETIME";
+}
\ No newline at end of file
diff --git a/src_sql/投产SQL/V20200404/customer(zhanglei)_20200404.sql b/src_sql/投产SQL/V20200404/customer(zhanglei)_20200404.sql
new file mode 100644
index 000000000..0e0752f80
--- /dev/null
+++ b/src_sql/投产SQL/V20200404/customer(zhanglei)_20200404.sql
@@ -0,0 +1,136 @@
+-- ����ֱ���ͬģ�壬�Ѹ�����������
+INSERT INTO `apzl`.`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 ('operationType', 'CDZZ', 'C��ֱ��', '', '0120', '1', '', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2020/03/31 15:08:56', 'SYS_Designer', '2020/03/31 15:08:56', '', '');
+
+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 ('59f109e144c347d1b0d61da63a4fe822', NULL, '', 'C��ֱ��', '�������޺�ͬ-C��ֱ��.doc', '�������޺�ͬ-C��ֱ��-�����.docx', 'word', 'create', '', NULL, '030', '030002', '', '', '', '1', '', '', 'administrator', '8009001', '2020/03/31 14:02:27', 'admin', '8009001', '2020/03/31 02:18:46', '', '');
+
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('25fff44b316c42d397cc8e2c214f2b20', '975294b526544d83b806e3fc2f99cd16', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('31eccaf2a04c471ea341f7ef7a760961', 'bbe36e81f17542078489f223239e658a', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('5952afc7c09044ab9a8966d75bcd7e19', 'ced1455267d64183ba1b270a9eda6089', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('801e60bfebd649e09d673b7fa0f7fc23', '484815c4a7a14cf6bdbf69939e5b060e', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('9d3b561076b74fca88e50e92d51413ef', 'cc67cd6da08745329d0723f5f6fda25d', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('aba1e85d33b5444bb35357f837100335', 'db5b1632a6b44e7ea99e0dd0b2193ef3', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('bd605c45dc554628ae5094c58a270b26', 'be101123ef74413eb0d8acad8b6b22b9', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `apzl`.`bf_templatelable` (`ID`, `LABLEID`, `TEMPLATEID`, `INPUTUSERID`, `INPUTORGID`, `UPDATEUSERID`, `UPDATEORGID`, `INPUTTIME`, `UPDATETIME`) VALUES ('f921be5522b14cf38d04320165696a74', '755698c1c27a43efa6c23310757c6163', '59f109e144c347d1b0d61da63a4fe822', NULL, NULL, NULL, NULL, NULL, NULL);
+
+--   --------------------------------------�޸����󿼺�ͳ�Ʊ���
+--  ------------------------------������SQL��----------------------------------------
+CREATE TABLE `st_credit_audit_order_detail` (
+  `id` varchar(32) NOT NULL COMMENT 'id',
+  `serialno` varchar(32) NOT NULL COMMENT '��ˮ��',
+  `objectno` varchar(32) NOT NULL COMMENT '�������̱��',
+  `userid` varchar(32) DEFAULT NULL COMMENT '�а��˱��',
+  `username` varchar(80) DEFAULT NULL COMMENT '�������',
+  `auditFlowType` varchar(32) DEFAULT NULL COMMENT '������̽׶�����',
+  `auditFlowTypeDes` varchar(80) DEFAULT NULL COMMENT '������̽׶����ͽ���',
+  `createtime` varchar(32) DEFAULT NULL COMMENT '�������̴���ʱ��',
+  `begintime` varchar(32) DEFAULT NULL COMMENT '��ʼִ��ʱ��',
+  `endtime` varchar(32) DEFAULT NULL COMMENT '���ִ��ʱ��',
+  `create_day` varchar(32) DEFAULT NULL COMMENT '�����ڼ���-�����ڼ���֮�����̴�������',
+  `audit_day` varchar(32) DEFAULT NULL COMMENT '�����ڼ���-�����ڼ���֮�������������',
+  `jump_createtime` varchar(32) DEFAULT NULL COMMENT '�����ڼ���-�������̴���ʱ��',
+  `jump_begintime` varchar(32) DEFAULT NULL COMMENT '�����ڼ���-��ʼִ��ʱ��',
+  `jump_endtime` varchar(32) DEFAULT NULL COMMENT '�����ڼ���-���ִ��ʱ��',
+  `nextAuditFlowType` varchar(250) DEFAULT NULL COMMENT '�½׶�������̣��������˻ء�',
+  `auditResSts` varchar(255) DEFAULT NULL COMMENT '��˽��״̬',
+  `auditResStsDes` varchar(255) DEFAULT NULL COMMENT '��˽��״̬����',
+  `remark` varchar(255) DEFAULT NULL COMMENT '��ע��Ϣ',
+  `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '�Ǽ�ʱ��',
+  `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '����ʱ��',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='���󿼺�ͳ�ƶ���-��ϸ';
+
+CREATE TABLE `st_credit_audit_order` (
+  `id` varchar(32) NOT NULL COMMENT 'id',
+  `every_day` varchar(20) DEFAULT NULL COMMENT '��ǰ����',
+  `userid` varchar(32) DEFAULT NULL COMMENT '�а��˱��',
+  `username` varchar(80) DEFAULT NULL COMMENT '�������',
+  `auditFlowType` varchar(32) DEFAULT NULL COMMENT '������̽׶�����',
+  `auditFlowTypeDes` varchar(80) DEFAULT NULL COMMENT '������̽׶����ͽ���',
+  `order_count` int(11) DEFAULT NULL COMMENT '���ս�������',
+  `count_audit` int(11) DEFAULT NULL COMMENT '������������',
+  `count_audit_pass` int(11) DEFAULT NULL COMMENT '��������ͨ������',
+  `count_audit_refuse` int(11) DEFAULT NULL COMMENT '���������ܾ�����',
+  `count_audit_refuse1` int(11) DEFAULT NULL COMMENT '���������ܾ�����-����1�����ò���',
+  `count_audit_refuse2` int(11) DEFAULT NULL COMMENT '���������ܾ�����-����2����Ժִ��',
+  `count_audit_refuse3` int(11) DEFAULT NULL COMMENT '���������ܾ�����-����3�������Ϣ',
+  `count_audit_refuse4` int(11) DEFAULT NULL COMMENT '���������ܾ�����-����4�����ݺ�ʵ�쳣',
+  `count_audit_refuse5` int(11) DEFAULT NULL COMMENT '���������ܾ�����-����5������Ŀ���쳣',
+  `count_audit_refuse6` int(11) DEFAULT NULL COMMENT '���������ܾ�����-����6���ۺ����ֲ���',
+  `begintime` varchar(32) DEFAULT NULL COMMENT '��ʼִ��ʱ��',
+  `endtime` varchar(32) DEFAULT NULL COMMENT '���ִ��ʱ��',
+  `audittime` varchar(32) DEFAULT NULL COMMENT '���ʹ��ʱ��',
+  `remark` varchar(255) DEFAULT NULL COMMENT '��ע��Ϣ',
+  `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '�Ǽ�ʱ��',
+  `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '����ʱ��',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='���󿼺�ͳ�ƶ���';
+
+CREATE TABLE `st_credit_audit_holiday` (
+  `id` varchar(32) NOT NULL COMMENT '���',
+  `c_year` int(11) DEFAULT NULL COMMENT '��',
+  `c_month` int(11) DEFAULT NULL COMMENT '��',
+  `c_day` int(11) DEFAULT NULL COMMENT '��',
+  `c_date` varchar(32) DEFAULT NULL COMMENT '��ǰ����',
+  `otype` varchar(21) DEFAULT NULL COMMENT '��/��',
+  `INPUTUSERID` varchar(32) DEFAULT NULL COMMENT '�Ǽ���',
+  `INPUTORGID` varchar(32) DEFAULT NULL COMMENT '�ǼDz���',
+  `INPUTTIME` varchar(32) DEFAULT NULL COMMENT '�Ǽ�ʱ��',
+  `UPDATEUSERID` varchar(32) DEFAULT NULL COMMENT '������',
+  `UPDATEORGID` varchar(32) DEFAULT NULL COMMENT '���²���',
+  `UPDATETIME` varchar(32) DEFAULT NULL COMMENT '����ʱ��',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=gbk COMMENT='���󿼺�-�����պ���Ϣ��ά��';
+
+-- ------------------------------��������¼-����ڼ���ά����----------------------------------------
+
+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 ('creditHolidayList', '��˽ڼ���ά��', NULL, '30', NULL, '1', '1', 'default', 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'O', NULL, NULL, 'c_date', NULL, NULL, 'SYS_Designer', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 17:38:59', NULL, '1', NULL);
+
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910001', '910001', '1', 'O', 'id', 'id', 'String', null, '���', null, '1', 'Text', '1', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:31', '0', null, '0', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910002', '910002', '1', 'O', 'c_year', 'c_year', 'String', null, '��', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:31', '0', null, '0', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910003', '910003', '1', 'O', 'c_month', 'c_month', 'String', null, '��', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 16:43:57', '0', null, '0', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910004', '910004', '1', 'O', 'c_day', 'c_day', 'String', null, '��', null, '1', 'Text', '2', '3', null, null, null, '0', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/12 16:43:57', '0', null, '0', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910005', '910005', '1', 'O', 'c_date', 'c_date', 'String', null, '��ǰ����', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'BigThan,LessThan,Area');
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910006', '910006', '1', 'O', 'otype', 'otype', 'String', null, '��/��', null, '1', 'Text', '1', '1', null, null, null, '21', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'Like,Equals');
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910007', '910007', '1', 'O', 'INPUTUSERID', 'INPUTUSERID', 'String', null, '�Ǽ���', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '1', '1', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2018/08/14 15:45:14', '0', null, '1', null, null, null, 'Like,Equals');
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910008', '910008', '1', 'O', 'INPUTORGID', 'INPUTORGID', 'String', null, '�ǼDz���ID', null, '1', 'Text', '1', '1', null, null, null, '32', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910009', '910009', '1', null, 'NameManager.getOrgName(INPUTORGID)', 'INPUTORGIDName', 'String', null, '�ǼDz���', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_Designer', '2017/09/13 09:17:36', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910010', '910010', '1', 'O', 'INPUTTIME', 'INPUTTIME', 'String', null, '�Ǽ�ʱ��', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:55', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910011', '910011', '1', 'O', 'UPDATEUSERID', 'UPDATEUSERID', 'String', null, '������', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910012', '910012', '1', 'O', 'UPDATEORGID', 'UPDATEORGID', 'String', null, '���²���ID', null, '1', 'Text', '1', '1', null, null, null, '32', '0', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910013', '910013', '1', 'O', 'UPDATETIME', 'UPDATETIME', 'String', null, '����ʱ��', null, '1', 'Date', '3', '2', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_DESIGNER', '2017/09/12 16:10:56', 'SYS_Designer', '2017/09/13 09:32:32', '0', null, '1', null, null, null, null);
+INSERT INTO `awe_do_library` VALUES ('creditHolidayList', '910014', '910014', '1', null, 'NameManager.getOrgName(UPDATEORGID)', 'UPDATEORGIDName', 'String', null, '���²���', null, '1', 'Text', '1', '1', null, null, null, '32', '1', '0', '0', '0', '0', '1', '0', null, null, 'SYS_Designer', '2017/09/13 09:26:10', 'SYS_Designer', '2017/09/13 09:32:32', '0', 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 ('creditHolidayInfo', '��˽ڼ���ά��', NULL, '30020', NULL, '1', '1', 'default', 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'O', 'id=:id', NULL, NULL, 'com.tenwa.holiday.handler.CreditAuditHolidayHandler', NULL, 'SYS_Designer', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/12 16:59:52', 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 ('creditHolidayInfo', '910015', '910015', '1', 'O', 'id', 'id', 'Number', NULL, '���', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', 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 ('creditHolidayInfo', '910016', '910016', '1', 'O', 'c_year', 'c_year', 'Number', NULL, '��', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', NULL, '0', 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 ('creditHolidayInfo', '910017', '910017', '1', 'O', 'c_month', 'c_month', 'Number', NULL, '��', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', 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 ('creditHolidayInfo', '910018', '910018', '1', 'O', 'c_day', 'c_day', 'Number', NULL, '��', NULL, '1', 'Text', '2', '3', NULL, NULL, NULL, '0', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', 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 ('creditHolidayInfo', '910019', '910019', '1', 'O', 'c_date', 'c_date', 'String', NULL, '��ǰ����', NULL, '1', 'Date', '3', '2', NULL, NULL, NULL, '32', '1', '0', '1', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/12 17:22:34', '0', 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 ('creditHolidayInfo', '910020', '910020', '1', 'O', 'otype', 'otype', 'String', NULL, '��/��', NULL, '1', 'Select', '1', '1', 'CodeTable', '��,��,��,��', NULL, '21', '1', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'admin', '2017/09/12 17:19:08', '0', 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 ('creditHolidayInfo', '910021', '910021', '1', 'O', 'INPUTUSERID', 'INPUTUSERID', 'String', NULL, '�Ǽ���ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', 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 ('creditHolidayInfo', '910022', '910022', '1', 'O', 'INPUTORGID', 'INPUTORGID', 'String', NULL, '�ǼDz���ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', 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 ('creditHolidayInfo', '910023', '910023', '1', 'O', 'INPUTTIME', 'INPUTTIME', 'String', NULL, '�Ǽ�ʱ��', NULL, '1', 'Text', '1', '2', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', 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 ('creditHolidayInfo', '910024', '910024', '1', 'O', 'UPDATEUSERID', 'UPDATEUSERID', 'String', NULL, '������ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', 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 ('creditHolidayInfo', '910025', '910025', '1', 'O', 'UPDATEORGID', 'UPDATEORGID', 'String', NULL, '���²���ID', NULL, '1', 'Text', '1', '1', NULL, NULL, NULL, '32', '0', '0', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', 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 ('creditHolidayInfo', '910026', '910026', '1', 'O', 'UPDATETIME', 'UPDATETIME', 'String', NULL, '����ʱ��', NULL, '1', 'Text', '1', '2', NULL, NULL, NULL, '32', '0', '1', '0', '1', '1', '1', '0', NULL, NULL, 'SYS_DESIGNER', '2017/09/12 16:10:01', 'SYS_Designer', '2017/09/13 09:47:26', '0', 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 ('da670c357a4f11eaae2500163e0ad612', NULL, NULL, '���󿼺˽ڼ���ά��', '���󿼺˽ڼ���ά��.xlsx', '���󿼺˽ڼ���ά������.xlsx', 'excel', 'upload', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '1', NULL, 'ά���������򷨶��ڼ��� �����ո�Ϊ��Ϣ�գ�����Ϣ�յ���Ϊ�ڼ���', 'admin', '80009000200010001', '2020/03/13 10:07:19', 'admin', '80009000200010001', '2020/03/13 11:02:17', NULL, NULL);
+
+INSERT INTO `apzl`.`bf_importconfig` (`ID`, `IMPORTTABLE`, `ROWLINE`, `DATEINDEX`, `SHEETNAME`, `ISDELDATE`, `DELCONDITION`, `IMPORTCLASS`, `CENOTE`, `INPUTUSERID`, `INPUTORGID`, `INPUTTIME`, `UPDATEUSERID`, `UPDATEORGID`, `UPDATETIME`, `RELATIVECLASS`, `TEMPLATEID`, `ISSAVE`) 
+VALUES ('e6c678657a4f11eaae2500163e0ad612', 'ST_CREDIT_AUDIT_HOLIDAY', '1', '2', NULL, 'yes', 'c_date=:{c_date}', 'com.tenwa.officetempalte.importcallback.impl.CreditAuditHolidayCallBack', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'jbo.com.tenwa.entity.comm.credit.ST_CREDIT_AUDIT_HOLIDAY', 'da670c357a4f11eaae2500163e0ad612', NULL);
+
+
+
+-- ------------------------------��������¼--��ʱ��������Ϊÿ������5��-----------------------------
+INSERT INTO `apzl`.`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 ('MissionName', 'com.tenwa.lease.app.quartzmession.CreditAuditHolidayBatch', '���󿼺�ͳ�ƴ���', '5101001', '5101001', '1', '���󿼺�ͳ�ƴ���', '', '', '', '', '', '', '', '', '', '', 'SYS_Designer', NULL, '2019/12/26 10:13:04', 'SYS_Designer', '2019/12/26 10:14:07', '', '');
+
+
diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java
new file mode 100644
index 000000000..bfe601c7c
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreditAuditHolidayBatch.java
@@ -0,0 +1,731 @@
+package com.tenwa.lease.app.quartzmession;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.amarsoft.dict.als.cache.CacheLoaderFactory;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * ��ʼ�����󿼺˱�����������
+ * @author xiezhiwen
+ */
+public class CreditAuditHolidayBatch implements Job{
+	private static final Logger logger = LogManager.getLogger(CreditAuditHolidayBatch.class);// ����logger��־
+
+	public void execute(JobExecutionContext arg0) throws JobExecutionException {
+		initDetail();
+		updateDetail();
+		initOrderAuditDay();
+		saveOrderAuditDay();
+		updateOrderAuditDay();
+	}
+
+	/**
+	 * ����������̼�¼��ϸ
+	 * @return
+	 */
+	private void initDetail(){
+		Transaction Sqlca=null;
+		try{
+			Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+			//��ʼ�����󿼺���ϸ��
+			String result1 = initDetail(Sqlca);
+			Sqlca.commit();
+			logger.info("����ʼ�����󿼺���ϸ������ʱ����ִ�гɹ�<<<<<<<<<<<<<: "+result1);
+		}catch(Exception e){
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<����ʼ�����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<����ʼ�����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<����ʼ�����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			try {
+				Sqlca.rollback();
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+			e.printStackTrace();
+		}finally {
+			if(Sqlca!=null) {
+				try {
+					Sqlca.commit();
+					Sqlca.disConnect();
+				} catch (JBOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * �޸������ϸ�Ĵ���ʱ��
+	 * @return
+	 */
+	private void updateDetail(){
+		Transaction Sqlca=null;
+		try{
+			Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+			//��ʼ�����󿼺���ϸ��
+			String result1 = updateDetail(Sqlca);
+			Sqlca.commit();
+			logger.info("���޸����󿼺���ϸ������ʱ����ִ���쳣<<<<<<<<<<<<<: "+result1);
+		}catch(Exception e){
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			try {
+				Sqlca.rollback();
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+			e.printStackTrace();
+		}finally {
+			if(Sqlca!=null) {
+				try {
+					Sqlca.commit();
+					Sqlca.disConnect();
+				} catch (JBOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * ��ʼ�����ͳ�Ʊ���-���ݽ�������
+	 * @return
+	 */
+	private void initOrderAuditDay(){
+		Transaction Sqlca=null;
+		try{
+			Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+			//��ʼ�����󿼺���ϸ��
+			String result1 = initOrderAuditDay(Sqlca);
+			Sqlca.commit();
+			logger.info("���޸����󿼺���ϸ������ʱ����ִ�����<<<<<<<<<<<<<: "+result1);
+		}catch(Exception e){
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			try {
+				Sqlca.rollback();
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+			e.printStackTrace();
+		}finally {
+			if(Sqlca!=null) {
+				try {
+					Sqlca.commit();
+					Sqlca.disConnect();
+				} catch (JBOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * ��ʼ�������޸����ͳ�Ʊ���-����������
+	 * @return
+	 */
+	private void saveOrderAuditDay(){
+		Transaction Sqlca=null;
+		try{
+			Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+			//��ʼ�����󿼺���ϸ��
+			String result1 = saveOrderAuditDay(Sqlca);
+			Sqlca.commit();
+			logger.info("���޸����󿼺���ϸ������ʱ����ִ�����<<<<<<<<<<<<<: "+result1);
+		}catch(Exception e){
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			try {
+				Sqlca.rollback();
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+			e.printStackTrace();
+		}finally {
+			if(Sqlca!=null) {
+				try {
+					Sqlca.commit();
+					Sqlca.disConnect();
+				} catch (JBOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * ��ʼ�������޸����ͳ�Ʊ���-����������
+	 * @return
+	 */
+	private void updateOrderAuditDay(){
+		Transaction Sqlca=null;
+		try{
+			Sqlca = Transaction.createTransaction(CacheLoaderFactory.getDataSource());
+			//��ʼ�����󿼺���ϸ��
+			String result1 = updateOrderAuditDay(Sqlca);
+			Sqlca.commit();
+			logger.info("���޸����󿼺���ϸ������ʱ����ִ�����<<<<<<<<<<<<<: "+result1);
+		}catch(Exception e){
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			logger.error("<<<<<<<<<<<<<<<<<<<<<<���޸����󿼺���ϸ������ʱ����ִ���쳣>>>>>>>>>>>>>>>>>>>>>>>");
+			try {
+				Sqlca.rollback();
+			} catch (JBOException e1) {
+				e1.printStackTrace();
+			}
+			e.printStackTrace();
+		}finally {
+			if(Sqlca!=null) {
+				try {
+					Sqlca.commit();
+					Sqlca.disConnect();
+				} catch (JBOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * ����������̼�¼��ϸ
+	 * @return
+	 * @throws Exception
+	 */
+	public String initDetail(Transaction Sqlca) throws Exception {
+		// ����ȫ�ֶ���
+		String uuidDetail = "";			 // ҵ��id
+		String userid = "";			     // �û�id
+		String username = "";   	     // �û�����
+		String objectno = "";   	     // ���̱��
+		String serialno = "";   	     // ���̴�����ˮ
+		String auditFlowType = "";       // �����������
+		String auditFlowTypeDes = "";  	// �����������˵��
+		String createtime = "";  		// ���̴���ʱ��
+		String begintime = "";  		// ���̿�ʼʱ��
+		String endtime = "";  			// ���̽���ʱ��
+		String jump_createtime = "";  		// �����ڼ���֮�����̴���ʱ��
+		String create_day = "";  			// �����ڼ���֮�����̴�������
+		String audit_day = "";  			// �����ڼ���֮�������������
+		String jump_begintime = "";  		// �����ڼ���֮�����̿�ʼʱ��
+		String jump_endtime = "";  			// �����ڼ���֮�����̽���ʱ��
+		String nextAuditFlowType = "";  // �½׶������������
+		String auditResSts = "";     	// ������˽��
+		String auditResStsDes = "";		// ������˽��˵��
+		String remark = "";
+		String insertSql = "";
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd");
+		int con=0;
+		// ��ѯ������Ҫ���ͻ������ѵ�����
+		String selSql="SELECT  \n" +
+				"  FT.userid,\n" +
+				"  FT.username,\n" +
+				"  FT.objectno,\n" +
+				"  FT.serialno,\n" +
+				"  FT.phaseno AS auditFlowType,\n" +
+				"  FT.phasename AS auditFlowTypeDes,\n" +
+				"  FT.begintime,\n" +
+				"  FT.endtime,\n" +
+				"  FT.phaseopinion1 AS nextAuditFlowType,\n" +
+				"  fob.phaseopinion AS auditResSts,\n" +
+				"  (SELECT itemname from code_library WHERE codeno='disagreeOP' AND itemno=fob.phaseopinion) AS auditResStsDes\n" +
+				"FROM FLOW_TASK FT\n" +
+				"LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" +
+				"WHERE FT.flowname = 'ҵ����������' \n" +
+				"AND FT.phaseno='0030' \n" +
+				"AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'')";
+		ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql));
+		while(rs.next()) {
+			// ��ȡ�ӿ�������������
+			con++;
+			uuidDetail = UUID.randomUUID().toString().replace("-", "");
+			userid = rs.getString("userid");			     // �û�id
+			username = rs.getString("username");   	     // �û�����
+			objectno = rs.getString("objectno");   	     // ���̱��
+			serialno = rs.getString("serialno");   	     // ���̴�����ˮ
+			auditFlowType = rs.getString("auditFlowType");       // �����������
+			auditFlowTypeDes = rs.getString("auditFlowTypeDes");  	// �����������˵��
+			createtime = rs.getString("begintime");  		// ���̴���ʱ��
+			begintime = rs.getString("begintime");  		// ���̿�ʼʱ��
+			endtime = rs.getString("endtime");  			// ���̽���ʱ��
+			nextAuditFlowType = rs.getString("nextAuditFlowType");  // �½׶������������
+			auditResSts = rs.getString("auditResSts");     	// ������˽��
+			auditResStsDes = rs.getString("auditResStsDes");		// ������˽��˵��
+			if("�����˻�".equals(nextAuditFlowType)){
+				continue;
+			}
+			if(StringUtils.isNotEmpty(createtime)){//��ʼʱ�䲻Ϊ��
+				jump_createtime = resJumpHoliday(Sqlca, rs.getString("begintime"));  	// �����ڼ���֮�����̴���ʱ��
+				create_day = dayFormat.format(simpleDateFormat.parse(jump_createtime));
+				jump_createtime = sdf.format(simpleDateFormat.parse(jump_createtime));
+				jump_begintime = jump_createtime;  											// �����ڼ���֮�����̿�ʼʱ��
+				createtime = sdf.format(simpleDateFormat.parse(createtime));
+				begintime = createtime;
+			}
+			if (StringUtils.isNotEmpty(endtime)){//����ʱ�䲻Ϊ��
+				jump_endtime = resJumpHoliday(Sqlca, rs.getString("endtime"));  			// �����ڼ���֮�����̽���ʱ��
+				audit_day = dayFormat.format(simpleDateFormat.parse(jump_endtime));
+				endtime = sdf.format(simpleDateFormat.parse(endtime));
+				jump_endtime = sdf.format(simpleDateFormat.parse(jump_endtime));
+			}
+			insertSql="INSERT INTO st_credit_audit_order_detail(id,serialno,objectno,userid,username, " +
+					"auditFlowType," +
+					"auditFlowTypeDes," +
+					"createtime," +
+					"begintime," +
+					"endtime," +
+					"create_day," +
+					"audit_day," +
+					"jump_createtime," +
+					"jump_begintime," +
+					"jump_endtime," +
+					"nextAuditFlowType," +
+					"auditResSts," +
+					"auditResStsDes," +
+					"remark," +
+					"INPUTTIME, " +
+					"UPDATETIME " +
+					") " +
+					"VALUES ( " +
+					"'"+uuidDetail+"', " +
+					"'"+serialno+"', " +
+					"'"+objectno+"', " +
+					"'"+userid+"', " +
+					"'"+username+"', " +
+					"'"+auditFlowType+"', " +
+					"'"+auditFlowTypeDes+"', " +
+					" '"+createtime+"', " +
+					" '"+begintime+"', " +
+					" '"+endtime+"', " +
+					" '"+create_day+"', " +
+					" '"+audit_day+"', " +
+					" '"+jump_createtime+"', " +
+					" '"+jump_begintime+"', " +
+					" '"+jump_endtime+"',  " +
+					"'"+nextAuditFlowType+"', " +
+					"'"+auditResSts+"', " +
+					"'"+auditResStsDes+"', " +
+					"'"+remark+"', " +
+					"DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " +
+					"DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " +
+					")";
+			Sqlca.executeSQL(new SqlObject(insertSql));
+
+		}
+		return String.valueOf(con);
+	}
+
+
+	/**
+	 * ��ѯ��С����ʱ�������ϸ��¼�ж�Ӧ�Ĵ���ʱ��
+	 * @return
+	 * @throws Exception
+	 */
+	public String updateDetail(Transaction Sqlca) throws Exception {
+		// ����ȫ�ֶ���
+		String objectno = "";   	     // ���̱��
+		String begintime = "";  		// ���̴���ʱ��
+		String createtime = "";  		// �����ڼ���֮�����̴���ʱ��
+		String create_day = "";  			// �����ڼ���֮�����̴�������
+		String updSql = "";
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd");
+		int con=0;
+		// ��ѯ������Ҫ���ͻ������ѵ�����
+		// ��ѯ������Ҫ���ͻ������ѵ�����
+		String selSql="SELECT  \n" +
+				"  FT.userid,\n" +
+				"  FT.objectno,\n" +
+				"  min(FT.begintime)  AS begintime\n" +
+				"FROM FLOW_TASK FT\n" +
+				"LEFT JOIN FLOW_OPINION_BUSINESS FOB ON FT.SERIALNO=FOB.SERIALNO \n" +
+				"WHERE FT.flowname = 'ҵ����������' \n" +
+				"AND FT.phaseno='0030' \n" +
+				"AND (FT.USERNAME IS NOT NULL OR FT.USERNAME <>'') group by FT.objectno";
+		ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql));
+		while(rs.next()) {
+			// ��ȡ�ӿ�������������
+			con++;
+			begintime = rs.getString("begintime");   // ���̱��
+			objectno = rs.getString("objectno");  		// ���̴���ʱ��
+			createtime = sdf.format(simpleDateFormat.parse(begintime));
+			create_day = dayFormat.format(simpleDateFormat.parse(resJumpHoliday(Sqlca, begintime)));
+			updSql="UPDATE st_credit_audit_order_detail SET create_day='"+create_day+"',  createtime='"+createtime+"'," +
+					"UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE objectno='"+objectno+"' ";
+			Sqlca.executeSQL(new SqlObject(updSql));
+			objectno = "";
+			begintime = "";
+			createtime = "";
+			create_day = "";
+			updSql = "";
+		}
+		return String.valueOf(con);
+	}
+
+	/**
+	 * ��ʼ�����ͳ�Ʊ���-�������������ض���
+	 * @return
+	 * @throws Exception
+	 */
+	public String initOrderAuditDay(Transaction Sqlca) throws Exception {
+		String insertSql="INSERT INTO st_credit_audit_order(\n" +
+				" id,\n" +
+				" every_day,\n" +
+				" userid,\n" +
+				" username,\n" +
+				" auditFlowType,\n" +
+				" auditFlowTypeDes,\n" +
+				" count_audit,\n" +
+				" count_audit_pass,\n" +
+				" count_audit_refuse,\n" +
+				" count_audit_refuse1,\n" +
+				" count_audit_refuse2,\n" +
+				" count_audit_refuse3,\n" +
+				" count_audit_refuse4,\n" +
+				" count_audit_refuse5,\n" +
+				" count_audit_refuse6\n" +
+				" )\n" +
+				" SELECT \n" +
+				" replace(uuid(),'-',''),\n" +
+				" st2.every_day,\n" +
+				" st2.userid,\n" +
+				" st2.username,\n" +
+				" st2.auditFlowType,\n" +
+				" st2.auditFlowTypeDes,\n" +
+				" st2.count_audit,\n" +
+				" st3.count_audit_pass,\n" +
+				" st4.count_audit_refuse,\n" +
+				" st5.count_audit_refuse1,\n" +
+				" st6.count_audit_refuse2,\n" +
+				" st7.count_audit_refuse3,\n" +
+				" st8.count_audit_refuse4,\n" +
+				" st9.count_audit_refuse5,\n" +
+				" st10.count_audit_refuse6\n" +
+				" from\n" +
+				" (SELECT COUNT(1) AS count_audit,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts != 'null'AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st2 \n" +
+				" left join (SELECT COUNT(1) AS count_audit_pass,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts = '0070'AND (endtime is not null or endtime != '')GROUP BY audit_day, userid) as st3 on st3.every_day = st2.every_day AND st3.userid=st2.userid\n" +
+				" left join (SELECT COUNT(1) AS count_audit_refuse,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts != '0070' AND auditResSts != 'null' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st4 on st4.every_day = st2.every_day AND st4.userid=st2.userid\n" +
+				" left join (SELECT COUNT(1) AS count_audit_refuse1,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts = '0010' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st5 on st5.every_day = st2.every_day AND st5.userid=st2.userid\n" +
+				" left join (SELECT COUNT(1) AS count_audit_refuse2,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts = '0020' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st6 on st6.every_day = st2.every_day AND st6.userid=st2.userid\n" +
+				" left join (SELECT COUNT(1) AS count_audit_refuse3,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts = '0030' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st7 on st7.every_day = st2.every_day AND st7.userid=st2.userid\n" +
+				" left join (SELECT COUNT(1) AS count_audit_refuse4,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts = '0040' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st8 on st8.every_day = st2.every_day AND st8.userid=st2.userid\n" +
+				" left join (SELECT COUNT(1) AS count_audit_refuse5,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts = '0050' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st9 on st9.every_day = st2.every_day AND st9.userid=st2.userid\n" +
+				" left join (SELECT COUNT(1) AS count_audit_refuse6,audit_day AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail \n" +
+				" WHERE auditResSts = '0060' AND (endtime is not null or endtime != '') GROUP BY audit_day, userid) as st10 on st10.every_day = st2.every_day AND st10.userid=st2.userid \n";
+		Sqlca.executeSQL(new SqlObject(insertSql));
+		return "-1";
+	}
+
+	/**
+	 * ���ݲ�ѯ����ͳ�����ݣ����ӻ��߸���ͳ�ƶ�������
+	 * @return
+	 * @throws Exception
+	 */
+	public String saveOrderAuditDay(Transaction Sqlca) throws Exception {
+		// ����ȫ�ֶ���
+		String id = "";   	     // ���̱��
+		String order_count = "";   	     // ���̱��
+		String userid = "";   	     // ���̱��
+		String every_day = "";   	     // ���̱��
+		String username = "";  		// ���̴���ʱ��
+		String auditFlowType = "";  		// ���̴���ʱ��
+		String auditFlowTypeDes = "";  		// �����ڼ���֮�����̴���ʱ��
+		String updSql = "";
+		String selSql2 = "";
+		int con=0;
+		// ��ѯ������Ҫ���ͻ������ѵ�����
+		String selSql="SELECT count(1) as order_count,std1.every_day,std1.userid,std1.username,std1.auditFlowType,std1.auditFlowTypeDes \n" +
+				"    from (SELECT min(create_day) AS every_day,userid,username,auditFlowType,auditFlowTypeDes from st_credit_audit_order_detail GROUP BY objectno) AS std1 \n" +
+				"    GROUP BY std1.every_day ";
+		ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql));
+		while(rs.next()) {
+			id = UUID.randomUUID().toString().replace("-", "");
+			// ��ȡ�ӿ�������������
+			con++;
+			every_day = rs.getString("every_day");   // ���̱��
+			order_count = rs.getString("order_count");  		// ���̴���ʱ��
+			userid = rs.getString("userid");  		// ���̴���ʱ��
+			username = rs.getString("username");  		// ���̴���ʱ��
+			auditFlowType = rs.getString("auditFlowType");  		// ���̴���ʱ��
+			auditFlowTypeDes = rs.getString("auditFlowTypeDes");  		// ���̴���ʱ��
+
+			selSql2="SELECT count(1) as countNum FROM st_credit_audit_order WHERE every_day ='" + every_day +"'";
+			ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2));
+			if(rs2.next()) {
+				if(rs2.getInt("countNum") > 0){
+					updSql="UPDATE st_credit_audit_order SET order_count='"+order_count+"',  " +
+							"UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE every_day='"+every_day+"' ";
+					Sqlca.executeSQL(new SqlObject(updSql));
+				}else {
+					String insertSql = "INSERT INTO st_credit_audit_order(\n" +
+							" id,\n" +
+							" every_day,\n" +
+							" userid,\n" +
+							" username,\n" +
+							" auditFlowType,\n" +
+							" auditFlowTypeDes,\n" +
+							" order_count,\n" +
+							" INPUTTIME, " +
+							" UPDATETIME " +
+							" ) " +
+							" VALUES ( " +
+							" '" + id + "', " +
+							" '" + every_day + "', " +
+							" '" + userid + "', " +
+							" '" + userid + "', " +
+							" '" + username + "', " +
+							" '" + auditFlowType + "', " +
+							" '" + auditFlowTypeDes + "', " +
+							"DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s'), " +
+							"DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') " +
+							")";
+				}
+			}
+			id = "";
+			order_count = "";
+			userid = "";
+			every_day = "";
+			username = "";
+			auditFlowType = "";
+			auditFlowTypeDes = "";
+			updSql = "";
+			selSql2 = "";
+		}
+		return String.valueOf(con);
+	}
+
+	/**
+	 * ���ݲ�ѯ����ͳ�����ݣ��޸�
+	 * @return
+	 * @throws Exception
+	 */
+	public String updateOrderAuditDay(Transaction Sqlca) throws Exception {
+		// ����ȫ�ֶ���
+		String id = "";   	     // ���̱��
+		String userid = "";   	     // ���̱��
+		String every_day = "";   	     // ���̱��
+		String begintime = "";  		// ���̴���ʱ��
+		String endtime = "";  		// ���̴���ʱ��
+		String audittime = "";  		// �����ڼ���֮�����̴���ʱ��
+		String updSql = "";
+		String selSql2 = "";
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		int con=0;
+		// ��ѯ������Ҫ���ͻ������ѵ�����
+		String selSql="SELECT  id,  every_day,  userid FROM st_credit_audit_order ";
+		ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql));
+		while(rs.next()) {
+			// ��ȡ�ӿ�������������
+			con++;
+			id = rs.getString("id");   // ���̱��
+			every_day = rs.getString("every_day");   // ���̱��
+			userid = rs.getString("userid");  		// ���̴���ʱ��
+
+			selSql2="SELECT  \n" +
+					"  jump_begintime,\n" +
+					"  jump_endtime \n" +
+					" FROM st_credit_audit_order_detail \n" +
+					" WHERE userid = '" + userid +"'" +
+					" AND audit_day ='" + every_day +"'" +
+					" AND auditResSts != 'null'" +
+					" AND (endtime is not null or endtime != '')" ;
+			ASResultSet rs2 = Sqlca.getASResultSet(new SqlObject(selSql2));
+			begintime = "";  		// ���̴���ʱ��
+			endtime = "";
+			while(rs2.next()) {
+				String jump_begintime = rs2.getString("jump_begintime");  		// ���̴���ʱ��
+				String jump_endtime = rs2.getString("jump_endtime");  		// ���̴���ʱ��
+				if(StringUtils.isEmpty(begintime) || sdf.parse(begintime).getTime() > sdf.parse(jump_begintime).getTime()){
+					begintime = jump_begintime;
+				}
+				if(StringUtils.isEmpty(endtime) || sdf.parse(jump_endtime).getTime() > sdf.parse(endtime).getTime()){
+					endtime = jump_endtime;
+				}
+			}
+			audittime = resDiffJumpHoliday(Sqlca, simpleDateFormat.format(sdf.parse(begintime)), simpleDateFormat.format(sdf.parse(endtime)));
+			updSql="UPDATE st_credit_audit_order SET begintime='"+begintime+"',  " +
+					" endtime='"+endtime+"',  " +
+					" audittime='"+audittime+"',  " +
+					"UPDATETIME=DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%s') WHERE id='"+id+"' ";
+			Sqlca.executeSQL(new SqlObject(updSql));
+			id = "";
+			userid = "";
+			every_day = "";
+			begintime = "";
+			endtime = "";
+			audittime = "";
+			updSql = "";
+			selSql2 = "";
+		}
+		return String.valueOf(con);
+	}
+
+
+
+	/**
+	 * 0010	����
+	 * 0020	��Ժִ��
+	 * 0030	�����Ϣ
+	 * 0040	���ݺ�ʵ�쳣
+	 * 0050	����Ŀ���쳣
+	 * 0060	�ۺ����ֲ���
+	 * 0070	ͬ��
+	 * 0080	������ͨ��
+	 */
+	/**
+	 * ���ݵ�ǰʱ���������ڼ��յĹ�����ʱ��
+	 * @param date
+	 * @return
+	 */
+	private String resJumpHoliday(Transaction Sqlca, String date) throws SQLException, ParseException {
+		//��ѯ��ǰʱ���Ƿ��ڹ���ʱ��
+		SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		int hour = Integer.parseInt(date.substring(11, 13));
+		int minute = Integer.parseInt(date.substring(14, 16));
+		if(hour < 9){//ʱ��С�ڵ���9�㣬�����ʱ��Ϊ����ŵ�
+			date = date.substring(0, 11) + "09:00:00";
+		}else if((hour == 17 && minute > 30) || (hour > 17)){//ʱ��С�ڵ���17:30�㣬�����ʱ��Ϊ�ڶ��������ŵ�
+			Date time = simpleDateFormat.parse(date);
+			Calendar calendar = Calendar.getInstance();
+			calendar.setTime(time);
+			calendar.add(Calendar.DAY_OF_MONTH, 1);
+			date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00";
+		}
+		//��ѯ��ǰʱ���Ƿ��ڽڼ���ʱ��
+		String day = date.substring(0, 10);
+		int count = 0;
+		while (count < 15){
+			count ++;
+			String selSql="SELECT  count(1) as countNum " +
+					" FROM st_credit_audit_holiday st" +
+					" WHERE st.c_date='" + day +"'" +
+					" AND st.otype='��'" ;
+			ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql));
+			int countNum = 0;
+			if(rs.next()){
+				countNum = rs.getInt("countNum");
+			}
+			if(countNum > 0){
+				Date time = simpleDateFormat.parse(date);
+				Calendar calendar = Calendar.getInstance();
+				calendar.setTime(time);
+				calendar.add(Calendar.DAY_OF_MONTH, 1);
+				date = simpleDateFormat.format(calendar.getTime()).substring(0, 11) + "09:00:00";
+				day = date.substring(0, 10);
+			}else {
+				break;
+			}
+		}
+		return date;
+	}
+
+	/**
+	 * ����ʱ������ʱ���������ڼ��յĹ�����ʱ��
+	 * @param begintime ��ʼʱ��
+	 * @param endtime ����ʱ��
+	 * @return
+	 */
+	private String resDiffJumpHoliday(Transaction Sqlca, String begintime, String endtime) throws SQLException, ParseException {
+		//��ȡ��ʼʱ�䡢����ʱ�������ڼ��յ�ʱ��
+		begintime = resJumpHoliday(Sqlca, begintime);
+		endtime = resJumpHoliday(Sqlca, endtime);
+		//ȷ�Ͽ�ʼʱ�䣬������ʱ�䣬�м����ʱ�䣬���ų��ڼ���ʱ��
+		//�������ʱ��С�ڻ��ߵ��ڿ�ʼʱ��
+		SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy/MM/dd");
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		Date beginDate = simpleDateFormat.parse(begintime);
+		Date endDate = simpleDateFormat.parse(endtime);
+		long diff = 0;
+		if(beginDate.getTime() >= endDate.getTime()){
+			return "0";
+		}else if (begintime.substring(0, 10).equals(endtime.substring(0, 10))){
+			diff = diffMinute(beginDate.getTime(), endDate.getTime());
+			return String.valueOf(diff);
+		}else {
+			long diffBeginAfter = diffBeginDateAfter(begintime, beginDate);
+			long diffEndDateBefore = diffEndDateBefore(endtime, endDate);
+			diff = diffBeginAfter + diffEndDateBefore;
+			//�õ��������� betweenDate
+
+			beginDate = dayFormat.parse(dayFormat.format(beginDate));
+			endDate = dayFormat.parse(dayFormat.format(endDate));
+			long betweenDate = (endDate.getTime() - beginDate.getTime())/(60*60*24*1000);
+			if (betweenDate == 1){
+				return String.valueOf(diff);
+			}else {//�м��������һ���ѯ���ݿ�����������м����Ǽ��ڣ�
+				begintime = dayFormat.format(beginDate);
+				endtime = dayFormat.format(endDate);
+				String selSql="SELECT COUNT(1) as countNum FROM (\n" +
+						" SELECT  c_date\n" +
+						" FROM st_credit_audit_holiday st\n" +
+						" WHERE st.c_date BETWEEN '"+begintime+"' AND '"+endtime+"'\n" +
+						" AND st.otype='��'\n" +
+						" GROUP BY st.c_date\n" +
+						" ) AS s" ;
+				ASResultSet rs = Sqlca.getASResultSet(new SqlObject(selSql));
+				int countNum = 0;
+				if(rs.next()){
+					countNum = rs.getInt("countNum");
+				}
+				diff += (betweenDate - countNum - 1)*8*60;
+				return String.valueOf(diff);
+			}
+		}
+	}
+
+	private long diffEndDateBefore(String endTime, Date endDate) throws ParseException {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		String endtimeBefore = endTime.substring(0, 11) + "09:00:00";
+		Date endDateBefore = simpleDateFormat.parse(endtimeBefore);
+		return diffMinute(endDateBefore.getTime(), endDate.getTime());
+	}
+
+	private long diffBeginDateAfter(String beginTime, Date beginDate) throws ParseException {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		String begintimeAfter = beginTime.substring(0, 11) + "17:30:00";
+		Date beginDateAfter = simpleDateFormat.parse(begintimeAfter);
+		return diffMinute(beginDate.getTime(), beginDateAfter.getTime());
+	}
+
+	private long diffMinute(long begin, long end){
+		if(begin > end){
+			return -1;
+		}
+		return (end - begin)/1000/60;
+	}
+
+
+	private boolean compareTime(String begin, String end) throws ParseException {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+		return simpleDateFormat.parse(begin).getTime() > simpleDateFormat.parse(begin).getTime();
+	}
+}