Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  测试

WebRoot/WEB-INF/reportlets/czdzmxbb2.cpt

 <?xml version="1.0" encoding="UTF-8"?>
-<WorkBook xmlVersion="20151125" releaseVersion="8.0.0">
+<WorkBook xmlVersion="20170720" releaseVersion="9.0.0">
 <TableDataMap>
 <TableData name="财政到账明细" class="com.fr.data.impl.DBTableData">
 <Parameters>
@@ -137,6 +137,16 @@
     		  ${if(len(zsdw2) == 0,"","and spjlb.tjfw = '" + zsdw2 + "'")}
  order by slbh asc]]></Query>
 </TableData>
+<TableData name="Test" class="com.fr.data.impl.DBTableData">
+<Parameters/>
+<Attributes maxMemRowCount="-1"/>
+<Connection class="com.fr.data.impl.NameDatabaseConnection">
+<DatabaseName>
+<![CDATA[zsb]]></DatabaseName>
+</Connection>
+<Query>
+<![CDATA[select * from xmxxb where rownum < 4]]></Query>
+</TableData>
 </TableDataMap>
 <ReportWebAttr>
 <ServerPrinter/>
@@ -166,7 +176,7 @@
 </Location>
 <ToolBar>
 <Widget class="com.fr.report.web.button.page.First">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -175,7 +185,7 @@
 <![CDATA[first]]></IconName>
 </Widget>
 <Widget class="com.fr.report.web.button.page.Previous">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -184,12 +194,12 @@
 <![CDATA[previous]]></IconName>
 </Widget>
 <Widget class="com.fr.report.web.button.page.PageNavi">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 </Widget>
 <Widget class="com.fr.report.web.button.page.Next">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -198,7 +208,7 @@
 <![CDATA[next]]></IconName>
 </Widget>
 <Widget class="com.fr.report.web.button.page.Last">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -207,7 +217,7 @@
 <![CDATA[last]]></IconName>
 </Widget>
 <Widget class="com.fr.report.web.button.FlashPrint">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -216,7 +226,7 @@
 <![CDATA[flashprint]]></IconName>
 </Widget>
 <Widget class="com.fr.report.web.button.Print">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -226,7 +236,7 @@
 <PrintButtons/>
 </Widget>
 <Widget class="com.fr.report.web.button.Export">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -236,7 +246,7 @@
 <Buttons pdf="true" excelP="true" excelO="true" excelS="true" word="true" image="true" html="true"/>
 </Widget>
 <Widget class="com.fr.report.web.button.Email">
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -262,13 +272,13 @@
 <RowHeight defaultValue="723900">
 <![CDATA[723900,723900,1295400,1143000,1333500,1371600,1104900,1485900,1440000,1371600,1143000,723900]]></RowHeight>
 <ColumnWidth defaultValue="2743200">
-<![CDATA[2247900,4686300,11696700,4191000,3200400,4229100,3276600,3695700,3657600,2743200,2743200]]></ColumnWidth>
+<![CDATA[2247900,4686300,11696700,4267200,4191000,3200400,4229100,3276600,3695700,3657600,2743200,2743200]]></ColumnWidth>
 <CellElementList>
 <C c="0" r="0">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="0" r="2" cs="9" s="0">
+<C c="0" r="2" cs="10" s="0">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=mid($TIME, 1, 4) + "年" + mid($TIME, 6, 7) + "月" + "城市基础设施配套费财政到账明细报表"]]></Attributes>
@@ -285,7 +295,7 @@
 <C c="1" r="3" cs="2" s="2">
 <O t="Formula" class="Formula">
 <Attributes>
-<![CDATA[=sql("zsb", "select zsdw  from zsdw where zsdm  = '" + $zsdw + "' ", 1, 1)+"  "+$zsdw1+$zsdw2]]></Attributes>
+<![CDATA[=sql("zsb", "select zsdw  from zsdw where zsdm  = '" + $zsdw + "' ", 1, 1) + "  " + $zsdw1 + $zsdw2]]></Attributes>
 </O>
 <PrivilegeControl/>
 <HighlightList>
@@ -294,7 +304,7 @@
 <![CDATA[条件属性1]]></Name>
 <Condition class="com.fr.data.condition.FormulaCondition">
 <Formula>
-<![CDATA[len($zsdw)=0]]></Formula>
+<![CDATA[len($zsdw) = 0]]></Formula>
 </Condition>
 <HighlightAction class="com.fr.report.cell.cellattr.highlight.ValueHighlightAction">
 <O>
@@ -304,10 +314,6 @@
 </HighlightList>
 <Expand/>
 </C>
-<C c="3" r="3">
-<PrivilegeControl/>
-<Expand/>
-</C>
 <C c="4" r="3">
 <PrivilegeControl/>
 <Expand/>
@@ -324,7 +330,11 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="3" s="3">
+<C c="8" r="3">
+<PrivilegeControl/>
+<Expand/>
+</C>
+<C c="9" r="3" s="3">
 <O>
 <![CDATA[单位：平方米,元]]></O>
 <PrivilegeControl/>
@@ -348,43 +358,49 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="3" r="4" s="5">
+<C c="3" r="4" s="6">
 <O>
-<![CDATA[建筑面积]]></O>
+<![CDATA[缴款人]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
 <C c="4" r="4" s="5">
 <O>
-<![CDATA[审批日期]]></O>
+<![CDATA[建筑面积]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
 <C c="5" r="4" s="5">
 <O>
-<![CDATA[财政到账]]></O>
+<![CDATA[审批日期]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
 <C c="6" r="4" s="5">
 <O>
-<![CDATA[到账日期]]></O>
+<![CDATA[财政到账]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
 <C c="7" r="4" s="5">
 <O>
+<![CDATA[到账日期]]></O>
+<PrivilegeControl/>
+<Expand/>
+</C>
+<C c="8" r="4" s="5">
+<O>
 <![CDATA[缴费凭证单号]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="4" s="6">
+<C c="9" r="4" s="7">
 <O>
 <![CDATA[缴款书编号]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="0" r="5" s="7">
+<C c="0" r="5" s="8">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=seq()]]></Attributes>
@@ -392,7 +408,7 @@
 <PrivilegeControl/>
 <Expand leftParentDefault="false" left="B6"/>
 </C>
-<C c="1" r="5" s="8">
+<C c="1" r="5" s="9">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="SLBH"/>
 <Condition class="com.fr.data.condition.ListCondition"/>
@@ -405,7 +421,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="2" r="5" s="8">
+<C c="2" r="5" s="9">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="JSDWMC"/>
 <Complex/>
@@ -415,7 +431,13 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="3" r="5" s="9">
+<C c="3" r="5" s="10">
+<O>
+<![CDATA[Test.G(LIANXIREN)]]></O>
+<PrivilegeControl/>
+<Expand dir="1"/>
+</C>
+<C c="4" r="5" s="11">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="JZMJ"/>
 <Complex/>
@@ -425,7 +447,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="4" r="5" s="8">
+<C c="5" r="5" s="9">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="SHSJ"/>
 <Complex/>
@@ -435,7 +457,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="5" r="5" s="10">
+<C c="6" r="5" s="12">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="SALARY"/>
 <Complex/>
@@ -445,7 +467,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="6" r="5" s="8">
+<C c="7" r="5" s="9">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="RKDATE"/>
 <Complex/>
@@ -455,7 +477,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="7" r="5" s="8">
+<C c="8" r="5" s="9">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="ZSLXDBH"/>
 <Complex/>
@@ -465,7 +487,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="8" r="5" s="11">
+<C c="9" r="5" s="13">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="PJBM"/>
 <Complex/>
@@ -475,45 +497,49 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="0" r="6" cs="3" s="12">
+<C c="0" r="6" cs="3" s="14">
 <O>
 <![CDATA[当月审批项目缴费小计]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="3" r="6" s="13">
+<C c="3" r="6" s="10">
+<PrivilegeControl/>
+<Expand/>
+</C>
+<C c="4" r="6" s="15">
 <O t="Formula" class="Formula">
 <Attributes>
-<![CDATA[=sum(D6)]]></Attributes>
+<![CDATA[=sum(E6)]]></Attributes>
 </O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="4" r="6" s="8">
+<C c="5" r="6" s="9">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="5" r="6" s="14">
+<C c="6" r="6" s="16">
 <O t="Formula" class="Formula">
 <Attributes>
-<![CDATA[=sum(F6)]]></Attributes>
+<![CDATA[=sum(G6)]]></Attributes>
 </O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="6" r="6" s="8">
+<C c="7" r="6" s="9">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="6" s="15">
+<C c="8" r="6" s="10">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="6" s="11">
+<C c="9" r="6" s="13">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="0" r="7" s="7">
+<C c="0" r="7" s="8">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=seq()]]></Attributes>
@@ -521,7 +547,7 @@
 <PrivilegeControl/>
 <Expand leftParentDefault="false" left="C8"/>
 </C>
-<C c="1" r="7" s="8">
+<C c="1" r="7" s="9">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="SLBH"/>
 <Complex/>
@@ -531,7 +557,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="2" r="7" s="8">
+<C c="2" r="7" s="9">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="JSDWMC"/>
 <Complex/>
@@ -541,7 +567,11 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="3" r="7" s="9">
+<C c="3" r="7" s="10">
+<PrivilegeControl/>
+<Expand/>
+</C>
+<C c="4" r="7" s="11">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="JZMJ"/>
 <Complex/>
@@ -551,7 +581,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="4" r="7" s="8">
+<C c="5" r="7" s="9">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="SHSJ"/>
 <Complex/>
@@ -561,7 +591,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="5" r="7" s="10">
+<C c="6" r="7" s="12">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="SALARY"/>
 <Complex/>
@@ -571,7 +601,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="6" r="7" s="8">
+<C c="7" r="7" s="9">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="RKDATE"/>
 <Complex/>
@@ -581,7 +611,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="7" r="7" s="8">
+<C c="8" r="7" s="9">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="ZSLXDBH"/>
 <Complex/>
@@ -591,7 +621,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="8" r="7" s="11">
+<C c="9" r="7" s="13">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="PJBM"/>
 <Complex/>
@@ -601,7 +631,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="0" r="8" s="7">
+<C c="0" r="8" s="8">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=seq()]]></Attributes>
@@ -609,7 +639,7 @@
 <PrivilegeControl/>
 <Expand leftParentDefault="false" left="B9"/>
 </C>
-<C c="1" r="8" s="8">
+<C c="1" r="8" s="9">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="SLBH"/>
 <Complex/>
@@ -619,7 +649,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="2" r="8" s="8">
+<C c="2" r="8" s="9">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="DWMC"/>
 <Complex/>
@@ -629,7 +659,11 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="3" r="8" s="8">
+<C c="3" r="8" s="10">
+<PrivilegeControl/>
+<Expand/>
+</C>
+<C c="4" r="8" s="9">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="CSMJ"/>
 <Complex/>
@@ -639,11 +673,11 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="4" r="8" s="8">
+<C c="5" r="8" s="9">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="5" r="8" s="10">
+<C c="6" r="8" s="12">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="SALARY"/>
 <Complex/>
@@ -653,7 +687,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="6" r="8" s="8">
+<C c="7" r="8" s="9">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="RKDATE"/>
 <Complex/>
@@ -663,11 +697,11 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="7" r="8">
+<C c="8" r="8">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="8" s="11">
+<C c="9" r="8" s="13">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="PJBM"/>
 <Complex/>
@@ -677,95 +711,103 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="0" r="9" cs="3" s="12">
+<C c="0" r="9" cs="3" s="14">
 <O>
 <![CDATA[以往审批结转缴费小计]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="3" r="9" s="13">
+<C c="3" r="9" s="10">
+<PrivilegeControl/>
+<Expand/>
+</C>
+<C c="4" r="9" s="15">
 <O t="Formula" class="Formula">
 <Attributes>
-<![CDATA[=sum(D8)]]></Attributes>
+<![CDATA[=sum(E8)]]></Attributes>
 </O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="4" r="9" s="16">
+<C c="5" r="9" s="17">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="5" r="9" s="14">
+<C c="6" r="9" s="16">
 <O t="Formula" class="Formula">
 <Attributes>
-<![CDATA[=sum(F8) + sum(F9)]]></Attributes>
+<![CDATA[=sum(G8) + sum(G9)]]></Attributes>
 </O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="6" r="9" s="8">
+<C c="7" r="9" s="9">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="9" s="8">
+<C c="8" r="9" s="9">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="9" s="11">
+<C c="9" r="9" s="13">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="0" r="10" cs="3" s="17">
+<C c="0" r="10" cs="3" s="18">
 <O>
 <![CDATA[当月配套费缴费合计]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="3" r="10" s="18">
+<C c="3" r="10" s="19">
+<PrivilegeControl/>
+<Expand/>
+</C>
+<C c="4" r="10" s="20">
 <O t="Formula" class="Formula">
 <Attributes>
-<![CDATA[=sum(D7, D10)]]></Attributes>
+<![CDATA[=sum(E7, E10)]]></Attributes>
 </O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="4" r="10" s="19">
+<C c="5" r="10" s="21">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="5" r="10" s="20">
+<C c="6" r="10" s="22">
 <O t="Formula" class="Formula">
 <Attributes>
-<![CDATA[=sum(F7, F10)]]></Attributes>
+<![CDATA[=sum(G7, G10)]]></Attributes>
 </O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="6" r="10" s="19">
+<C c="7" r="10" s="21">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="10" s="19">
+<C c="8" r="10" s="21">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="10" s="21">
+<C c="9" r="10" s="23">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="2" r="12" s="22">
+<C c="2" r="12" s="24">
 <O>
 <![CDATA[制表人]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="3" r="12">
+<C c="4" r="12">
 <O>
 <![CDATA[制表日期]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="5" r="12">
+<C c="6" r="12">
 <O>
 <![CDATA[负责人]]></O>
 <PrivilegeControl/>
@@ -795,18 +837,19 @@
 <PrivilegeControl/>
 </Report>
 <ReportParameterAttr>
-<Attributes showWindow="true" delayPlaying="false" windowPosition="1" align="0"/>
+<Attributes showWindow="true" delayPlaying="false" windowPosition="1" align="0" useParamsTemplate="false"/>
 <PWTitle>
 <![CDATA[参数]]></PWTitle>
 <ParameterUI class="com.fr.form.main.parameter.FormParameterUI">
+<Parameters/>
 <Layout class="com.fr.form.ui.container.WParameterLayout">
 <WidgetName name="para"/>
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Margin top="1" left="1" bottom="1" right="1"/>
 <Border>
-<border style="0" color="-723724" type="0" borderStyle="0"/>
+<border style="0" color="-723724" borderRadius="0" type="0" borderStyle="0"/>
 <WidgetTitle>
 <O>
 <![CDATA[新建标题]]></O>
@@ -820,7 +863,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.ComboBox">
 <WidgetName name="zsdw1"/>
-<WidgetAttr invisible="true">
+<WidgetAttr invisible="true" description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Dictionary class="com.fr.data.impl.CustomDictionary">
@@ -846,7 +889,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.ComboBox">
 <WidgetName name="zsdw2"/>
-<WidgetAttr invisible="true">
+<WidgetAttr invisible="true" description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Dictionary class="com.fr.data.impl.CustomDictionary">
@@ -870,7 +913,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.Label">
 <WidgetName name="tjqy"/>
-<WidgetAttr invisible="true">
+<WidgetAttr invisible="true" description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <widgetValue>
@@ -886,7 +929,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.Label">
 <WidgetName name="Labeltime"/>
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <widgetValue>
@@ -902,7 +945,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.parameter.FormSubmitButton">
 <WidgetName name="Search"/>
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Text>
@@ -915,7 +958,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.DateEditor">
 <WidgetName name="time"/>
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <DateAttr format="yyyy-MM"/>
@@ -929,7 +972,7 @@
 <Widget class="com.fr.form.ui.container.WAbsoluteLayout$BoundsWidget">
 <InnerWidget class="com.fr.form.ui.Label">
 <WidgetName name="Labelzsdw"/>
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <widgetValue>
@@ -1010,7 +1053,7 @@ if(value == "sf"){
 </JavaScript>
 </Listener>
 <WidgetName name="zsdw"/>
-<WidgetAttr>
+<WidgetAttr description="">
 <PrivilegeControl/>
 </WidgetAttr>
 <Dictionary class="com.fr.data.impl.CustomDictionary">
@@ -1039,16 +1082,18 @@ if(value == "sf"){
 <BoundsAttr x="341" y="25" width="130" height="21"/>
 </Widget>
 <Sorted sorted="false"/>
-<Display display="true"/>
-<DelayDisplayContent delay="false"/>
-<Position position="0"/>
-<Design_Width design_width="960"/>
 <MobileWidgetList>
 <Widget widgetName="time"/>
 <Widget widgetName="zsdw"/>
-<Widget widgetName="zsdw1"/>
 <Widget widgetName="zsdw2"/>
+<Widget widgetName="Search"/>
 </MobileWidgetList>
+<Display display="true"/>
+<DelayDisplayContent delay="false"/>
+<UseParamsTemplate use="false"/>
+<Position position="0"/>
+<Design_Width design_width="960"/>
+<NameTagModified/>
 <WidgetNameTagMap>
 <NameTag name="zsdw" tag="征收单位:"/>
 <NameTag name="zsdw1" tag="统计区域:"/>
@@ -1115,6 +1160,13 @@ if(value == "sf"){
 <Background name="NullBackground"/>
 <Border>
 <Top style="5"/>
+</Border>
+</Style>
+<Style horizontal_alignment="0" imageLayout="1">
+<FRFont name="SimSun" style="0" size="72"/>
+<Background name="NullBackground"/>
+<Border>
+<Top style="5"/>
 <Bottom style="1"/>
 <Left style="1"/>
 <Right style="5"/>
@@ -1140,6 +1192,16 @@ if(value == "sf"){
 <Right style="1"/>
 </Border>
 </Style>
+<Style imageLayout="1">
+<FRFont name="SimSun" style="0" size="72"/>
+<Background name="NullBackground"/>
+<Border>
+<Top style="1"/>
+<Bottom style="1"/>
+<Left style="1"/>
+<Right style="1"/>
+</Border>
+</Style>
 <Style horizontal_alignment="0" imageLayout="1">
 <Format class="com.fr.base.CoreDecimalFormat">
 <![CDATA[#0.00]]></Format>
@@ -1208,16 +1270,6 @@ if(value == "sf"){
 <Right style="1"/>
 </Border>
 </Style>
-<Style imageLayout="1">
-<FRFont name="SimSun" style="0" size="72"/>
-<Background name="NullBackground"/>
-<Border>
-<Top style="1"/>
-<Bottom style="1"/>
-<Left style="1"/>
-<Right style="1"/>
-</Border>
-</Style>
 <Style horizontal_alignment="4" imageLayout="1">
 <FRFont name="SimSun" style="0" size="72"/>
 <Background name="NullBackground"/>
@@ -1238,6 +1290,13 @@ if(value == "sf"){
 <Right style="1"/>
 </Border>
 </Style>
+<Style imageLayout="1">
+<FRFont name="SimSun" style="0" size="72"/>
+<Background name="NullBackground"/>
+<Border>
+<Bottom style="5"/>
+</Border>
+</Style>
 <Style horizontal_alignment="0" imageLayout="1">
 <Format class="com.fr.base.CoreDecimalFormat">
 <![CDATA[#0.00]]></Format>
@@ -1288,6 +1347,10 @@ if(value == "sf"){
 <Border/>
 </Style>
 </StyleList>
-<DesignerVersion DesignerVersion="IAA"/>
+<DesignerVersion DesignerVersion="JAA"/>
 <PreviewType PreviewType="1"/>
+<TemplateID/>
+<TemplateIdAttMark class="com.fr.base.iofileattr.TemplateIdAttrMark">
+<TemplateIdAttMark TemplateId="bd6e6801-38e8-44ed-806d-33c780fc2887"/>
+</TemplateIdAttMark>
 </WorkBook>