From 99eb091857a72a0defd0a5bdd2185d1d2d8da573 Mon Sep 17 00:00:00 2001
From: WS <1143478319@qq.com>
Date: 星期四, 07 九月 2023 18:26:14 +0800
Subject: [PATCH] 提交熏蒸备案
---
src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java | 99 ++++
src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml | 649 +++++++++++++++++++--------------
src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java | 2
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java | 5
src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java | 60 +++
src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java | 10
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 300 +++++++++++++++
7 files changed, 838 insertions(+), 287 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
index adba87b..201b3a5 100644
--- a/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
+++ b/src/main/java/com/fzzy/async/fzzy40/Fzzy40SyncService13.java
@@ -81,6 +81,8 @@
//鐔忚捀浣滀笟淇℃伅鍚屾
fzzySync1306.syncData(param.getDeptId(), param.getStart(), param.getEnd());
+ fzzySync1023.syncData(param.getDeptId(), param.getStart(), param.getEnd());
+
}
}
diff --git a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
index 11991fa..2691245 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
+++ b/src/main/java/com/fzzy/otherview/gd2022/GdApi1023.view.xml
@@ -6,134 +6,318 @@
<DataType name="dtMain">
<Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023</Property>
<PropertyDef name="xzbm">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐔忚捀缂栫爜</Property>
</PropertyDef>
<PropertyDef name="kqdm">
- <Property/>
+ <Property></Property>
+ <Property name="label">搴撳尯浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="tbrq">
<Property name="dataType">Date</Property>
+ <Property name="label">濉姤鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="dwdm">
- <Property/>
+ <Property></Property>
+ <Property name="label">鍗曚綅浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="sqxzrq">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐢宠鐔忚捀鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="fzr">
- <Property/>
+ <Property></Property>
+ <Property name="label">璐熻矗浜�</Property>
</PropertyDef>
<PropertyDef name="fzrdh">
- <Property/>
+ <Property></Property>
+ <Property name="label">璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="xcfzr">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐜板満璐熻矗浜�</Property>
</PropertyDef>
<PropertyDef name="xcfzrzw">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐜板満璐熻矗浜鸿亴鍔�</Property>
</PropertyDef>
<PropertyDef name="xcfzrdh">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐜板満璐熻矗浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="tbr">
- <Property/>
+ <Property></Property>
+ <Property name="label">濉〃浜�</Property>
</PropertyDef>
<PropertyDef name="tbrdh">
- <Property/>
+ <Property></Property>
+ <Property name="label">濉〃浜虹數璇�</Property>
</PropertyDef>
<PropertyDef name="sfszjjxd">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏄惁璁剧疆璀︽垝绾�(涓�)</Property>
</PropertyDef>
<PropertyDef name="sfszjjxx">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏄惁璁剧疆璀︽垝绾�(瑗�)</Property>
</PropertyDef>
<PropertyDef name="sfszjjxn">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏄惁璁剧疆璀︽垝绾�(鍗�)</Property>
</PropertyDef>
<PropertyDef name="sfszjjxb">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏄惁璁剧疆璀︽垝绾�(鍖�)</Property>
</PropertyDef>
<PropertyDef name="ssxzzystqybqk">
- <Property/>
+ <Property></Property>
+ <Property name="label">瀹炴柦鐔忚捀浣滀笟鏃跺ぉ姘旈鎶ユ儏鍐�</Property>
</PropertyDef>
<PropertyDef name="xzssgcap">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐔忚捀瀹夋帓鍙婂疄鏂借繃绋�</Property>
</PropertyDef>
<PropertyDef name="aqfhjyjcccs">
- <Property/>
+ <Property></Property>
+ <Property name="label">瀹夊叏闃叉姢鍙婂簲鎬ュ缃帾鏂�</Property>
</PropertyDef>
<PropertyDef name="xzzysx">
- <Property/>
+ <Property></Property>
+ <Property name="label">鐔忚捀娉ㄦ剰浜嬮」</Property>
</PropertyDef>
<PropertyDef name="fileStorageId">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏂囦欢瀛樺偍ID</Property>
</PropertyDef>
<PropertyDef name="yjmc">
- <Property/>
+ <Property></Property>
+ <Property name="label">鑽墏鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="yjlx">
- <Property/>
+ <Property></Property>
+ <Property name="label">鑽墏绫诲瀷/鍨嬪彿</Property>
</PropertyDef>
<PropertyDef name="yjyxqz">
- <Property/>
+ <Property></Property>
+ <Property name="label">鑽墏鏈夋晥鏈熻嚦</Property>
</PropertyDef>
<PropertyDef name="lqsl">
<Property name="dataType">Double</Property>
+ <Property name="label">棰嗗彇鏁伴噺(鍏枻)</Property>
</PropertyDef>
<PropertyDef name="sysbjfs">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏂借嵂璁惧鍙婃柟寮�</Property>
</PropertyDef>
<PropertyDef name="zcdd">
- <Property/>
+ <Property></Property>
+ <Property name="label">鏆傚瓨鍦扮偣</Property>
</PropertyDef>
<PropertyDef name="lqr">
- <Property/>
+ <Property></Property>
+ <Property name="label">棰嗗彇浜�</Property>
</PropertyDef>
<PropertyDef name="lqrq">
<Property name="dataType">Date</Property>
+ <Property name="label">棰嗗彇鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="czbz">
- <Property/>
+ <Property></Property>
+ <Property name="label">鎿嶄綔鏍囧織</Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
+ <Property></Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ <Reference name="dtPeople">
+ <Property name="dataType">[dtPeople]</Property>
+ <Property name="parameter">
+ <Entity>
+ <Property name="xzbm">$${this.xzbm}</Property>
+ <Property name="kqdm">$${this.kqdm}</Property>
+ <Property name="tbrq">$${this.tbrq}</Property>
+ </Entity>
+ </Property>
+ <Property name="dataProvider">gDApi1023PR#peopleList</Property>
+ </Reference>
+ <Reference name="dtWay">
+ <Property name="dataProvider">gDApi1023PR#wayList</Property>
+ <Property name="dataType">[dtWay]</Property>
+ </Reference>
+ <Reference name="dtDtl">
+ <Property name="dataProvider">gDApi1023PR#dtlList</Property>
+ <Property name="dataType">[dtDtl]</Property>
+ </Reference>
+ </DataType>
+ <DataType name="dtPeople">
+ <Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023People</Property>
+ <PropertyDef name="xm">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zw">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="zyzg">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="stzk">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xzrwfg">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sfwb">
<Property/>
</PropertyDef>
</DataType>
- <DataType name="dtGBArea">
- <Property name="creationType">com.fzzy.api.entity.GbArea</Property>
+ <DataType name="dtWay">
+ <Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023Way</Property>
+ <PropertyDef name="xznd">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="mbsj">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="xzfs">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="sqfs">
+ <Property/>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtDtl">
+ <Property name="creationType">com.fzzy.otherview.gd2022.dto.GdApi1023Dtl</Property>
+ <PropertyDef name="cfdm">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lspzdm">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lsxzdm">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lsdjdm">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="lssl">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="sf">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="zz">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="lw">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="cw">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="cnsd">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="clfs">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="rkrq">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="hc">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="cldjpd">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="ldtj">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="kjtj">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="lddwyyl">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="kjdwyyl">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="zyyl">
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="qmx">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="jhxzksrq">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
+ <PropertyDef name="jhxzjsrq">
+ <Property name="dataType">Date</Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
+ <Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">whjlApi1101PR#listData</Property>
+ <Property name="dataProvider">gDApi1023PR#listData</Property>
</DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
- <Property name="exClassName">bg-color</Property>
- <Property name="height">55</Property>
- <Property name="contentOverflow">hidden</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button layoutConstraint="left">
+ <ToolBar>
+ <ToolBarLabel>
+ <Property name="text">宸ュ叿鏍忥細</Property>
+ <Property name="style">
+ <Property name="font-weight">bold</Property>
+ </Property>
+ </ToolBarLabel>
+ <ToolBarButton>
+ <ClientEvent name="onClick">view.get("#dsMain").flushAsync();
+</ClientEvent>
+ <Property name="caption">鍒锋柊</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ <Property name="width">100</Property>
+ <Property name="exClassName">toolbar-button-push</Property>
+ </ToolBarButton>
+ <ToolBarButton>
<ClientEvent name="onClick">view.get("#dsMain").insert();
view.get("#dialogMain").show();</ClientEvent>
- <Property name="iconClass">fa fa-plus</Property>
<Property name="caption">鏂板</Property>
- <Property name="exClassName">btn-default</Property>
- </Button>
- <Button layoutConstraint="left">
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="width">100</Property>
+ <Property name="exClassName">toolbar-button</Property>
+ </ToolBarButton>
+ <ToolBarButton>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
if(cur){
view.get("#dialogMain").show();
}else{
$alert("璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�");
-}</ClientEvent>
- <Property name="caption">缂栬緫</Property>
+}
+</ClientEvent>
+ <Property name="caption">淇敼</Property>
<Property name="iconClass">fa fa-pencil</Property>
- <Property name="exClassName">btn-warm</Property>
- </Button>
- <Button layoutConstraint="left">
+ <Property name="width">100</Property>
+ <Property name="exClassName">toolbar-button-warm</Property>
+ </ToolBarButton>
+ <Separator/>
+ <ToolBarButton>
+ <ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
+if(cur){
+ view.get("#ajaxDelUpdate").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ } else{
+ cur.set("czbz","d");
+ }
+ });
+}else{
+ $alert("璇峰嬀閫夐渶瑕佹爣璁板垹闄ょ殑鏁版嵁锛�");
+}
+</ClientEvent>
+ <Property name="caption">鏍囪鍒犻櫎</Property>
+ <Property name="iconClass">fa fa-minus</Property>
+ <Property name="exClassName">toolbar-button-warn</Property>
+ <Property name="width">100</Property>
+ </ToolBarButton>
+ <ToolBarButton>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
if(cur){
view.get("#ajaxDel").set("parameter",cur).execute(function(result){
@@ -146,17 +330,13 @@
}else{
$alert("璇峰嬀閫夐渶瑕佸垹闄ょ殑鏁版嵁锛�");
}</ClientEvent>
- <Property name="caption">鍒犻櫎</Property>
+ <Property name="caption">鐩存帴鍒犻櫎</Property>
<Property name="iconClass">fa fa-minus</Property>
- <Property name="exClassName">btn-warn</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsMain").flushAsync();</ClientEvent>
- <Property name="caption">鍒锋柊</Property>
- <Property name="iconClass">fa fa-search</Property>
- <Property name="exClassName">btn-flush</Property>
- </Button>
- <Button layoutConstraint="left">
+ <Property name="exClassName">toolbar-button-warn</Property>
+ <Property name="width">100</Property>
+ </ToolBarButton>
+ <Separator/>
+ <ToolBarButton>
<ClientEvent name="onClick">var select = view.get("#dgMain").get("selection");
if(select && select.length > 0){
view.get("#ajaxPush").set("parameter",select).execute(function(result){
@@ -168,74 +348,79 @@
}</ClientEvent>
<Property name="caption">鎵嬪姩涓婁紶</Property>
<Property name="iconClass">fa fa-hand-o-up</Property>
- <Property name="exClassName">btn-default</Property>
- </Button>
- <Button layoutConstraint="right">
- <ClientEvent name="onClick">//鏄剧ず璁板綍
-view.get("#iFrame").reload();
-view.get("#dialogLog").show();</ClientEvent>
+ <Property name="exClassName">toolbar-button-push</Property>
+ <Property name="width">100</Property>
+ </ToolBarButton>
+ <Fill/>
+ <ToolBarButton>
<Property name="caption">涓婁紶璁板綍</Property>
<Property name="iconClass">fa fa-bars</Property>
- <Property name="exClassName">btn-flush</Property>
- </Button>
- </Container>
- <Container layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <DataGrid id="dgMain">
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
+ <Property name="exClassName">toolbar-button</Property>
+ </ToolBarButton>
+ </ToolBar>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
if(data){
view.get("#dialogMain").show();
}</ClientEvent>
- <Property name="dataSet">dsMain</Property>
- <Property name="selectionMode">multiRows</Property>
- <Property name="readOnly">true</Property>
- <RowNumColumn/>
- <RowSelectorColumn>
- <Property name="caption">涓婁紶</Property>
- </RowSelectorColumn>
- <DataColumn name="jlqybh">
- <Property name="property">jlqybh</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="jlqymc">
- <Property name="property">jlqymc</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="jlqytyshxydm">
- <Property name="property">jlqytyshxydm</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="jlqylx">
- <Property name="property">jlqylx</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="qyxz">
- <Property name="property">qyxz</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="gsdjzch">
- <Property name="property">gsdjzch</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="sfjbjlcbzg">
- <Property name="property">sfjbjlcbzg</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="fddbr">
- <Property name="property">fddbr</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="sfyx">
- <Property name="property">sfyx</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- </Container>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="selectionMode">multiRows</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <RowSelectorColumn>
+ <Property name="caption">涓婁紶</Property>
+ </RowSelectorColumn>
+ <DataColumn name="xzbm">
+ <Property name="property">xzbm</Property>
+ <Property name="align">center</Property>
+ <Property name="width">280</Property>
+ </DataColumn>
+ <DataColumn name="kqdm">
+ <Property name="property">kqdm</Property>
+ <Property name="width">280</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="tbrq">
+ <Property name="property">tbrq</Property>
+ <Property name="width">280</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="dwdm">
+ <Property name="property">dwdm</Property>
+ <Property name="width">280</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sqxzrq">
+ <Property name="property">sqxzrq</Property>
+ <Property name="width">280</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="fzr">
+ <Property name="property">fzr</Property>
+ <Property name="width">280</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="fzrdh">
+ <Property name="property">fzrdh</Property>
+ <Property name="width">280</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="czbz">
+ <Property name="property">czbz</Property>
+ <Property name="width">280</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="zhgxsj">
+ <Property name="property">zhgxsj</Property>
+ <Property name="width">280</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
<Dialog id="dialogMain">
<Property name="width">85%</Property>
<Property name="closeable">false</Property>
<Property name="iconClass">fa fa-sliders</Property>
- <Property name="caption">鍐涚伯浼佷笟淇℃伅</Property>
+ <Property name="caption">鐔忚捀澶囨淇℃伅</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -261,172 +446,148 @@
<Property name="labelPosition">top</Property>
<Property name="labelSeparator">:</Property>
<AutoFormElement>
- <Property name="name">jlqybh</Property>
- <Property name="property">jlqybh</Property>
+ <Property name="name">xzbm</Property>
+ <Property name="property">xzbm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jlqymc</Property>
- <Property name="property">jlqymc</Property>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jlqyjc</Property>
- <Property name="property">jlqyjc</Property>
+ <Property name="name">tbrq</Property>
+ <Property name="property">tbrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jlzzjgdm</Property>
- <Property name="property">jlzzjgdm</Property>
+ <Property name="name">dwdm</Property>
+ <Property name="property">dwdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jlqytyshxydm</Property>
- <Property name="property">jlqytyshxydm</Property>
+ <Property name="name">sqxzrq</Property>
+ <Property name="property">sqxzrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">jlqylx</Property>
- <Property name="property">jlqylx</Property>
+ <Property name="name">fzr</Property>
+ <Property name="property">fzr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qyjjlx</Property>
- <Property name="property">qyjjlx</Property>
+ <Property name="name">fzrdh</Property>
+ <Property name="property">fzrdh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qyxz</Property>
- <Property name="property">qyxz</Property>
+ <Property name="name">xcfzr</Property>
+ <Property name="property">xcfzr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">djzclx</Property>
- <Property name="property">djzclx</Property>
+ <Property name="name">xcfzrzw</Property>
+ <Property name="property">xcfzrzw</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">gsdjzch</Property>
- <Property name="property">gsdjzch</Property>
+ <Property name="name">xcfzrdh</Property>
+ <Property name="property">xcfzrdh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfjbjlcbzg</Property>
- <Property name="property">sfjbjlcbzg</Property>
- <Property name="trigger">listDropYN</Property>
+ <Property name="name">tbr</Property>
+ <Property name="property">tbr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">fddbr</Property>
- <Property name="property">fddbr</Property>
+ <Property name="name">tbrdh</Property>
+ <Property name="property">tbrdh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qydz</Property>
- <Property name="property">qydz</Property>
+ <Property name="name">sfszjjxd</Property>
+ <Property name="property">sfszjjxd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qydh</Property>
- <Property name="property">qydh</Property>
+ <Property name="name">sfszjjxx</Property>
+ <Property name="property">sfszjjxx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qycz</Property>
- <Property name="property">qycz</Property>
+ <Property name="name">sfszjjxn</Property>
+ <Property name="property">sfszjjxn</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qydzyx</Property>
- <Property name="property">qydzyx</Property>
+ <Property name="name">sfszjjxb</Property>
+ <Property name="property">sfszjjxb</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qywz</Property>
- <Property name="property">qywz</Property>
+ <Property name="name">ssxzzystqybqk</Property>
+ <Property name="property">ssxzzystqybqk</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qyyzbm</Property>
- <Property name="property">qyyzbm</Property>
+ <Property name="name">xzssgcap</Property>
+ <Property name="property">xzssgcap</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qyjd</Property>
- <Property name="property">qyjd</Property>
+ <Property name="name">aqfhjyjcccs</Property>
+ <Property name="property">aqfhjyjcccs</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qywd</Property>
- <Property name="property">qywd</Property>
+ <Property name="name">xzzysx</Property>
+ <Property name="property">xzzysx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qyxzqhmc</Property>
- <Property name="property">qyxzqhmc</Property>
- <Property name="trigger">cddGbArea</Property>
+ <Property name="name">fileStorageId</Property>
+ <Property name="property">fileStorageId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qyxzqhdm</Property>
- <Property name="property">qyxzqhdm</Property>
- <Property name="trigger">cddGbArea</Property>
+ <Property name="name">yjmc</Property>
+ <Property name="property">yjmc</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">khyh</Property>
- <Property name="property">khyh</Property>
+ <Property name="name">yjlx</Property>
+ <Property name="property">yjlx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">yhzh</Property>
- <Property name="property">yhzh</Property>
+ <Property name="name">yjyxqz</Property>
+ <Property name="property">yjyxqz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">yhxydj</Property>
- <Property name="property">yhxydj</Property>
+ <Property name="name">lqsl</Property>
+ <Property name="property">lqsl</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">gdzc</Property>
- <Property name="property">gdzc</Property>
+ <Property name="name">sysbjfs</Property>
+ <Property name="property">sysbjfs</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">zczb</Property>
- <Property name="property">zczb</Property>
+ <Property name="name">zcdd</Property>
+ <Property name="property">zcdd</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">zc</Property>
- <Property name="property">zc</Property>
+ <Property name="name">lqr</Property>
+ <Property name="property">lqr</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">qycyrys</Property>
- <Property name="property">qycyrys</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sfyx</Property>
- <Property name="property">sfyx</Property>
- <Property name="trigger">listDropYN</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
+ <Property name="name">lqrq</Property>
+ <Property name="property">lqrq</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -435,8 +596,23 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtPeople</Property>
+ <Property name="property">dtPeople</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtWay</Property>
+ <Property name="property">dtWay</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dtDtl</Property>
+ <Property name="property">dtDtl</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -457,79 +633,6 @@
<AjaxAction id="ajaxPush">
<Property name="service">whjlApi1101PR#pushData</Property>
</AjaxAction>
- <CustomDropDown id="cddGbArea">
- <Property name="assignmentMap">qyxzqhdm=code,qyxzqhmc=name</Property>
- <Property name="height">500</Property>
- <Property name="minHeight">500</Property>
- <Property name="maxHeight">500</Property>
- <Property name="width">400</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsGBArea">
- <Property name="dataProvider">gbAreaPR#findByCode</Property>
- <Property name="dataType">[dtGBArea]</Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key2">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key2.value");
-view.get("#dsGBArea").set("parameter",{key:key}).flushAsync();</ClientEvent>
- <Property name="iconClass">fa fa-search</Property>
- <Property name="caption">鏌ヨ</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsGBArea.data:#");
-if (data) {
- view.get("#cddGbArea").close(data.toJSON());
-}</ClientEvent>
- <Property name="caption">纭畾</Property>
- <Property name="iconClass">fa fa-check</Property>
- </Button>
- </Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsGBArea.data:#");
-if(data){
- view.get("#cddGbArea").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsGBArea</Property>
- <Property name="readOnly">true</Property>
- <DataColumn name="code">
- <Property name="property">code</Property>
- </DataColumn>
- <DataColumn name="name">
- <Property name="property">name</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- </CustomDropDown>
- <Dialog id="dialogLog">
- <Property name="width">90%</Property>
- <Property name="height">90%</Property>
- <Property name="caption">涓婁紶璁板綍</Property>
- <Property name="iconClass">fa fa-sliders</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
- <Property name="caption">鍏抽棴</Property>
- <Property name="iconClass">fa fa-times</Property>
- </Button>
- </Buttons>
- <Children>
- <Container>
- <IFrame id="iFrame">
- <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
- <Property name="userData">
- <Entity>
- <Property name="deptId">deptId</Property>
- </Entity>
- </Property>
- </IFrame>
- </Container>
- </Children>
- <Tools/>
- </Dialog>
<ListDropDown id="listDropYN">
<Property name="items">鏄�,鍚�</Property>
</ListDropDown>
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
index ebab59f..cef79ec 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023.java
@@ -51,13 +51,21 @@
private String fileStorageId; //鏂囦欢瀛樺偍 ID
private String yjmc; //鑽墏鍚嶇О
private String yjlx; //鑽墏绫诲瀷/鍨嬪彿
- private String yjyxqz; //鑽墏鏈夋晥鏈熻嚦
+
+ @JSONField(format = "yyyy-MM-dd")
+ private Date yjyxqz; //鑽墏鏈夋晥鏈熻嚦
+
private Double lqsl; //棰嗗彇鏁伴噺(鍏枻)
private String sysbjfs; //鏂借嵂璁惧鍙婃柟寮�
private String zcdd; //鏆傚瓨鍦扮偣
private String lqr; //棰嗗彇浜�
+
+ @JSONField(format = "yyyy-MM-dd")
private Date lqrq; //棰嗗彇鏃堕棿
+
private String czbz; //鎿嶄綔鏍囧織
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj; //鏈�鍚庢洿鏂版椂闂�
diff --git a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java
index 93a980a..83ca124 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/dto/GdApi1023Dtl.java
@@ -1,5 +1,6 @@
package com.fzzy.otherview.gd2022.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -26,6 +27,8 @@
private Double cw; //浠撴俯
private Double cnsd; //浠撳唴婀垮害
private String clfs; //鍌ㄧ伯鏂瑰紡
+
+ @JSONField(format = "yyyy-MM-dd")
private Date rkrq; //鍏ュ簱鏃ユ湡
private String hc; //瀹宠櫕
private String cldjpd; //铏伯绛夌骇鍒ゅ畾
@@ -35,7 +38,9 @@
private Double kjdwyyl; //绌洪棿鍗曚綅鐢ㄨ嵂閲�
private Double zyyl; //鎬荤敤鑽噺
private String qmx; //姘斿瘑鎬�
+ @JSONField(format = "yyyy-MM-dd")
private Date jhxzksrq; //璁″垝鐔忚捀寮�濮嬫棩鏈�
+ @JSONField(format = "yyyy-MM-dd")
private Date jhxzjsrq; //璁″垝鐔忚捀缁撴潫鏃ユ湡
diff --git a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
index fb3bca6..9f9f736 100644
--- a/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
+++ b/src/main/java/com/fzzy/otherview/gd2022/pr/GDApi1023PR.java
@@ -7,13 +7,17 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.gd2022.dto.GdApi1023;
+import com.fzzy.otherview.gd2022.dto.GdApi1023Dtl;
+import com.fzzy.otherview.gd2022.dto.GdApi1023People;
+import com.fzzy.otherview.gd2022.dto.GdApi1023Way;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1101;
+import com.fzzy.push.gd2022.ApiCodeConstant;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
/**
* 骞夸笢鐪佹帴鍙�-1023 鐔忚捀澶囨
@@ -21,7 +25,7 @@
* @author czt
* @date 2023/8/17
*/
-@Component
+@Component(value = "gDApi1023PR")
public class GDApi1023PR {
@Autowired
@@ -32,28 +36,97 @@
private ApiInfoDataRep apiInfoDataRep;
/**
- * 鑾峰彇鍒楄〃淇℃伅
- * whjlApi1101PR#listData
+ * 鑾峰彇鐔忚捀澶囨涓昏〃淇℃伅
+ * gDApi1023PR#listData
*
* @return
*/
@DataProvider
- public List<GdApi1023> listData() {
- List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1101);
+ public List<GdApi1023> listData(Map<String, Object> param) {
+
+ List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(ApiCodeConstant.API_1023);
if(null == result ||result.isEmpty()){
return null;
}
List<GdApi1023> list = new ArrayList<>();
GdApi1023 gbApi1023;
for (ApiInfoData infoData : result) {
-// GdApi1023 gdApi1023= JSONObject.parseObject(infoData.getData(), GdApi1023.class);
-// gdApi1023.setKqdm(infoData.getKqdm());
-// gdApi1023.setCzbz(infoData.getCzbz());
-// gdApi1023.setUpdateTime(infoData.getUpdateTime());
-// gdApi1023.setBizId(infoData.getDataId());
-// list.add(GdApi1023);
+ GdApi1023 gdApi1023= JSONObject.parseObject(infoData.getData(), GdApi1023.class);
+ list.add(gdApi1023);
}
return list;
}
+ /**
+ * 鑾峰彇鐔忚捀浣滀笟浜哄憳淇℃伅琛�
+ * gDApi1023PR#peopleList
+ *
+ */
+ @DataProvider
+ public List<GdApi1023People> peopleList(Map<String, Object> param) throws Exception {
+ String xzbm = (String) param.get("xzbm");
+ String deptId = (String) param.get("deptId");
+ String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
+ String id = xzbm + deptId + tbrq;
+
+ List<ApiInfoData> infoData = apiInfoDataRep.getDataByDataId(id);
+ if(null == infoData || infoData.isEmpty()){
+ return null;
+ }
+ GdApi1023 gdApi1023= JSONObject.parseObject(infoData.get(0).getData(), GdApi1023.class);
+ if(null == gdApi1023){
+ return null;
+ }
+
+ return gdApi1023.getPeoples();
+ }
+
+ /**
+ * 鑾峰彇鐔忚捀澶囨鏂瑰紡琛ㄨ〃淇℃伅
+ * gDApi1023PR#wayList
+ *
+ */
+ @DataProvider
+ public List<GdApi1023Way> wayList(Map<String, Object> param) throws Exception {
+ String xzbm = (String) param.get("xzbm");
+ String deptId = (String) param.get("deptId");
+ String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
+ String id = xzbm + deptId + tbrq;
+
+ List<ApiInfoData> infoData = apiInfoDataRep.getDataByDataId(id);
+ if(null == infoData || infoData.isEmpty()){
+ return null;
+ }
+ GdApi1023 gdApi1023= JSONObject.parseObject(infoData.get(0).getData(), GdApi1023.class);
+ if(null == gdApi1023){
+ return null;
+ }
+
+ return gdApi1023.getWays();
+ }
+
+ /**
+ * 瀹炴柦鐔忚捀浣滀笟鐨勫偍绮伯鎯呮槑缁嗚〃
+ * gDApi1023PR#dtlList
+ *
+ */
+ @DataProvider
+ public List<GdApi1023Dtl> dtlList(Map<String, Object> param) throws Exception {
+ String xzbm = (String) param.get("xzbm");
+ String deptId = (String) param.get("deptId");
+ String tbrq = DateFormatUtils.format((Date) param.get("tbrq"), "yyyyMMdd");
+ String id = xzbm + deptId + tbrq;
+
+ List<ApiInfoData> infoData = apiInfoDataRep.getDataByDataId(id);
+ if(null == infoData || infoData.isEmpty()){
+ return null;
+ }
+ GdApi1023 gdApi1023= JSONObject.parseObject(infoData.get(0).getData(), GdApi1023.class);
+ if(null == gdApi1023){
+ return null;
+ }
+
+ return gdApi1023.getDtls();
+ }
+
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 03999ed..6b7d07f 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -1,6 +1,7 @@
package com.fzzy.push.sh2023;
import com.alibaba.fastjson.JSON;
+import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -10,6 +11,10 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
+import com.fzzy.push.gd2022.GD2022HttpClientUtil;
+import com.fzzy.push.gd2022.dto.GD2022AuthToken;
+import com.fzzy.push.gd2022.dto.GD2022ResponseDto;
+import com.fzzy.push.gd2022.dto.GDFinanceDto;
import com.fzzy.push.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -67,6 +72,94 @@
@Override
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
+ if (Constant.API_CODE_1501.equals(param.getInteId())
+ || Constant.API_CODE_1502.equals(param.getInteId())
+ || Constant.API_CODE_1503.equals(param.getInteId())) {
+ return pushFinanceData(param, conf, data);
+ }
+ String inteId = param.getInteId();
+ String kqdm = param.getKqdm();
+ //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
+ List<Api1102> api1102List = api1102Rep.findPushData(conf.getKqdm());
+ try {
+ if (null == conf) {
+ conf = apiCommonService.getConf(kqdm);
+ }
+
+ //娣诲姞鏃ュ織
+ ApiLog apiLog = new ApiLog();
+ apiLog.setId(ContextUtil.getUUID());
+ apiLog.setInteId(inteId);
+ String jsonData = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
+ log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
+
+ if (StringUtils.isEmpty(inteId)) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+ apiLog.setData(jsonData);
+ apiLog.setKqdm(kqdm);
+ apiLog.setUploadTime(new Date());
+
+ if (conf == null) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+
+ //灏佽鎺ㄩ�佹暟鎹�
+ SH2023ReqDto reqData = new SH2023ReqDto();
+ reqData.setId(ContextUtil.getUUID());
+ //鑾峰彇韬唤ID锛屽嵆琛屾斂鍖哄垝鐮�
+ if (null == api1102List || api1102List.isEmpty()) {
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒拌韩浠絀D");
+ apiLog.setStatus(99);
+ apiLog.setResult("娌℃湁鑾峰彇鍒拌韩浠絀D");
+ apiLogRep.save(apiLog);
+ return responseDto;
+ }
+ reqData.setUid(api1102List.get(0).getXzqhdm());
+ //鎸囦护id
+ reqData.setOrderid(param.getOrderid());
+ //韬唤绛惧悕锛屽鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡杩涜MD5绠楁硶绛惧悕
+ reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPublicKey()));
+ //鏁版嵁鎬绘潯鏁�
+ List<Object> list = (List<Object>) data;
+ reqData.setDatalength(list.size());
+ //鏁版嵁杩涜SM4鍔犲瘑
+ reqData.setData(jsonData);
+ //鎽樿锛屾暟鎹富浣撶殑MD5鍊�
+ reqData.setDigst(MyMD5Util.encrypt(jsonData));
+
+ SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData, conf);
+ apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+ apiLog.setResult(responseDto.getResult());
+ apiLogRep.save(apiLog);
+ ResponseDto resd = new ResponseDto();
+ resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
+ resd.setMsg(responseDto.getResult());
+
+ return resd;
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return new ResponseDto(99, e.getMessage());
+ }
+ }
+
+ /**
+ * 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
+ * @param param
+ * @param conf
+ * @param data
+ * @return
+ */
+ private ResponseDto pushFinanceData(ApiParam param, ApiConfs conf, Object data) {
+
String inteId = param.getInteId();
String kqdm = param.getKqdm();
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
@@ -805,4 +898,211 @@
}
+ private List<SHFinanceDto> copyApi1503(Api1503 data) {
+ Api1503 api1503 = data;
+ List<SHFinanceDto> list = new ArrayList<>();
+ SHFinanceDto shFinanceDto = new SHFinanceDto();
+ shFinanceDto.setDwdm(api1503.getDwdm());
+ shFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
+ shFinanceDto.setBbm("03");
+ shFinanceDto.setCzbz(api1503.getCzbz());
+ shFinanceDto.setZhgxsj(DateFormatUtils.format(api1503.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+
+ paddingData(shFinanceDto, list, 1, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
+ paddingData(shFinanceDto, list, 2, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
+ paddingData(shFinanceDto, list, 3, "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
+ paddingData(shFinanceDto, list, 4, "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
+ paddingData(shFinanceDto, list, 5, "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
+ paddingData(shFinanceDto, list, 6, "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
+ paddingData(shFinanceDto, list, 7, "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
+ paddingData(shFinanceDto, list, 8, "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
+ paddingData(shFinanceDto, list, 9, "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
+ paddingData(shFinanceDto, list, 10, "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
+ paddingData(shFinanceDto, list, 11, "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
+ paddingData(shFinanceDto, list, 12, "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
+ paddingData(shFinanceDto, list, 13, "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
+ paddingData(shFinanceDto, list, 14, "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
+ paddingData(shFinanceDto, list, 15, "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
+ paddingData(shFinanceDto, list, 16, "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
+ paddingData(shFinanceDto, list, 17, "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
+ paddingData(shFinanceDto, list, 18, "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
+ paddingData(shFinanceDto, list, 19, "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
+ paddingData(shFinanceDto, list, 20, "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
+ paddingData(shFinanceDto, list, 21, "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
+ paddingData(shFinanceDto, list, 22, "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
+ paddingData(shFinanceDto, list, 23, "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
+ paddingData(shFinanceDto, list, 24, "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
+ paddingData(shFinanceDto, list, 25, "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
+ paddingData(shFinanceDto, list, 26, "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
+ paddingData(shFinanceDto, list, 27, "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
+ paddingData(shFinanceDto, list, 28, "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
+ paddingData(shFinanceDto, list, 29, "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
+ paddingData(shFinanceDto, list, 30, "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(shFinanceDto, list, 31, "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(shFinanceDto, list, 32, "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
+ paddingData(shFinanceDto, list, 33, "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
+ paddingData(shFinanceDto, list, 34, "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
+ paddingData(shFinanceDto, list, 35, "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
+ paddingData(shFinanceDto, list, 36, "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
+ paddingData(shFinanceDto, list, 37, "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
+
+ return list;
+ }
+
+ private List<SHFinanceDto> copyApi1502(Api1502 data) {
+ Api1502 api1502 = data;
+ List<SHFinanceDto> list = new ArrayList<>();
+ SHFinanceDto shFinanceDto = new SHFinanceDto();
+ shFinanceDto.setDwdm(api1502.getDwdm());
+ shFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
+ shFinanceDto.setBbm("02");
+ shFinanceDto.setCzbz(api1502.getCzbz());
+ shFinanceDto.setZhgxsj(DateFormatUtils.format(api1502.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+
+ paddingData(shFinanceDto, list, 1, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
+ paddingData(shFinanceDto, list, 2, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, 3, "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
+ paddingData(shFinanceDto, list, 4, "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
+ paddingData(shFinanceDto, list, 5, "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
+ paddingData(shFinanceDto, list, 6, "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, 7, "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
+ paddingData(shFinanceDto, list, 8, "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
+ paddingData(shFinanceDto, list, 9, "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
+ paddingData(shFinanceDto, list, 10, "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
+ paddingData(shFinanceDto, list, 11, "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, 12, "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, 13, "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, 14, "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
+ paddingData(shFinanceDto, list, 15, "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
+ paddingData(shFinanceDto, list, 16, "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
+ paddingData(shFinanceDto, list, 17, "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
+ paddingData(shFinanceDto, list, 18, "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, 19, "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, 20, "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
+ paddingData(shFinanceDto, list, 21, "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
+ paddingData(shFinanceDto, list, 22, "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
+ paddingData(shFinanceDto, list, 23, "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, 24, "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, 25, "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, 26, "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, 27, "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
+ paddingData(shFinanceDto, list, 28, "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
+ paddingData(shFinanceDto, list, 29, "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, 30, "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, 31, "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
+ paddingData(shFinanceDto, list, 32, "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
+ paddingData(shFinanceDto, list, 33, "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
+ paddingData(shFinanceDto, list, 34, "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, 35, "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, 36, "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
+ paddingData(shFinanceDto, list, 37, "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
+ paddingData(shFinanceDto, list, 38, "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
+ paddingData(shFinanceDto, list, 39, "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
+
+ return list;
+ }
+
+ private List<SHFinanceDto> copyApi1501(Api1501 data) {
+ Api1501 api1501 = data;
+ List<SHFinanceDto> list = new ArrayList<>();
+ SHFinanceDto shFinanceDto = new SHFinanceDto();
+ shFinanceDto.setDwdm(api1501.getDwdm());
+ shFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
+ shFinanceDto.setBbm("01");
+ shFinanceDto.setCzbz(api1501.getCzbz());
+ shFinanceDto.setZhgxsj(DateFormatUtils.format(api1501.getZhgxsj(), "yyyy-MM-dd HH:mm:ss"));
+
+ paddingData(shFinanceDto, list, 1, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(shFinanceDto, list, 2, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, 3, "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
+ paddingData(shFinanceDto, list, 4, "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
+ paddingData(shFinanceDto, list, 5, "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
+ paddingData(shFinanceDto, list, 6, "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
+ paddingData(shFinanceDto, list, 7, "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
+ paddingData(shFinanceDto, list, 8, "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
+ paddingData(shFinanceDto, list, 9, "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
+ paddingData(shFinanceDto, list, 10, "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
+ paddingData(shFinanceDto, list, 11, "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
+ paddingData(shFinanceDto, list, 12, "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
+ paddingData(shFinanceDto, list, 13, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
+ paddingData(shFinanceDto, list, 14, "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
+ paddingData(shFinanceDto, list, 15, "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, 16, "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(shFinanceDto, list, 17, "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
+ paddingData(shFinanceDto, list, 18, "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
+ paddingData(shFinanceDto, list, 19, "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
+ paddingData(shFinanceDto, list, 20, "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
+ paddingData(shFinanceDto, list, 21, "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
+ paddingData(shFinanceDto, list, 22, "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
+ paddingData(shFinanceDto, list, 23, "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
+ paddingData(shFinanceDto, list, 24, "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
+ paddingData(shFinanceDto, list, 25, "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
+ paddingData(shFinanceDto, list, 26, "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
+ paddingData(shFinanceDto, list, 27, "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
+ paddingData(shFinanceDto, list, 28, "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
+ paddingData(shFinanceDto, list, 29, "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
+ paddingData(shFinanceDto, list, 30, "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
+ paddingData(shFinanceDto, list, 31, "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
+ paddingData(shFinanceDto, list, 32, "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
+ paddingData(shFinanceDto, list, 33, "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
+ paddingData(shFinanceDto, list, 34, "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(shFinanceDto, list, 35, "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
+ paddingData(shFinanceDto, list, 36, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(shFinanceDto, list, 37, "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(shFinanceDto, list, 38, "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, 39, "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
+ paddingData(shFinanceDto, list, 40, "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
+ paddingData(shFinanceDto, list, 41, "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
+ paddingData(shFinanceDto, list, 42, "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(shFinanceDto, list, 43, "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(shFinanceDto, list, 44, "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
+ paddingData(shFinanceDto, list, 45, "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
+ paddingData(shFinanceDto, list, 46, "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(shFinanceDto, list, 47, "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
+ paddingData(shFinanceDto, list, 48, "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
+ paddingData(shFinanceDto, list, 49, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
+ paddingData(shFinanceDto, list, 50, "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
+ paddingData(shFinanceDto, list, 51, "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(shFinanceDto, list, 52, "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(shFinanceDto, list, 53, "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
+ paddingData(shFinanceDto, list, 54, "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
+ paddingData(shFinanceDto, list, 55, "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
+ paddingData(shFinanceDto, list, 56, "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
+ paddingData(shFinanceDto, list, 57, "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
+ paddingData(shFinanceDto, list, 58, "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(shFinanceDto, list, 59, "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
+ paddingData(shFinanceDto, list, 60, "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
+ paddingData(shFinanceDto, list, 61, "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
+ paddingData(shFinanceDto, list, 62, "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(shFinanceDto, list, 63, "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
+ paddingData(shFinanceDto, list, 64, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(shFinanceDto, list, 65, "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
+ paddingData(shFinanceDto, list, 66, "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
+ paddingData(shFinanceDto, list, 67, "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
+ paddingData(shFinanceDto, list, 68, "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
+ paddingData(shFinanceDto, list, 69, "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
+ paddingData(shFinanceDto, list, 70, "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
+ paddingData(shFinanceDto, list, 71, "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
+ paddingData(shFinanceDto, list, 72, "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
+ paddingData(shFinanceDto, list, 73, "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
+ paddingData(shFinanceDto, list, 74, "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
+ paddingData(shFinanceDto, list, 75, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(shFinanceDto, list, 76, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", api1501.getFzhsyzqyqmye() + "", api1501.getFzhsyzqyncye() + "");
+ return list;
+ }
+
+ private void paddingData(SHFinanceDto common,
+ List<SHFinanceDto> list,
+ Integer zbxh,
+ String zbmc,
+ String zbz1,
+ String zbz2) {
+ SHFinanceDto shFinanceDto = new SHFinanceDto();
+ BeanUtils.copyProperties(common, shFinanceDto);
+ shFinanceDto.setZbxh(zbxh);
+ shFinanceDto.setZbmc(zbmc);
+ shFinanceDto.setZbz1(zbz1);
+ shFinanceDto.setZbz2(zbz2);
+ list.add(shFinanceDto);
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java b/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java
new file mode 100644
index 0000000..19a6199
--- /dev/null
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java
@@ -0,0 +1,60 @@
+package com.fzzy.push.sh2023.dto;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+@Data
+public class SHFinanceDto implements Serializable {
+
+ @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ private String dwdm;
+
+ @PropertyDef(label = " 鎶ヨ〃鏈熷彿")
+ private String bbsj;
+
+ @PropertyDef(label = "鎶ヨ〃鍚�")
+ private String bbm;
+
+ @PropertyDef(label = " 鎸囨爣搴忓彿")
+ @JsonProperty("Zbxh")
+ private Integer Zbxh;
+
+ @PropertyDef(label = " 鎸囨爣鍚嶇О")
+ private String zbmc;
+
+ @PropertyDef(label = " 鎸囨爣鍊� 1")
+ private String zbz1;
+
+ @PropertyDef(label = " 鎸囨爣鍊� 2")
+ private String zbz2;
+
+ @PropertyDef(label = " 鎿嶄綔鏍囧織")
+ private String czbz;
+
+ @PropertyDef(label = " 鏈�鍚庢洿鏂版椂闂�")
+ private String zhgxsj;
+
+ @JsonProperty("Zbxh")
+ public void setZbxh(Integer zbxh) {
+ Zbxh = zbxh;
+ }
+
+ @JsonProperty("Zbxh")
+ public Integer getZbxh() {
+ return Zbxh;
+ }
+
+ public SHFinanceDto() {
+ }
+
+ public SHFinanceDto(Integer zbxh, String zbmc, String zbz1, String zbz2) {
+ this.Zbxh = zbxh;
+ this.zbmc = zbmc;
+ this.zbz1 = zbz1;
+ this.zbz2 = zbz2;
+ }
+}
--
Gitblit v1.9.3