diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp
index 5dc236322..54bf8a455 100644
--- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp
+++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp
@@ -27,12 +27,41 @@
 	function save(HAS_GPS){
 		setItemValue(0,0,"contract_id", "<%=ContractId%>");
 		setItemValue(0,0,"flow_unid", "<%=flowunid%>");
-		as_save(0,"alert('数据保存成功');");
+		var infoStatus = this.getInfoIsnull();
+		if(infoStatus){
+			as_save(0);
+		}else{
+			as_delete("myiframe0");
+		}
 		if(HAS_GPS=="Y"||HAS_GPS=="N"){
 			var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.contract.check.ContractInfoCheck","saveGps","contractid=<%=ContractId%>,hasGps="+HAS_GPS);
-
 		};
-		
+		alert("数据保存成功");
+	}
+	//判断页面是否输入发票信息
+	function getInfoIsnull(){
+		var infoStatus = false;
+		var invoiceCode = getItemValue(0,getRow(0),"Invoice_code");
+		if(invoiceCode!=null && invoiceCode!='undefined' && invoiceCode.length>0){
+			return true;
+		}
+		var invoiceNumber = getItemValue(0,getRow(0),"Invoice_number");
+		if(invoiceNumber!=null && invoiceNumber!='undefined' && invoiceNumber.length>0){
+			return true;
+		}
+		var invoiceDate = getItemValue(0,getRow(0),"Invoice_date");
+		if(invoiceDate!=null && invoiceDate!='undefined' && invoiceDate.length>0){
+			return true;
+		}
+		var invoiceMoney = getItemValue(0,getRow(0),"Invoice_money");
+		if(invoiceMoney!=null && invoiceMoney!='undefined' && invoiceMoney.length>0){
+			return true;
+		}
+		var taxDue = getItemValue(0,getRow(0),"tax_due");
+		if(taxDue!=null && taxDue!='undefined' && taxDue.length>0){
+			return true;
+		}
+		return infoStatus;
 	}
 	$(function(){
 		//setItemReadOnly(0,0,"INVOICE_DATE",true);
diff --git a/src_sql/鎶曚骇SQL/V20200521/tft_20200521.sql b/src_sql/鎶曚骇SQL/V20200521/tft_20200521.sql
new file mode 100644
index 000000000..2f98a15c5
--- /dev/null
+++ b/src_sql/鎶曚骇SQL/V20200521/tft_20200521.sql
@@ -0,0 +1,20 @@
+-- 付款申请发票信息改成非必填
+delete from awe_do_library where dono='LB_INVOICE_INFO_TEMP' and colindex='1030';
+Insert Into 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 ('LB_INVOICE_INFO_TEMP','1030','1030','1','O','Invoice_code','Invoice_code','String','','发票代码','','1','Text','1','1','','','','32','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/04/29 11:11:48','0','','1','','','','');
+delete from awe_do_library where dono='LB_INVOICE_INFO_TEMP' and colindex='1040';
+Insert Into 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 ('LB_INVOICE_INFO_TEMP','1040','1040','1','O','Invoice_number','Invoice_number','String','','发票号码','','1','Text','1','1','','','','32','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/04/29 11:11:42','0','','1','','','','');
+delete from awe_do_library where dono='LB_INVOICE_INFO_TEMP' and colindex='1050';
+Insert Into 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 ('LB_INVOICE_INFO_TEMP','1050','1050','1','O','Invoice_date','Invoice_date','String','','开票日期','','1','Date','3','2','','','','100','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/04/29 11:11:56','0','','1','','','','');
+delete from awe_do_library where dono='LB_INVOICE_INFO_TEMP' and colindex='1060';
+Insert Into 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 ('LB_INVOICE_INFO_TEMP','1060','1060','1','O','Invoice_money','Invoice_money','String','','开票金额','','1','Text','2','1','','','','20','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/04/29 11:12:07','0','','1','','','','');
+delete from awe_do_library where dono='LB_INVOICE_INFO_TEMP' and colindex='1070';
+Insert Into 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 ('LB_INVOICE_INFO_TEMP','1070','1070','1','O','tax_due','tax_due','String','','税金','','1','Text','2','1','','','','20','1','0','0','1','1',1,'0','','','SYS_DESIGNER','2020/03/16 11:42:17','SYS_Designer','2020/04/24 16:06:23','0','','1','','','','');
+delete from SCENARIO_MODEL where scenarioid='付款申请(汽车)' and modelid='0040';
+Insert Into SCENARIO_MODEL (scenarioid,modelid,sortno,modelname,modeldescribe,modeltype,subtypeno,runcondition,status,nopassdeal,passdeal,passmessage,nopassmessage,executescript,remark,inputuser,inputorg,inputtime,updateuser,updatetime,groupid,modelkind,bizviewer) Values ('付款申请(汽车)','0040','0040','发票信息是否填写','','20','','','1','20',null,'发票信息已填写','发票信息未填写！','SELECT CASE WHEN id IS NOT NULL THEN ''true'' ELSE ''false'' END FROM lb_Invoice_info_temp WHERE flow_unid=''#{ObjectNo}''','',null,null,null,null,null,null,null,null);
+
+
+
+
+
+
+
diff --git a/src_tenwa/com/tenwa/apzl/comm/CopyLbCarLicensePlateTempToForm.java b/src_tenwa/com/tenwa/apzl/comm/CopyLbCarLicensePlateTempToForm.java
index 8de7fc550..41df2ee90 100644
--- a/src_tenwa/com/tenwa/apzl/comm/CopyLbCarLicensePlateTempToForm.java
+++ b/src_tenwa/com/tenwa/apzl/comm/CopyLbCarLicensePlateTempToForm.java
@@ -6,6 +6,9 @@ import java.util.Map;
 import jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO;
 import jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO_TEMP;
 
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.SqlObject;
 import com.amarsoft.awe.util.Transaction;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
 import com.tenwa.flow.baseBussion.BaseBussiness;
@@ -20,6 +23,11 @@ public class CopyLbCarLicensePlateTempToForm extends BaseBussiness{
 		fromCondtion.put("FLOWUNID", flowunid);
 		Map<String,String> toCondtion = new HashMap<String,String>();
 		toCondtion.put("contract_id", contract_id);
+		BizObject lclpit = JBOFactory.createBizObjectQuery(LB_CAR_LICENSE_PLATE_INFO_TEMP.CLASS_NAME, "FLOWUNID=:flowunid").setParameter("flowunid", flowunid).getSingleResult(false);
+		if(lclpit !=null && lclpit.getAttribute("plate_number") !=null ){
+			Sqlca.executeSQL(new SqlObject("UPDATE LB_EQUIPMENT_CAR SET LICENSE_PLATE_NUMBER='"+lclpit.getAttribute("plate_number").getString()+"' WHERE contract_id='"+contract_id+"'"));
+		}
+		
 		DataOperatorUtil.copySingleJBO(LB_CAR_LICENSE_PLATE_INFO_TEMP.CLASS_NAME, fromCondtion, LB_CAR_LICENSE_PLATE_INFO.CLASS_NAME, toCondtion, null, Sqlca);
 		return "true";
 	}
diff --git a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/妗ｆ褰掓。鎶ヨ〃鏂�.xml b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/妗ｆ褰掓。鎶ヨ〃鏂�.xml
index 72f1adfae..60c8d4915 100644
--- a/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/妗ｆ褰掓。鎶ヨ〃鏂�.xml
+++ b/鎶ヨ〃/姹借溅绫绘姤琛ㄤ簩/妗ｆ褰掓。鎶ヨ〃鏂�.xml
@@ -36,25 +36,51 @@
             <enname>archive</enname>
             <reportDataSource>2c9023815726a036015726a496b00001</reportDataSource>
             <queryType>COMPLEXSQL</queryType>
-            <sql>SELECT di.distributor_name,lci.contract_number,lcs.status_name,LUL.CUSTOMER_NAME,lec.frame_number,lfi.fact_date,lcl.PLATE_NUMBER,LEC.REGDATE,
+            <sql>SELECT lci.subjectname,di.distributor_name,lci.contract_number,lcs.itemname AS status_name,LUL.CUSTOMER_NAME,lec.frame_number,lfi.fact_date,lcl.PLATE_NUMBER,LEC.REGDATE,
 CASE WHEN lcl.is_pledge='Y'THEN '瀹屾垚' ELSE '鏈畬鎴�' END AS is_pledge,
-lcl.pledge_date,lfa.ARCHIVING_PERSON,DATEDIFF(lcl.pledge_date,lfi.fact_date) AS pledge_plan,
+lcl.pledge_date,lfa.ARCHIVING_PERSON,lfa.ARCHIVING_CABINET_NO asarchivingCabinetNo ,lfa.FILE_NUMBER as fileNumber,DATEDIFF(lcl.pledge_date,lfi.fact_date) AS pledge_plan,
 CASE WHEN lcl.is_delay='Y' THEN '鎻愪氦寤惰繜鐢宠' WHEN lcl.is_delay='N' THEN '鏈彁浜ゅ欢杩熺敵璇�' ELSE lcl.is_delay END AS is_delay,
 lcl.delay_date,DATEDIFF(lcl.delay_date,lfi.fact_date) AS delay_plan,
-CASE WHEN IFNULL(lfa.ARCHIVING_TIME,'鏈畬鎴�')=lfa.ARCHIVING_TIME THEN '褰掓。瀹屾垚' ELSE '褰掓。鏈畬鎴�' END AS is_ARCHIVING,
-lfa.ARCHIVING_TIME,lfm.ARCHIVING_TIME as times
+IFNULL(cl.itemname,'鏈綊妗�') AS is_ARCHIVING,
+LEFT(en.endtime,10) AS ARCHIVING_TIME,CASE WHEN (lfm.ALLHANDOVERSTATUS='all' OR lfm.ALLHANDOVERSTATUS='绯荤粺褰掓。') THEN lfm.ARCHIVING_TIME ELSE '' END  AS times
 FROM lb_contract_info lci
 LEFT JOIN LB_FILE_ARCHIVING_INFO lfa ON lci.id=lfa.contract_id
 LEFT JOIN lb_equipment_car lec ON lec.contract_id=lci.id
 LEFT JOIN distributor_info di ON di.distributor_no=lci.distributor_id
 LEFT JOIN lb_car_license_plate_info lcl ON lcl.contract_id=lci.id 
 LEFT JOIN lc_fund_income lfi ON lfi.contract_id=lci.id AND lfi.fee_type='feetype10' AND lfi.settle_method&lt;&gt;'settlemethod11' AND lfi.pay_status='have_paid' LEFT JOIN lb_union_lessee lul ON lul.PROJECT_ID = lci.PROJECT_ID
-left join lb_contract_status lcs on lcs.status_code = lci.contract_status
-left join LB_FILE_MAILARCHIVING_INFO lfm on lfm.contract_id=lci.id
+LEFT JOIN (SELECT bs.contract_number,cl.itemname
+	FROM business_status AS bs,
+	(
+	SELECT contract_number,MAX(inputtime) AS inputtime FROM business_status WHERE contract_number LIKE 'BQAP(%' GROUP BY contract_number
+	) AS bb,code_library cl
+	WHERE bs.inputtime=bb.inputtime AND bb.contract_number = bs.contract_number AND bs.business_status=cl.itemno AND cl.codeno='BusinessStatus'
+) lcs ON lcs.contract_number=lci.contract_no
+LEFT JOIN LB_FILE_MAILARCHIVING_INFO lfm ON lfm.contract_id=lci.id LEFT JOIN code_library cl ON cl.codeno='allHandOverStatus' AND cl.itemno=lfm.ALLHANDOVERSTATUS LEFT JOIN (SELECT ft.endtime AS endtime,fbo.contract_id AS contract_id
+ FROM flow_task ft  LEFT JOIN flow_bussiness_object fbo ON fbo.flow_unid=ft.objectno WHERE ft.flowno='MortgageFileFlow' AND ft.phaseno='1000' GROUP BY fbo.contract_id) en ON en.contract_id=lci.id
 WHERE lci.businesstype='1' AND (lci.contract_status='31' OR lci.contract_status='100')
 ORDER BY lfi.fact_date DESC</sql>
             <sqlParamValue></sqlParamValue>
             <columns>
+                <column>
+                    <id>2c9c81b969188a33016fa447da2e04b4</id>
+                    <name>subjectname</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>涓讳綋鍚嶇О</label>
+                    <enLabel>subjectname</enLabel>
+                    <width>210</width>
+                    <position>22</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
                 <column>
                     <id>2c9c81b969188a33016ce6c61e6e00dc</id>
                     <name>distributor_name</name>
@@ -63,7 +89,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>缁忛攢鍟嗗悕绉�</label>
                     <enLabel>distributor_name</enLabel>
                     <width>100</width>
-                    <position>18</position>
+                    <position>23</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -82,7 +108,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鍚堝悓缂栧彿</label>
                     <enLabel>contract_number</enLabel>
                     <width>150</width>
-                    <position>19</position>
+                    <position>24</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -101,7 +127,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鍚堝悓鐘舵��</label>
                     <enLabel>status_name</enLabel>
                     <width>100</width>
-                    <position>20</position>
+                    <position>25</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -120,7 +146,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鎵跨浜哄鍚�</label>
                     <enLabel>CUSTOMER_NAME</enLabel>
                     <width>100</width>
-                    <position>21</position>
+                    <position>26</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -139,7 +165,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>杞︽灦鍙�</label>
                     <enLabel>frame_number</enLabel>
                     <width>150</width>
-                    <position>22</position>
+                    <position>27</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -158,7 +184,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>璧风鏃ユ湡</label>
                     <enLabel>fact_date</enLabel>
                     <width>100</width>
-                    <position>23</position>
+                    <position>28</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -177,7 +203,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>杞︾墝鍙�</label>
                     <enLabel>PLATE_NUMBER</enLabel>
                     <width>100</width>
-                    <position>24</position>
+                    <position>29</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -196,7 +222,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>涓婄墝鏃ユ湡</label>
                     <enLabel>REGDATE</enLabel>
                     <width>100</width>
-                    <position>25</position>
+                    <position>30</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -215,7 +241,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鏄惁鎶垫娂瀹屾垚</label>
                     <enLabel>is_pledge</enLabel>
                     <width>100</width>
-                    <position>26</position>
+                    <position>31</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -234,7 +260,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鎶垫娂鏃ユ湡</label>
                     <enLabel>pledge_date</enLabel>
                     <width>100</width>
-                    <position>27</position>
+                    <position>32</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -253,7 +279,45 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>褰掓。鎿嶄綔鍛�</label>
                     <enLabel>ARCHIVING_PERSON</enLabel>
                     <width>100</width>
-                    <position>28</position>
+                    <position>33</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>2c9c81b671a16ace01723e0266980004</id>
+                    <name>asarchivingCabinetNo</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>妗ｆ鏌滃彿</label>
+                    <enLabel>asarchivingCabinetNo</enLabel>
+                    <width>100</width>
+                    <position>34</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>2c9c81b671a16ace01723e0266980005</id>
+                    <name>fileNumber</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>妗ｆ缂栧彿</label>
+                    <enLabel>fileNumber</enLabel>
+                    <width>100</width>
+                    <position>35</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -272,7 +336,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鎶垫娂鏃ユ湡涓庤捣绉熸棩鏈熺浉宸ぉ鏁�</label>
                     <enLabel>pledge_plan</enLabel>
                     <width>180</width>
-                    <position>29</position>
+                    <position>36</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -291,7 +355,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鏈夋棤鎻愪氦寤惰繜鐢宠</label>
                     <enLabel>is_delay</enLabel>
                     <width>120</width>
-                    <position>30</position>
+                    <position>37</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -310,7 +374,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鎻愪氦寤惰繜鐢宠鏃ユ湡</label>
                     <enLabel>delay_date</enLabel>
                     <width>120</width>
-                    <position>31</position>
+                    <position>38</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -329,26 +393,7 @@ ORDER BY lfi.fact_date DESC</sql>
                     <label>鎻愪氦寤惰繜鐢宠鏃ユ湡涓庤捣绉熸棩鏈熺浉宸ぉ鏁�</label>
                     <enLabel>delay_plan</enLabel>
                     <width>220</width>
-                    <position>32</position>
-                    <isVisible>true</isVisible>
-                    <color></color>
-                    <isCountTotal>false</isCountTotal>
-                    <isCountSubTotal>false</isCountSubTotal>
-                    <isGroupby>false</isGroupby>
-                    <isMerge>false</isMerge>
-                    <action></action>
-                    <actionParamters></actionParamters>
-                    <actionCondition></actionCondition>
-                </column>
-                <column>
-                    <id>2c9c81b969188a33016ce6c61e6e00d9</id>
-                    <name>is_ARCHIVING</name>
-                    <columnDataType>STRING</columnDataType>
-                    <formater></formater>
-                    <label>褰掓。鏄惁瀹屾垚</label>
-                    <enLabel>is_ARCHIVING</enLabel>
-                    <width>100</width>
-                    <position>33</position>
+                    <position>39</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -364,10 +409,29 @@ ORDER BY lfi.fact_date DESC</sql>
                     <name>ARCHIVING_TIME</name>
                     <columnDataType>STRING</columnDataType>
                     <formater></formater>
-                    <label>褰掓。瀹屾垚鏃ユ湡 </label>
+                    <label>鍚庣潱瀹屾垚鏃ユ湡</label>
                     <enLabel>ARCHIVING_TIME</enLabel>
                     <width>100</width>
-                    <position>34</position>
+                    <position>40</position>
+                    <isVisible>true</isVisible>
+                    <color></color>
+                    <isCountTotal>false</isCountTotal>
+                    <isCountSubTotal>false</isCountSubTotal>
+                    <isGroupby>false</isGroupby>
+                    <isMerge>false</isMerge>
+                    <action></action>
+                    <actionParamters></actionParamters>
+                    <actionCondition></actionCondition>
+                </column>
+                <column>
+                    <id>2c9c81b969188a33016ce6c61e6e00d9</id>
+                    <name>is_ARCHIVING</name>
+                    <columnDataType>STRING</columnDataType>
+                    <formater></formater>
+                    <label>褰掓。鐘舵��</label>
+                    <enLabel>is_ARCHIVING</enLabel>
+                    <width>100</width>
+                    <position>41</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -383,10 +447,10 @@ ORDER BY lfi.fact_date DESC</sql>
                     <name>times</name>
                     <columnDataType>STRING</columnDataType>
                     <formater></formater>
-                    <label>閭瘎褰掓。鏃堕棿</label>
+                    <label>褰掓。瀹屾垚鏃ユ湡</label>
                     <enLabel>times</enLabel>
                     <width>100</width>
-                    <position>35</position>
+                    <position>42</position>
                     <isVisible>true</isVisible>
                     <color></color>
                     <isCountTotal>false</isCountTotal>
@@ -452,6 +516,16 @@ ORDER BY lfi.fact_date DESC</sql>
                     <htmlType>TEXT</htmlType>
                     <position>4</position>
                 </filter>
+                <filter>
+                    <id>2c9c81b969188a33016fa447da2e04b3</id>
+                    <name>subjectname</name>
+                    <enname>subjectname</enname>
+                    <label>涓讳綋鍚嶇О</label>
+                    <filterType>FILTER</filterType>
+                    <dbType>STRING</dbType>
+                    <htmlType>TEXT</htmlType>
+                    <position>5</position>
+                </filter>
             </filters>
             <filterExpress></filterExpress>
             <pageSize>20</pageSize>