测试修改表格

29ef7506 · 徐州 · 4a3ec2b9 · 29ef7506
Commit 29ef7506 authored Mar 06, 2023 by 徐州
Hide whitespace changes
Inline Side-by-side

Showing with 82 additions and 74 deletions

czdzmxbb2.cpt WebRoot/WEB-INF/reportlets/czdzmxbb2.cpt +82 -74

No files found.
--- a/WebRoot/WEB-INF/reportlets/czdzmxbb2.cpt
+++ b/WebRoot/WEB-INF/reportlets/czdzmxbb2.cpt
@@ -20,32 +20,27 @@
 <![CDATA[zsb]]></DatabaseName>
 </Connection>
 <Query>
-<![CDATA[select pjjx.slbh slbh,
+<![CDATA[select * from (
+    select pjjx.slbh slbh,
       pjjx.salary,
       pjjx.rkdate,
       pjjx.pjbm,
-       pjjx.jkr,
-       pjjx.jkje,
       spjlb.jsdwmc,
       spjlb.jzmj,
       spjlb.dwdm dwdm,
       to_char(spjlb.lcjssj, 'yyyy-MM-dd') shsj,
       his.zslxdbh
-  from (select *
-          from pjjx
-         where delflag = 0 and dwdm  not in ('jk','jb')
-          and rkdate='${time}') pjjx,
+  from (select * from pjjx where delflag = 0 and dwdm  not in ('jk','jb') and rkdate='${time}') pjjx,
       (select * from spjlb where delflag = 0 and dwdm  not in ('jk','jb')  ) spjlb,
       (select slbh,zslxdbh from payment_item_his  where delflag=0 and dwdm  not in ('jk','jb') ) his
 where pjjx.slbh = spjlb.slbh
 and pjjx.slbh=his.slbh
-  and pjjx.rkdate = to_char(spjlb.lcjssj, 'yyyy-MM')
-  ${if(len(zsdw) == 0,"","and spjlb.dwdm = '" + zsdw + "'")} 
+  and pjjx.rkdate = to_char(spjlb.lcjssj, 'yyyy-MM') 
+    ${if(len(zsdw) == 0,"","and spjlb.dwdm = '" + zsdw + "'")} 
      		 ${if(len(zsdw1) == 0,"","and spjlb.tjfw = '" + zsdw1 + "'")}
    		  ${if(len(zsdw2) == 0,"","and spjlb.tjfw = '" + zsdw2 + "'")}
- order by slbh asc,lcjssj asc
-
-]]></Query>
+ order by slbh asc,lcjssj asc 
+) a left join (select slbh,jkr,yjje from fstzs) b on a.slbh=b.slbh]]></Query>
 </TableData>
 <TableData name="以往审批结转缴费" class="com.fr.data.impl.DBTableData">
 <Parameters>
@@ -374,7 +369,7 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="4" s="6">
+<C c="7" r="4" s="7">
 <O>
 <![CDATA[缴款金额]]></O>
 <PrivilegeControl/>
@@ -392,13 +387,13 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="10" r="4" s="7">
+<C c="10" r="4" s="8">
 <O>
 <![CDATA[缴款书编号]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="0" r="5" s="8">
+<C c="0" r="5" s="9">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=seq()]]></Attributes>
@@ -406,7 +401,7 @@
 <PrivilegeControl/>
 <Expand leftParentDefault="false" left="B6"/>
 </C>
-<C c="1" r="5" s="9">
+<C c="1" r="5" s="10">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="SLBH"/>
 <Condition class="com.fr.data.condition.ListCondition"/>
@@ -421,7 +416,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="2" r="5" s="9">
+<C c="2" r="5" s="10">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="JSDWMC"/>
 <Complex/>
@@ -433,7 +428,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="3" r="5" s="10">
+<C c="3" r="5" s="11">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="JZMJ"/>
 <Complex/>
@@ -445,7 +440,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="4" r="5" s="9">
+<C c="4" r="5" s="10">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="SHSJ"/>
 <Complex/>
@@ -457,7 +452,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="5" r="5" s="11">
+<C c="5" r="5" s="12">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="SALARY"/>
 <Complex/>
@@ -469,7 +464,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="6" r="5" s="12">
+<C c="6" r="5" s="10">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="JKR"/>
 <Condition class="com.fr.data.condition.ListCondition"/>
@@ -484,7 +479,7 @@
 </C>
 <C c="7" r="5" s="13">
 <O t="DSColumn">
-<Attributes dsName="财政到账明细" columnName="JKJE"/>
+<Attributes dsName="财政到账明细" columnName="YJJE"/>
 <Condition class="com.fr.data.condition.ListCondition"/>
 <Complex/>
 <RG class="com.fr.report.cell.cellattr.core.group.FunctionGrouper"/>
@@ -495,7 +490,7 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="5" s="9">
+<C c="8" r="5" s="10">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="RKDATE"/>
 <Complex/>
@@ -505,7 +500,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="9" r="5" s="9">
+<C c="9" r="5" s="10">
 <O t="DSColumn">
 <Attributes dsName="财政到账明细" columnName="ZSLXDBH"/>
 <Complex/>
@@ -539,7 +534,7 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="4" r="6" s="9">
+<C c="4" r="6" s="10">
 <PrivilegeControl/>
 <Expand/>
 </C>
@@ -551,19 +546,19 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="6" r="6" s="12">
+<C c="6" r="6" s="18">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="6" s="18">
+<C c="7" r="6" s="19">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="6" s="9">
+<C c="8" r="6" s="10">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="9" r="6" s="12">
+<C c="9" r="6" s="18">
 <PrivilegeControl/>
 <Expand/>
 </C>
@@ -571,7 +566,7 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="0" r="7" s="8">
+<C c="0" r="7" s="9">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=seq()]]></Attributes>
@@ -579,7 +574,7 @@
 <PrivilegeControl/>
 <Expand leftParentDefault="false" left="C8"/>
 </C>
-<C c="1" r="7" s="9">
+<C c="1" r="7" s="10">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="SLBH"/>
 <Complex/>
@@ -589,7 +584,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="2" r="7" s="9">
+<C c="2" r="7" s="10">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="JSDWMC"/>
 <Complex/>
@@ -599,7 +594,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="3" r="7" s="10">
+<C c="3" r="7" s="11">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="JZMJ"/>
 <Complex/>
@@ -609,7 +604,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="4" r="7" s="9">
+<C c="4" r="7" s="10">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="SHSJ"/>
 <Complex/>
@@ -619,7 +614,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="5" r="7" s="11">
+<C c="5" r="7" s="12">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="SALARY"/>
 <Complex/>
@@ -629,15 +624,15 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="6" r="7" s="12">
+<C c="6" r="7" s="18">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="7" s="18">
+<C c="7" r="7" s="19">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="7" s="9">
+<C c="8" r="7" s="10">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="RKDATE"/>
 <Complex/>
@@ -647,7 +642,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="9" r="7" s="9">
+<C c="9" r="7" s="10">
 <O t="DSColumn">
 <Attributes dsName="以往审批结转缴费" columnName="ZSLXDBH"/>
 <Complex/>
@@ -667,7 +662,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="0" r="8" s="8">
+<C c="0" r="8" s="9">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=seq()]]></Attributes>
@@ -675,7 +670,7 @@
 <PrivilegeControl/>
 <Expand leftParentDefault="false" left="B9"/>
 </C>
-<C c="1" r="8" s="9">
+<C c="1" r="8" s="10">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="SLBH"/>
 <Complex/>
@@ -685,7 +680,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="2" r="8" s="9">
+<C c="2" r="8" s="10">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="DWMC"/>
 <Complex/>
@@ -695,7 +690,7 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="3" r="8" s="9">
+<C c="3" r="8" s="10">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="CSMJ"/>
 <Complex/>
@@ -705,11 +700,11 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="4" r="8" s="9">
+<C c="4" r="8" s="10">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="5" r="8" s="11">
+<C c="5" r="8" s="12">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="SALARY"/>
 <Complex/>
@@ -719,15 +714,15 @@
 <PrivilegeControl/>
 <Expand dir="0"/>
 </C>
-<C c="6" r="8" s="12">
+<C c="6" r="8" s="18">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="8" s="18">
+<C c="7" r="8" s="19">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="8" s="9">
+<C c="8" r="8" s="10">
 <O t="DSColumn">
 <Attributes dsName="缓缴" columnName="RKDATE"/>
 <Complex/>
@@ -765,7 +760,7 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="4" r="9" s="19">
+<C c="4" r="9" s="20">
 <PrivilegeControl/>
 <Expand/>
 </C>
@@ -777,19 +772,19 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="6" r="9" s="12">
+<C c="6" r="9" s="18">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="9" s="18">
+<C c="7" r="9" s="19">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="9" s="9">
+<C c="8" r="9" s="10">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="9" r="9" s="9">
+<C c="9" r="9" s="10">
 <PrivilegeControl/>
 <Expand/>
 </C>
@@ -797,13 +792,13 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="0" r="10" cs="3" s="20">
+<C c="0" r="10" cs="3" s="21">
 <O>
 <![CDATA[当月配套费缴费合计]]></O>
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="3" r="10" s="21">
+<C c="3" r="10" s="22">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=sum(D7, D10)]]></Attributes>
@@ -811,11 +806,11 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="4" r="10" s="22">
+<C c="4" r="10" s="23">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="5" r="10" s="23">
+<C c="5" r="10" s="24">
 <O t="Formula" class="Formula">
 <Attributes>
 <![CDATA[=sum(F7, F10)]]></Attributes>
@@ -823,27 +818,27 @@
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="6" r="10" s="24">
+<C c="6" r="10" s="25">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="7" r="10" s="25">
+<C c="7" r="10" s="26">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="8" r="10" s="22">
+<C c="8" r="10" s="23">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="9" r="10" s="22">
+<C c="9" r="10" s="23">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="10" r="10" s="26">
+<C c="10" r="10" s="27">
 <PrivilegeControl/>
 <Expand/>
 </C>
-<C c="2" r="12" s="27">
+<C c="2" r="12" s="28">
 <O>
 <![CDATA[制表人]]></O>
 <PrivilegeControl/>
@@ -1214,6 +1209,16 @@ if(value == "sf"){
 <Border>
 <Top style="5"/>
 <Bottom style="1"/>
+<Right style="1"/>
+</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"/>
 </Border>
 </Style>
 <Style horizontal_alignment="0" imageLayout="1">
@@ -1270,17 +1275,7 @@ if(value == "sf"){
 <Right style="1" color="-16777216"/>
 </Border>
 </Style>
-<Style imageLayout="1">
-<FRFont name="SimSun" style="0" size="72"/>
-<Background name="NullBackground"/>
-<Border>
-<Top style="1" color="-16777216"/>
-<Bottom style="1" color="-16777216"/>
-<Left style="1" color="-16777216"/>
-<Right style="1" color="-16777216"/>
-</Border>
-</Style>
-<Style imageLayout="1">
+<Style horizontal_alignment="0" imageLayout="1">
 <Format class="com.fr.base.CoreDecimalFormat">
 <![CDATA[#,##0.00]]></Format>
 <FRFont name="SimSun" style="0" size="72"/>
@@ -1288,6 +1283,7 @@ if(value == "sf"){
 <Border>
 <Top style="1"/>
 <Bottom style="1"/>
+<Left style="1"/>
 </Border>
 </Style>
 <Style horizontal_alignment="0" imageLayout="1">
@@ -1340,6 +1336,17 @@ if(value == "sf"){
 <Border>
 <Top style="1"/>
 <Bottom style="1"/>
+<Left style="1"/>
+<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"/>
 </Border>
 </Style>
 <Style horizontal_alignment="4" imageLayout="1">
@@ -1412,6 +1419,7 @@ if(value == "sf"){
 <Border>
 <Top style="1"/>
 <Bottom style="5"/>
+<Left style="1"/>
 </Border>
 </Style>
 <Style horizontal_alignment="0" imageLayout="1">