From 14a284b79ff08527fddfa00ac4d3597039a0d639 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 19 九月 2023 16:32:41 +0800
Subject: [PATCH] 优化调整上海接口上报
---
src/main/java/com/fzzy/push/sh2023/SH2023Constant.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java | 53 +-
src/main/java/com/fzzy/api/view/repository/Api1103Rep.java | 10
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 19
src/main/java/com/fzzy/api/view/repository/Api1102Rep.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java | 6
src/main/java/com/fzzy/api/view/pr/Api1302PR.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java | 8
src/main/java/com/fzzy/api/view/repository/Api1105Rep.java | 9
src/main/java/com/fzzy/api/view/repository/Api1501Rep.java | 11
src/main/java/com/fzzy/api/view/repository/Api1104Rep.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java | 8
src/main/java/com/fzzy/api/view/repository/Api1110Rep.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java | 4
src/main/java/com/fzzy/api/view/repository/Api1111Rep.java | 8
src/main/java/com/fzzy/api/view/repository/Api1112Rep.java | 7
src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java | 2
src/main/java/com/fzzy/api/view/repository/Api1113Rep.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java | 32 -
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 400 ++++++++++++------------
src/main/java/com/fzzy/api/view/repository/Api1503Rep.java | 11
src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java | 171 ++++++++--
src/main/java/com/fzzy/api/view/pr/Api1501PR.java | 4
src/main/java/com/fzzy/api/view/pr/Api1502PR.java | 4
src/main/java/com/fzzy/api/view/repository/Api1502Rep.java | 11
src/main/java/com/fzzy/api/view/repository/Api1106Rep.java | 8
src/main/java/com/fzzy/api/view/pr/Api1503PR.java | 4
src/main/java/com/fzzy/api/view/repository/Api1108Rep.java | 9
src/main/java/com/fzzy/api/view/Api1108.view.xml | 13
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java | 8
src/main/java/com/fzzy/api/view/repository/Api1107Rep.java | 8
src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java | 50 +-
33 files changed, 566 insertions(+), 354 deletions(-)
diff --git a/src/main/java/com/fzzy/api/view/Api1108.view.xml b/src/main/java/com/fzzy/api/view/Api1108.view.xml
index 32fcc8d..0a0f29a 100644
--- a/src/main/java/com/fzzy/api/view/Api1108.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1108.view.xml
@@ -84,6 +84,14 @@
<Property name="dataType">double</Property>
<Property name="label">搴撳瓨鏁伴噺</Property>
</PropertyDef>
+ <PropertyDef name="kcsldw">
+ <Property name="label">搴撳瓨閲忓崟浣�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("KCLDW")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="czbz">
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
@@ -404,6 +412,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">kcsldw</Property>
+ <Property name="property">kcsldw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">czbz</Property>
<Property name="property">czbz</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1302PR.java b/src/main/java/com/fzzy/api/view/pr/Api1302PR.java
index c490f0d..fd736d1 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1302PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1302PR.java
@@ -226,7 +226,7 @@
if (Constant.CZBZ_I.equals(data.getCzbz())) {
//鏇存柊鐘舵��
data.setCzbz(Constant.CZBZ_U);
- apiRepository.save(data);
+ apiRepository.updateStatus(data.getWsdjcdh(), data.getCzbz());
}
}
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1501PR.java b/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
index b89a998..abee848 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1501PR.java
@@ -107,9 +107,7 @@
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
- if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
- return pushDataList(items, apiService, apiConf);
- }
+
return pushDataSingle(items, apiService, apiConf);
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1502PR.java b/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
index 5b5f552..bec9159 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1502PR.java
@@ -105,9 +105,7 @@
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
- if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
- return pushDataList(items, apiService, apiConf);
- }
+
return pushDataSingle(items, apiService, apiConf);
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1503PR.java b/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
index d3395af..3275328 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1503PR.java
@@ -107,9 +107,7 @@
//鑾峰彇瀹炵幇鎺ュ彛
ApiRemoteService apiService = apiPushManager.getApiRemoteService(apiConf.getPushProtocol());
if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
- if (PushProtocol.SB_SH_2023.getCode().equals(apiConf.getPushProtocol())) {
- return pushDataList(items, apiService, apiConf);
- }
+
return pushDataSingle(items, apiService, apiConf);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
index 5e43963..ef2a24b 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1102Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@@ -26,4 +27,12 @@
*/
@Query("from Api1102 where kqdm=:kqdm ")
List<Api1102> findPushData(@Param("kqdm") String kqdm);
+
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1102 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1102> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1103Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1103Rep.java
index 2772379..1951e02 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1103Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1103Rep.java
@@ -6,6 +6,8 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
import java.util.List;
@@ -30,4 +32,12 @@
*/
@Query("from Api1103 where cfdm=:cfdm ")
List<Api1103> findPushDataByCfdm(@Param("cfdm") String cfdm);
+
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1103 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1103> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1104Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1104Rep.java
index 0bc7632..a330db0 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1104Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1104Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@@ -37,4 +38,12 @@
*/
@Query("from Api1104 where ajdh=:ajdh ")
List<Api1104> findDataByAjdh(@Param("ajdh") String ajdh);
+
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1104 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1104> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1105Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1105Rep.java
index 0bb0d4f..703f0e1 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1105Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1105Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@@ -39,4 +40,12 @@
@Query("from Api1105 where kqdm=:kqdm ")
List<Api1105> findPushData(@Param("kqdm") String kqdm);
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1105 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1105> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1106Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1106Rep.java
index f519849..2905a93 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1106Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1106Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@@ -31,4 +32,11 @@
@Query("from Api1106 where kqdm=:kqdm ")
List<Api1106> findPushData(@Param("kqdm") String kqdm);
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1106 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1106> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
index 0adf05d..647ff6a 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1107Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@@ -27,4 +28,11 @@
@Query("from Api1107 where kqdm=:kqdm")
List<Api1107> findPushData(@Param("kqdm") String kqdm);
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1107 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1107> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
index 49be127..b40f1d1 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1108Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@@ -28,5 +29,11 @@
@Query("from Api1108 where kqdm=:kqdm")
List<Api1108> findPushData(@Param("kqdm") String kqdm);
-
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1108 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1108> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1110Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1110Rep.java
index a6f28d1..2a89e5c 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1110Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1110Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@@ -27,4 +28,11 @@
@Query("from Api1110 where kqdm=:kqdm")
List<Api1110> findPushData(@Param("kqdm") String kqdm);
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1110 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1110> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1111Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1111Rep.java
index 3e0b3ec..10b9098 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1111Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1111Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
public interface Api1111Rep extends JpaRepository<Api1111, String> {
@@ -43,4 +44,11 @@
@Query("from Api1111 where spjksbid=:spjksbid")
List<Api1111> getApi1111ById(@Param("spjksbid") String spjksbid);
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1111 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1111> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
index 8972a58..79e0c65 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1112Rep.java
@@ -30,4 +30,11 @@
@Query("from Api1112 where kqdm=:kqdm")
List<Api1112> findPushData(@Param("kqdm") String kqdm);
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1112 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1112> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1113Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1113Rep.java
index 3b0f246..304801d 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1113Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1113Rep.java
@@ -7,6 +7,7 @@
import org.springframework.data.repository.query.Param;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
@@ -28,4 +29,11 @@
@Query("from Api1113 where kqdm=:kqdm")
List<Api1113> findPushData(@Param("kqdm") String kqdm);
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1113 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1113> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1501Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1501Rep.java
index 0d088ca..64a77fa 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1501Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1501Rep.java
@@ -6,6 +6,9 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+import java.util.Date;
+import java.util.List;
+
public interface Api1501Rep extends JpaRepository<Api1501, String> {
@@ -21,4 +24,12 @@
@Query("update Api1501 set czbz=:czbz where dwdm=:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1501 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1501> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1502Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1502Rep.java
index 112acb3..ce00c76 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1502Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1502Rep.java
@@ -6,6 +6,9 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+import java.util.Date;
+import java.util.List;
+
public interface Api1502Rep extends JpaRepository<Api1502, String> {
@@ -21,4 +24,12 @@
@Query("update Api1502 set czbz=:czbz where dwdm=:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1502 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1502> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1503Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1503Rep.java
index 5d9e2e4..74d5137 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1503Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1503Rep.java
@@ -7,6 +7,9 @@
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+import java.util.Date;
+import java.util.List;
+
public interface Api1503Rep extends JpaRepository<Api1503, String> {
@@ -22,4 +25,12 @@
@Query("update Api1503 set czbz=:czbz where dwdm=:id ")
int updateStatus(@Param("id") String id, @Param("czbz") String czbz);
+
+ /**
+ *
+ * @param kqdm
+ * @return
+ */
+ @Query("from Api1503 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
+ List<Api1503> findPushDataTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
}
diff --git a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
index 2767c5d..0378266 100644
--- a/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
+++ b/src/main/java/com/fzzy/async/fzzy35/Fzzy35SyncService12.java
@@ -52,34 +52,34 @@
Date start = param.getStart();
Date end = param.getEnd();
//瀹㈡埛鍗曚綅淇℃伅鍚屾
- fzzySync1212.syncData(kqdm, deptId, start, end);
+// fzzySync1212.syncData(kqdm, deptId, start, end);
//鍚堝悓鍚屾
fzzySync1201.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱鍚屾
- fzzySync1202.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱璐ㄦ鍚屾
- fzzySync1203.syncData(kqdm, deptId, start, end);
-
- //绮鍏ュ簱缁撶畻鍚屾
- fzzySync1204.syncData(kqdm, deptId, start, end);
-
- //绮鍑哄簱鍚屾
- fzzySync1205.syncData(kqdm, deptId, start, end);
-
- //绮鍑哄簱缁撶畻鍚屾
- fzzySync1206.syncData(kqdm, deptId, start, end);
-
- //绮鎹熸孩鍚屾
- fzzySync1209.syncData(kqdm, deptId, start, end);
-
- //鏂囦欢淇℃伅鍚屾
- fzzy35Sync1109.syncData(kqdm, deptId, start, end);
-
- //绮搴撳瓨鍚屾
- fzzySync1208.syncData(kqdm, deptId, start, end);
+//
+// //绮鍏ュ簱鍚屾
+// fzzySync1202.syncData(kqdm, deptId, start, end);
+//
+// //绮鍏ュ簱璐ㄦ鍚屾
+// fzzySync1203.syncData(kqdm, deptId, start, end);
+//
+// //绮鍏ュ簱缁撶畻鍚屾
+// fzzySync1204.syncData(kqdm, deptId, start, end);
+//
+// //绮鍑哄簱鍚屾
+// fzzySync1205.syncData(kqdm, deptId, start, end);
+//
+// //绮鍑哄簱缁撶畻鍚屾
+// fzzySync1206.syncData(kqdm, deptId, start, end);
+//
+// //绮鎹熸孩鍚屾
+// fzzySync1209.syncData(kqdm, deptId, start, end);
+//
+// //鏂囦欢淇℃伅鍚屾
+// fzzy35Sync1109.syncData(kqdm, deptId, start, end);
+//
+// //绮搴撳瓨鍚屾
+// fzzySync1208.syncData(kqdm, deptId, start, end);
}
}
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java b/src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java
index 503e70f..e74098f 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/GDFinanceDto.java
@@ -13,7 +13,7 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
@PropertyDef(label = " 鎶ヨ〃鏈熷彿")
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 665ac10..3b3a07b 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -1,7 +1,6 @@
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;
@@ -18,12 +17,8 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.beans.PropertyDescriptor;
import java.util.*;
/**
@@ -68,11 +63,6 @@
@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();
//鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
@@ -85,9 +75,15 @@
//娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
+
+
+ //鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
+ if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(param.getInteId())
+ || SH2023Constant.SH_2023_API_CODE_1114_1502.equals(param.getInteId())
+ || SH2023Constant.SH_2023_API_CODE_1114_1503.equals(param.getInteId())) {
+ inteId = SH2023Constant.SH_2023_API_CODE_1114;
+ }
apiLog.setInteId(inteId);
- String jsonData = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
- log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
if (StringUtils.isEmpty(inteId)) {
ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
@@ -96,6 +92,9 @@
apiLogRep.save(apiLog);
return responseDto;
}
+
+ String jsonData = getJsonData(param.getInteId(), data, api1102List.get(0).getXzqhdm());
+ log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
apiLog.setUploadTime(new Date());
@@ -110,8 +109,8 @@
//鑾峰彇鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- OrderData orderData = (OrderData)redisUtil.get(key);
- if(StringUtils.isEmpty(orderData.getOrderid())){
+ OrderData orderData = (OrderData) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderData.getOrderid())) {
log.error("鎸囦护id澶辨晥=" + jsonData);
ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
apiLog.setStatus(99);
@@ -131,8 +130,14 @@
//韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
- List<Object> list = (List<Object>) data;
- reqData.setDatalength(list.size());
+ if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(param.getInteId())
+ || SH2023Constant.SH_2023_API_CODE_1114_1502.equals(param.getInteId())
+ || SH2023Constant.SH_2023_API_CODE_1114_1503.equals(param.getInteId())) {
+ reqData.setDatalength(1);
+ }else {
+ List<Object> list = (List<Object>) data;
+ reqData.setDatalength(list.size());
+ }
//浣跨敤鍖虹骇骞冲彴鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
@@ -157,6 +162,7 @@
/**
* 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
+ *
* @param param
* @param conf
* @param data
@@ -176,7 +182,7 @@
//娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
- apiLog.setInteId(inteId);
+ apiLog.setInteId("1114");
String jsonData = getJsonData(inteId, data, api1102List.get(0).getXzqhdm());
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
@@ -201,8 +207,8 @@
//鑾峰彇鎸囦护id
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
- OrderData orderData = (OrderData)redisUtil.get(key);
- if(StringUtils.isEmpty(orderData.getOrderid())){
+ OrderData orderData = (OrderData) redisUtil.get(key);
+ if (StringUtils.isEmpty(orderData.getOrderid())) {
ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
apiLog.setStatus(99);
apiLog.setResult("鎸囦护id澶辨晥");
@@ -398,7 +404,7 @@
api1109 = new SH2023Api1109();
BeanUtils.copyProperties(apiData, api1109);
api1109.setBjw(ShAreaBjw.getBjw(code));
- if("1".equals(api1109.getWjlx())){
+ if ("1".equals(api1109.getWjlx())) {
api1109.setYwdh("鏃�");
}
map = new HashMap<>();
@@ -453,6 +459,7 @@
for (Api1112 apiData : api1112List) {
api1112 = new SH2023Api1112();
BeanUtils.copyProperties(apiData, api1112);
+ api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
api1112.setBjw(ShAreaBjw.getBjw(code));
list.add(api1112);
}
@@ -548,6 +555,8 @@
api1205.setBjw(ShAreaBjw.getBjw(code));
api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
api1205.setJzrq(apiData.getCmsj());
+ api1205.setJhmxh("鏃�");
+ api1205.setJjlx("鏃�");
list.add(api1205);
}
return JSON.toJSONString(list);
@@ -614,11 +623,13 @@
for (Api1209 apiData : api1209List) {
api1209 = new SH2023Api1209();
BeanUtils.copyProperties(apiData, api1209);
- // TODO 璁拌处鏃ユ湡 鍗曟嵁绫诲瀷
+ api1209.setDjlx("2");
api1209.setSzjl(apiData.getQzszkl());
api1209.setZrshde(apiData.getQzzrshde());
api1209.setBjw(ShAreaBjw.getBjw(code));
+ api1209.setJzrq(apiData.getYwrq());
+ api1209.setBz("鏃�");
api1209.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyy"));
list.add(api1209);
}
@@ -696,7 +707,12 @@
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
api1302.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
- //todo 娓╂箍搴︽娴嬫暟鎹笉鍏�
+ api1302.setCpjw(String.valueOf(apiData.getLspjw()));
+ api1302.setCzgw(String.valueOf(apiData.getLspjw()));
+ api1302.setCzdw(String.valueOf(apiData.getLspjw()));
+ api1302.setGfwjw(String.valueOf(apiData.getLspjw()));
+ api1302.setLwmx(apiData.getLswdzjh());
+
list.add(api1302);
}
return JSON.toJSONString(list);
@@ -855,23 +871,8 @@
}
return JSON.toJSONString(list);
}
-// TODO 椤圭洰淇℃伅
-// if (SH2023Constant.SH_2023_API_CODE_1405.equals(inteId)) {
-// SH2023Api1405 api1405;
-// //鏈�鍚庤浆鎹负json
-// List<SH2023Api1405> list = new ArrayList<>();
-// //鎶奷ata杞寲鎴恖ist闆嗗悎
-// List<Api1405> api1405List = castList(data, Api1405.class);
-// for (Api1405 apiData : api1405List) {
-// api1405 = new SH2023Api1405();
-// BeanUtils.copyProperties(apiData, api1405);
-//
-// list.add(api1405);
-// }
-// return JSON.toJSONString(list);
-// }
- if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
+ if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
SH2023Api2102 api2102;
//鏈�鍚庤浆鎹负json
List<SH2023Api2102> list = new ArrayList<>();
@@ -890,7 +891,7 @@
}
return JSON.toJSONString(list);
}
- if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
+ if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
SH2023Api2203 api2203;
//鏈�鍚庤浆鎹负json
List<SH2023Api2203> list = new ArrayList<>();
@@ -913,7 +914,7 @@
}
return JSON.toJSONString(list);
}
- if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
+ if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
SH2023Api2204 api2204;
//鏈�鍚庤浆鎹负json
List<SH2023Api2204> list = new ArrayList<>();
@@ -929,6 +930,19 @@
api2204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
list.add(api2204);
}
+ return JSON.toJSONString(list);
+ }
+ //璐㈠姟鎶ヨ〃鏁版嵁灏佽
+ if (SH2023Constant.SH_2023_API_CODE_1114_1501.equals(inteId)){
+ List<SHFinanceDto> list = copyApi1501((Api1501) data);
+ return JSON.toJSONString(list);
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1114_1502.equals(inteId)){
+ List<SHFinanceDto> list = copyApi1502((Api1502) data);
+ return JSON.toJSONString(list);
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1114_1503.equals(inteId)){
+ List<SHFinanceDto> list = copyApi1503((Api1503) data);
return JSON.toJSONString(list);
}
@@ -965,43 +979,43 @@
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() + "");
+ paddingData(shFinanceDto, list, "椤圭洰//t", "鏈湡閲戦//t", "鏈勾绱//t");
+ paddingData(shFinanceDto, list, "涓�銆佽惀涓氭敹鍏�", api1503.getYyzsrbqye() + "", api1503.getYyzsrbnlj() + "");
+ paddingData(shFinanceDto, list, "鍑忥細钀ヤ笟鎴愭湰", api1503.getYycbbqye() + "", api1503.getYycbbnlj() + "");
+ paddingData(shFinanceDto, list, "绋庨噾鍙婇檮鍔�", api1503.getSjjfjbqye() + "", api1503.getSjjfjbnlj() + "");
+ paddingData(shFinanceDto, list, "閿�鍞垂鐢�", api1503.getXsfybqye() + "", api1503.getXsfybnlj() + "");
+ paddingData(shFinanceDto, list, "绠＄悊璐圭敤", api1503.getGlfybqye() + "", api1503.getGlfybnlj() + "");
+ paddingData(shFinanceDto, list, "鐮斿彂璐圭敤", api1503.getYffybqye() + "", api1503.getYffybnlj() + "");
+ paddingData(shFinanceDto, list, "璐㈠姟璐圭敤", api1503.getCwfybqye() + "", api1503.getCwfybnlj() + "");
+ paddingData(shFinanceDto, list, "鍏朵腑锛氬埄鎭垂鐢�", api1503.getLxfybqye() + "", api1503.getLxfybnlj() + "");
+ paddingData(shFinanceDto, list, "鍒╂伅鏀跺叆", api1503.getLxsrbqye() + "", api1503.getLxsrbnlj() + "");
+ paddingData(shFinanceDto, list, "鍔狅細鍏朵粬鏀剁泭", api1503.getQtsybqye() + "", api1503.getQtsybnlj() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getTzsybqye() + "", api1503.getTzsybnlj() + "");
+ paddingData(shFinanceDto, list, "鍏朵腑锛氬鑱旇惀浼佷笟鍜屽悎钀ヤ紒涓氱殑鎶曡祫鏀剁泭", api1503.getLyqytzsybqye() + "", api1503.getLyqytzsybnlj() + "");
+ paddingData(shFinanceDto, list, "鍏厑浠峰�煎彉鍔ㄦ敹鐩婏紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getGyjzbdsybqye() + "", api1503.getGyjzbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "璧勪骇鍑忓�兼崯澶憋紙鎹熷け浠モ��-鈥濆彿濉垪锛�", api1503.getZcjzssbqye() + "", api1503.getZcjzssbnlj() + "");
+ paddingData(shFinanceDto, list, "璧勪骇澶勭疆鏀剁泭锛堟崯澶变互鈥�-鈥濆彿濉垪锛�", api1503.getZcczsybqye() + "", api1503.getZcczsybnlj() + "");
+ paddingData(shFinanceDto, list, "浜屻�佽惀涓氬埄娑︼紙浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getYylrbqye() + "", api1503.getYylrbnlj() + "");
+ paddingData(shFinanceDto, list, "鍔狅細钀ヤ笟澶栨敹鍏�", api1503.getYywsrbqye() + "", api1503.getYywsrbnlj() + "");
+ paddingData(shFinanceDto, list, "鍑忥細钀ヤ笟澶栨敮鍑�", api1503.getYywzcbqye() + "", api1503.getYywzcbnlj() + "");
+ paddingData(shFinanceDto, list, "涓夈�佸埄娑︽�婚锛堜簭鎹熸�婚浠モ��-鈥濆彿濉垪锛�", api1503.getLrzebqye() + "", api1503.getLrzebnlj() + "");
+ paddingData(shFinanceDto, list, "鍑忥細鎵�寰楃◣璐圭敤", api1503.getSdsfybqye() + "", api1503.getSdsfybnlj() + "");
+ paddingData(shFinanceDto, list, "鍥涖�佸噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getJlrbqye() + "", api1503.getJlrbnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜竴锛夋寔缁粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getCxjyjlrbqye() + "", api1503.getCxjyjlrbnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜簩锛夌粓姝㈢粡钀ュ噣鍒╂鼎锛堝噣浜忔崯浠モ��-鈥濆彿濉垪锛�", api1503.getZzjyjlrbqye() + "", api1503.getZzjyjlrbnlj() + "");
+ paddingData(shFinanceDto, list, "浜斻�佸叾浠栫患鍚堟敹鐩婄殑绋庡悗鍑�棰�", api1503.getQtzhsyjebqye() + "", api1503.getQtzhsyjebnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜竴锛変笉鑳介噸鍒嗙被杩涙崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getBnflzhsybqye() + "", api1503.getBnflzhsybnlj() + "");
+ paddingData(shFinanceDto, list, "1锛庨噸鏂拌閲忚瀹氬彈鐩婅鍒掑彉鍔ㄩ", api1503.getCxjlbdebqye() + "", api1503.getCxjlbdebnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜簩锛夊皢閲嶅垎绫昏繘鎹熺泭鐨勫叾浠栫患鍚堟敹鐩�", "0", "0");
+ paddingData(shFinanceDto, list, "1锛庢潈鐩婃硶涓嬪彲杞崯鐩婄殑鍏朵粬缁煎悎鏀剁泭", api1503.getQyfkzsybqye() + "", api1503.getQyfkzsybnlj() + "");
+ paddingData(shFinanceDto, list, "2锛庡彲渚涘嚭鍞噾铻嶈祫浜у叕鍏佷环鍊煎彉鍔ㄦ崯鐩�", api1503.getKgcszcbdsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "3锛庢寔鏈夎嚦鍒版湡鎶曡祫閲嶅垎绫讳负鍙緵鍑哄敭閲戣瀺璧勪骇鎹熺泭", api1503.getCydqtzzcsybqye() + "", api1503.getKgcszcbdsybnlj() + "");
+ paddingData(shFinanceDto, list, "4锛庣幇閲戞祦閲忓鏈熸崯鐩婄殑鏈夋晥閮ㄥ垎", api1503.getZjllsybqye() + "", api1503.getZjllsybnlj() + "");
+ paddingData(shFinanceDto, list, "5锛庡甯佽储鍔℃姤琛ㄦ姌绠楀樊棰�", api1503.getWbcwbbcebqye() + "", api1503.getWbcwbbcebnlj() + "");
+ paddingData(shFinanceDto, list, "鍏�佺患鍚堟敹鐩婃�婚", api1503.getZhsyzebqye() + "", api1503.getZhsyzebnlj() + "");
+ paddingData(shFinanceDto, list, "涓冦�佹瘡鑲℃敹鐩婏細", api1503.getMgsybqye() + "", api1503.getMgsybnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜竴锛夊熀鏈瘡鑲℃敹鐩�", api1503.getJbmgsybqye() + "", api1503.getJbmgsybnlj() + "");
+ paddingData(shFinanceDto, list, "锛堜簩锛夌█閲婃瘡鑲℃敹鐩�", api1503.getXsmgsybqye() + "", api1503.getXsmgsybnlj() + "");
return list;
}
@@ -1016,45 +1030,45 @@
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() + "");
+ paddingData(shFinanceDto, list, "椤圭洰//t", "鏈湀鏁�//t", "鏈勾绱鏁�//t");
+ paddingData(shFinanceDto, list, "涓�銆佺粡钀ユ椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getJyhdxjllbys() + "", api1502.getJyhdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "閿�鍞晢鍝併�佹彁渚涘姵鍔℃敹鍒扮殑鐜伴噾", api1502.getXssplwxjbys() + "", api1502.getXssplwxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺埌鐨勭◣璐硅繑杩�", api1502.getSffhbys() + "", api1502.getSffhbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getQtjyhdxjbys() + "", api1502.getQtjyhdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "缁忚惀娲诲姩鐜伴噾娴佸叆灏忚", api1502.getJyhdxjlrbys() + "", api1502.getJyhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "璐拱鍟嗗搧銆佹帴鍙楀姵鍔℃敮浠樼殑鐜伴噾", api1502.getGmsplwzfbys() + "", api1502.getGmsplwzfbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯缁欒亴宸ヤ互鍙婁负鑱屽伐鏀粯鐨勭幇閲�", api1502.getZfzgxjbys() + "", api1502.getZfzgxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯鐨勫悇椤圭◣璐�", api1502.getZfxxsfbys() + "", api1502.getZfxxsfbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庣粡钀ユ椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtjyhdxjbys() + "", api1502.getZfqtjyhdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "缁忚惀娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getJyhdxjlcbys() + "", api1502.getJyhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "缁忚惀娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getJyhdxjlljebys() + "", api1502.getJyhdxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "浜屻�佹姇璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getTzhdxjllbys() + "", api1502.getTzhdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺洖鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getShtzxjbys() + "", api1502.getShtzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鍙栧緱鎶曡祫鏀剁泭鏀跺埌鐨勭幇閲�", api1502.getQdtzsyxjbys() + "", api1502.getQdtzsyxjbnljs() + "");
+ paddingData(shFinanceDto, list, "澶勭疆鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀跺洖鐨勭幇閲戝噣棰�", api1502.getCzgdzcdxjjebys() + "", api1502.getCzgdzcdxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "澶勭疆瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀跺埌鐨勭幇閲戝噣棰�", api1502.getCzqtdwxjjebys() + "", api1502.getCzqtdwxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqttzxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getTzhdxjlrbys() + "", api1502.getTzhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "璐缓鍥哄畾璧勪骇銆佹棤褰㈣祫浜у拰鍏朵粬闀挎湡璧勪骇鏀粯鐨勭幇閲�", api1502.getGjgdzcdxjbys() + "", api1502.getGjgdzcdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫鏀粯鐨勭幇閲�", api1502.getTzzfxjbys() + "", api1502.getTzzfxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鍙栧緱瀛愬叕鍙稿強鍏朵粬钀ヤ笟鍗曚綅鏀粯鐨勭幇閲戝噣棰�", api1502.getQdzgsdzfxjjebys() + "", api1502.getQdzgsdzfxjjebnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庢姇璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqttzxjbys() + "", api1502.getZfqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getTzhdxjlcbys() + "", api1502.getTzhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getTzhdcsxjlljebys() + "", api1502.getTzhdcsxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "涓夈�佺璧勬椿鍔ㄤ骇鐢熺殑鐜伴噾娴侀噺锛�", api1502.getCchdxjllbys() + "", api1502.getCchdxjllbnljs() + "");
+ paddingData(shFinanceDto, list, "鍚告敹鎶曡祫鏀跺埌鐨勭幇閲�", api1502.getXstzxjbys() + "", api1502.getXstzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鍙栧緱鍊熸鏀跺埌鐨勭幇閲�", api1502.getQdjkxjbys() + "", api1502.getQdjkxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀跺埌鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getSdqtczxjbys() + "", api1502.getSdqttzxjbnljs() + "");
+ paddingData(shFinanceDto, list, "绛硅祫娲诲姩鐜伴噾娴佸叆灏忚", api1502.getCzhdxjlrbys() + "", api1502.getCzhdxjlrbnljs() + "");
+ paddingData(shFinanceDto, list, "鍋胯繕鍊哄姟鏀粯鐨勭幇閲�", api1502.getChzwzfxjbys() + "", api1502.getChzwzfxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鍒嗛厤鑲″埄銆佸埄娑︽垨鍋夸粯鍒╂伅鏀粯鐨勭幇閲�", api1502.getFpgldxjbys() + "", api1502.getFpgldxjbnljs() + "");
+ paddingData(shFinanceDto, list, "鏀粯鍏朵粬涓庣璧勬椿鍔ㄦ湁鍏崇殑鐜伴噾", api1502.getZfqtdxjbys() + "", api1502.getZfqtdxjbnljs() + "");
+ paddingData(shFinanceDto, list, "绛硅祫娲诲姩鐜伴噾娴佸嚭灏忚", api1502.getCzhdxjlcbys() + "", api1502.getCzhdxjlcbnljs() + "");
+ paddingData(shFinanceDto, list, "绛硅祫娲诲姩浜х敓鐨勭幇閲戞祦閲忓噣棰�", api1502.getCchdxjlljebys() + "", api1502.getCchdxjlljebnljs() + "");
+ paddingData(shFinanceDto, list, "鍥涖�佹眹鐜囧彉鍔ㄥ鐜伴噾鍙婄幇閲戠瓑浠风墿鐨勫奖鍝�", api1502.getHlbdxjyxbys() + "", api1502.getHlbdxjyxbnljs() + "");
+ paddingData(shFinanceDto, list, "浜斻�佺幇閲戝強鐜伴噾绛変环鐗╁噣澧炲姞棰�", api1502.getXjdjwjzebys() + "", api1502.getXjdjwjzebnljs() + "");
+ paddingData(shFinanceDto, list, "鍔狅細鏈熷垵鐜伴噾鍙婄幇閲戠瓑浠风墿浣欓", api1502.getQcxjdjwyebys() + "", api1502.getQcxjdjwyebnljs() + "");
+ paddingData(shFinanceDto, list, "鍏�佹湡鏈幇閲戝強鐜伴噾绛変环鐗╀綑棰�", api1502.getQmxjdjwyebys() + "", api1502.getQmxjdjwyebnljs() + "");
return list;
}
@@ -1069,94 +1083,92 @@
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() + "");
+ paddingData(shFinanceDto, list, "璧勪骇//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(shFinanceDto, list, "娴佸姩璧勪骇锛�", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "璐у竵璧勯噾", api1501.getHbjjqmye() + "", api1501.getHbjjncye() + "");
+ paddingData(shFinanceDto, list, "浜ゆ槗鎬ч噾铻嶈祫浜�", api1501.getJyxjrzcqmye() + "", api1501.getJyxjrzcncye() + "");
+ paddingData(shFinanceDto, list, "琛嶇敓閲戣瀺璧勪骇", api1501.getYsjrzcqmye() + "", api1501.getYsjrzcncye() + "");
+ paddingData(shFinanceDto, list, "搴旀敹绁ㄦ嵁", api1501.getYspjqmye() + "", api1501.getYspjncye() + "");
+ paddingData(shFinanceDto, list, "搴旀敹璐︽", api1501.getYszkqmye() + "", api1501.getYszkncye() + "");
+ paddingData(shFinanceDto, list, "棰勪粯娆鹃」", api1501.getYuskxqmye() + "", api1501.getYuskxncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬搴旀敹娆�", api1501.getQtyszkqmye() + "", api1501.getQtyszkncye() + "");
+ paddingData(shFinanceDto, list, "瀛樿揣", api1501.getChqmye() + "", api1501.getChncye() + "");
+ paddingData(shFinanceDto, list, "鍚堝悓璧勪骇", api1501.getHtzcqmye() + "", api1501.getHtzcncye() + "");
+ paddingData(shFinanceDto, list, "鎸佹湁寰呭敭璧勪骇", api1501.getCydszcqmye() + "", api1501.getCydszcncye() + "");
+ paddingData(shFinanceDto, list, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璧勪骇", api1501.getYnndqfldzcqmye() + "", api1501.getYnndqfldzcncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬娴佸姩璧勪骇", api1501.getQtldzcqmye() + "", api1501.getQtldzcncye() + "");
+ paddingData(shFinanceDto, list, "娴佸姩璧勪骇鍚堣", api1501.getLdzchjqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ祫浜э細", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(shFinanceDto, list, "鍊哄埜鎶曡祫", api1501.getZjtzqmye() + "", api1501.getZjtzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬鍊哄埜鎶曡祫", api1501.getQtzqtzqmye() + "", api1501.getQtzqtzncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡搴旀敹娆�", api1501.getCqyskqmye() + "", api1501.getCqyskncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡鑲℃潈鎶曡祫", api1501.getCqgqtzqmye() + "", api1501.getCqgqtzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬鏉冪泭宸ュ叿鎶曡祫", api1501.getQtqygjtzqmye() + "", api1501.getQtqygjtzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄩ噾铻嶈祫浜�", api1501.getQtfldjrzcqmye() + "", api1501.getQtfldjrzcncye() + "");
+ paddingData(shFinanceDto, list, "鎶曡祫鎬ф埧鍦颁骇", api1501.getTzxfdcqmye() + "", api1501.getTzxfdcncye() + "");
+ paddingData(shFinanceDto, list, "鍥哄畾璧勪骇", api1501.getGdzcqmye() + "", api1501.getGdzcncye() + "");
+ paddingData(shFinanceDto, list, "鍦ㄥ缓宸ョ▼", api1501.getZjgcqmye() + "", api1501.getZjgcncye() + "");
+ paddingData(shFinanceDto, list, "鐢熶骇鎬х敓鐗╄祫浜�", api1501.getScxswzcqmye() + "", api1501.getScxswzcncye() + "");
+ paddingData(shFinanceDto, list, "娌规皵璧勪骇", api1501.getYqzcqmye() + "", api1501.getYqzcncye() + "");
+ paddingData(shFinanceDto, list, "鏃犲舰璧勪骇", api1501.getWxzcqmye() + "", api1501.getWxzcncye() + "");
+ paddingData(shFinanceDto, list, "寮�鍙戞敮鍑�", api1501.getKfzcqmye() + "", api1501.getKfzcncye() + "");
+ paddingData(shFinanceDto, list, "鍟嗚獕", api1501.getSyqmye() + "", api1501.getSyncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡寰呮憡璐圭敤", api1501.getCqdtfyqmye() + "", api1501.getCqdtfyncye() + "");
+ paddingData(shFinanceDto, list, "閫掑欢鎵�寰楃◣璧勪骇", api1501.getDysdszcqmye() + "", api1501.getDysdszcncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄨ祫浜�", api1501.getQtfldzcqmye() + "", api1501.getQtfldzcncye() + "");
+ paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ祫浜у悎璁�", api1501.getFldzcqmye() + "", api1501.getFldzcncye() + "");
+ paddingData(shFinanceDto, list, "璧勪骇鎬昏", api1501.getZczjqmye() + "", api1501.getZczjncye() + "");
+ paddingData(shFinanceDto, list, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級//t", "鏈熸湯浣欓//t", "骞村垵浣欓//t");
+ paddingData(shFinanceDto, list, "娴佸姩璐熷�猴細", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(shFinanceDto, list, "鐭湡鍊熸", api1501.getDqjkqmye() + "", api1501.getLdzchjncye() + "");
+ paddingData(shFinanceDto, list, "浜ゆ槗鎬ч噾铻嶈礋鍊�", api1501.getJyxjrfzqmye() + "", api1501.getJyxjrfzncye() + "");
+ paddingData(shFinanceDto, list, "琛嶇敓閲戣瀺璐熷��", api1501.getYsjrfzqmye() + "", api1501.getYsjrfzncye() + "");
+ paddingData(shFinanceDto, list, "搴斾粯绁ㄦ嵁", api1501.getLdfzyspjqmye() + "", api1501.getLdfzyspjncye() + "");
+ paddingData(shFinanceDto, list, "搴斾粯璐︽", api1501.getLdfzyszkqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(shFinanceDto, list, "棰勬敹娆鹃」", api1501.getLdfzyuskxqmye() + "", api1501.getLdfzyszkncye() + "");
+ paddingData(shFinanceDto, list, "鍚堝悓璐熷��", api1501.getHtfzqmye() + "", api1501.getHtfzncye() + "");
+ paddingData(shFinanceDto, list, "搴斾粯鑱屽伐钖叕", api1501.getYfzgxcqmye() + "", api1501.getYfzgxcncye() + "");
+ paddingData(shFinanceDto, list, "搴斾氦绋庤垂", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬搴斾粯娆�", api1501.getQtyfkqmye() + "", api1501.getQtyfkncye() + "");
+ paddingData(shFinanceDto, list, "鎸佹湁寰呭敭璐熷��", api1501.getCydsfzqmye() + "", api1501.getCydsfzncye() + "");
+ paddingData(shFinanceDto, list, "涓�骞村唴鍒版湡鐨勯潪娴佸姩璐熷��", api1501.getYnddqfldfzqmye() + "", api1501.getYnddqfldfzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬娴佸姩璐熷��", api1501.getQtldfzqmye() + "", api1501.getQtldfzncye() + "");
+ paddingData(shFinanceDto, list, "娴佸姩璐熷�哄悎璁�", api1501.getLdfzhjqmye() + "", api1501.getLdfzhjncye() + "");
+ paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ礋鍊猴細", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡鍊熸", api1501.getCqjkqmye() + "", api1501.getCqjkncye() + "");
+ paddingData(shFinanceDto, list, "搴斾粯鍊哄埜", api1501.getYfzqqmye() + "", api1501.getYfzqncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵腑锛氫紭鍏堣偂", api1501.getYfzqyxgqmye() + "", api1501.getYfzqyxgncye() + "");
+ paddingData(shFinanceDto, list, "姘哥画鍊�", api1501.getYfzqyxzqmye() + "", api1501.getYfzqyxzncye() + "");
+ paddingData(shFinanceDto, list, "闀挎湡搴斾粯娆�", api1501.getCqyfkqmye() + "", api1501.getCqyfkncye() + "");
+ paddingData(shFinanceDto, list, "棰勮璐熷��", api1501.getYjsfqmye() + "", api1501.getYjsfncye() + "");
+ paddingData(shFinanceDto, list, "閫掑欢鏀剁泭", api1501.getDysyqmye() + "", api1501.getDysyncye() + "");
+ paddingData(shFinanceDto, list, "閫掑欢鎵�寰楃◣璐熷��", api1501.getDysdsfzqmye() + "", api1501.getDysdsfzncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬闈炴祦鍔ㄨ礋鍊�", api1501.getQtfldfzqmye() + "", api1501.getQtfldfzncye() + "");
+ paddingData(shFinanceDto, list, "闈炴祦鍔ㄨ礋鍊哄悎璁�", api1501.getFldfzhjqmye() + "", api1501.getFldfzhjncye() + "");
+ paddingData(shFinanceDto, list, "璐熷�哄悎璁�", api1501.getFzhjqmye() + "", api1501.getFzhjncye() + "");
+ paddingData(shFinanceDto, list, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級锛�", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(shFinanceDto, list, "瀹炴敹璧勬湰锛堟垨鑲℃湰锛�", api1501.getSszbqmye() + "", api1501.getSszbncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬鏉冪泭宸ュ叿", api1501.getQtqygjqmye() + "", api1501.getQtqygjncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵腑锛氫紭鍏堣偂", api1501.getQtqygjyxgqmye() + "", api1501.getQtqygjyxgncye() + "");
+ paddingData(shFinanceDto, list, "姘哥画鍊�", api1501.getQtqygjyxzqmye() + "", api1501.getQtqygjyxzncye() + "");
+ paddingData(shFinanceDto, list, "璧勬湰鍏Н", api1501.getZbgjqmye() + "", api1501.getZbgjncye() + "");
+ paddingData(shFinanceDto, list, "鍑忥細搴撳瓨鑲�", api1501.getJkcgqmye() + "", api1501.getJkcgncye() + "");
+ paddingData(shFinanceDto, list, "鍏朵粬缁煎悎鏀剁泭", api1501.getQtzhsyqmye() + "", api1501.getQtzhsyncye() + "");
+ paddingData(shFinanceDto, list, "涓撻」鍌ㄥ", api1501.getZxcbqmye() + "", api1501.getZxcbncye() + "");
+ paddingData(shFinanceDto, list, "鐩堜綑鍏Н", api1501.getYygjqmye() + "", api1501.getYygjncye() + "");
+ paddingData(shFinanceDto, list, "鏈垎閰嶅埄娑�", api1501.getWfplrqmye() + "", api1501.getWfplrncye() + "");
+ paddingData(shFinanceDto, list, "鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鍚堣", api1501.getSyzqyqmye() + "", api1501.getSyzqyncye() + "");
+ paddingData(shFinanceDto, list, "璐熷�哄拰鎵�鏈夎�呮潈鐩婏紙鎴栬偂涓滄潈鐩婏級鎬昏", 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);
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java b/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java
index 4aec482..19e1651 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023Constant.java
@@ -61,6 +61,9 @@
* 鎺ュ彛缂栫爜-1114 璐㈠姟鎶ヨ〃鏁版嵁鎺ュ彛
*/
public static String SH_2023_API_CODE_1114 = "1114";
+ public static String SH_2023_API_CODE_1114_1501 = "1501";
+ public static String SH_2023_API_CODE_1114_1502 = "1502";
+ public static String SH_2023_API_CODE_1114_1503 = "1503";
/**
* 鎺ュ彛缂栫爜-1201 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
index a47640c..f9c9aef 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023PushService11.java
@@ -9,6 +9,7 @@
import com.fzzy.api.service.PushService11;
import com.fzzy.api.view.repository.*;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -53,6 +54,12 @@
private Api1112Rep api1112Rep;
@Autowired
private Api1113Rep api1113Rep;
+ @Autowired
+ private Api1501Rep api1501Rep;
+ @Autowired
+ private Api1502Rep api1502Rep;
+ @Autowired
+ private Api1503Rep api1503Rep;
@Override
public String getProtocol() {
@@ -62,36 +69,36 @@
@Override
public void pushData(ApiParam param) {
- log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤寮�濮�");
+ log.info("------->>>>涓婃捣2023鎺ュ彛涓嶄富鍔ㄤ笂鎶�");
- //鎺ㄩ�佸崟浣嶄俊鎭�
- this.pushData1101(apiRemoteService, param);
- //搴撳尯淇℃伅
- this.pushData1102(apiRemoteService, param);
- //浠撴埧淇℃伅
- this.pushData1103(apiRemoteService, param);
- //寤掗棿淇℃伅
- this.pushData1104(apiRemoteService, param);
- //璐т綅淇℃伅
- this.pushData1105(apiRemoteService, param);
- //娌圭綈淇℃伅
- this.pushData1106(apiRemoteService, param);
- //璁惧淇℃伅
- this.pushData1107(apiRemoteService, param);
- //鑽墏淇℃伅
- this.pushData1108(apiRemoteService, param);
- //鏂囦欢淇℃伅
- this.pushData1109(apiRemoteService, param);
- //搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
- this.pushData1110(apiRemoteService, param);
- //搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
- this.pushData1111(apiRemoteService, param);
- //浜哄憳淇℃伅
- this.pushData1112(apiRemoteService, param);
- //浼佷笟淇＄敤淇℃伅
- this.pushData1113(apiRemoteService, param);
- //璐㈠姟鎶ヨ〃
- this.pushData1114(apiRemoteService, param);
+// //鎺ㄩ�佸崟浣嶄俊鎭�
+// this.pushData1101(apiRemoteService, param);
+// //搴撳尯淇℃伅
+// this.pushData1102(apiRemoteService, param);
+// //浠撴埧淇℃伅
+// this.pushData1103(apiRemoteService, param);
+// //寤掗棿淇℃伅
+// this.pushData1104(apiRemoteService, param);
+// //璐т綅淇℃伅
+// this.pushData1105(apiRemoteService, param);
+// //娌圭綈淇℃伅
+// this.pushData1106(apiRemoteService, param);
+// //璁惧淇℃伅
+// this.pushData1107(apiRemoteService, param);
+// //鑽墏淇℃伅
+// this.pushData1108(apiRemoteService, param);
+// //鏂囦欢淇℃伅
+// this.pushData1109(apiRemoteService, param);
+// //搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
+// this.pushData1110(apiRemoteService, param);
+// //搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
+// this.pushData1111(apiRemoteService, param);
+// //浜哄憳淇℃伅
+// this.pushData1112(apiRemoteService, param);
+// //浼佷笟淇＄敤淇℃伅
+// this.pushData1113(apiRemoteService, param);
+// //璐㈠姟鎶ヨ〃
+// this.pushData1114(apiRemoteService, param);
log.info("------->>>>鍩虹淇℃伅 鎺ュ彛妯″潡涓婃姤缁撴潫");
}
@@ -129,7 +136,7 @@
*/
public void pushData1102(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇搴撳尯淇℃伅
- List<Api1102> list = api1102Rep.findPushData(param.getKqdm());
+ List<Api1102> list = api1102Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯淇℃伅锛屼笉鎺ㄩ��-----");
@@ -157,7 +164,7 @@
*/
public void pushData1103(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇浠撴埧淇℃伅
- List<Api1103> list = api1103Rep.findPushData(param.getKqdm());
+ List<Api1103> list = api1103Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浠撴埧淇℃伅锛屼笉鎺ㄩ��-----");
@@ -185,7 +192,7 @@
*/
public void pushData1104(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇寤掗棿淇℃伅
- List<Api1104> list = api1104Rep.findPushData(param.getKqdm());
+ List<Api1104> list = api1104Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌寤掗棿淇℃伅锛屼笉鎺ㄩ��-----");
@@ -212,7 +219,7 @@
*/
public void pushData1105(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇璐т綅淇℃伅
- List<Api1105> list = api1105Rep.findPushData(param.getKqdm());
+ List<Api1105> list = api1105Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璐т綅淇℃伅锛屼笉鎺ㄩ��-----");
@@ -240,7 +247,7 @@
*/
public void pushData1106(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇娌圭綈淇℃伅
- List<Api1106> list = api1106Rep.findPushData(param.getKqdm());
+ List<Api1106> list = api1106Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌娌圭綈淇℃伅锛屼笉鎺ㄩ��-----");
@@ -268,7 +275,7 @@
*/
public void pushData1107(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇璁惧淇℃伅
- List<Api1107> list = api1107Rep.findPushData(param.getKqdm());
+ List<Api1107> list = api1107Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璁惧淇℃伅锛屼笉鎺ㄩ��-----");
@@ -296,7 +303,7 @@
*/
public void pushData1108(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇鑽墏淇℃伅
- List<Api1108> list = api1108Rep.findPushData(param.getKqdm());
+ List<Api1108> list = api1108Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鑽墏淇℃伅锛屼笉鎺ㄩ��-----");
@@ -324,7 +331,7 @@
*/
public void pushData1109(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇鏂囦欢淇℃伅
- List<Api1109> list = api1109Rep.findPushData(param.getKqdm());
+ List<Api1109> list = api1109Rep.findPushDataByTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鏂囦欢淇℃伅锛屼笉鎺ㄩ��-----");
@@ -352,7 +359,7 @@
*/
public void pushData1110(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇搴撳尯鍥句粨鎴跨偣浣嶆爣娉�
- List<Api1110> list = api1110Rep.findPushData(param.getKqdm());
+ List<Api1110> list = api1110Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯鍥句粨鎴跨偣浣嶆爣娉紝涓嶆帹閫�-----");
@@ -380,7 +387,7 @@
*/
public void pushData1111(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉�
- List<Api1111> list = api1111Rep.findPushData(param.getKqdm());
+ List<Api1111> list = api1111Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌搴撳尯鍥捐棰戠洃鎺ц澶囩偣浣嶆爣娉紝涓嶆帹閫�-----");
@@ -407,7 +414,7 @@
*/
public void pushData1112(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇浜哄憳淇℃伅
- List<Api1112> list = api1112Rep.findPushData(param.getKqdm());
+ List<Api1112> list = api1112Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浜哄憳淇℃伅锛屼笉鎺ㄩ��-----");
@@ -435,7 +442,7 @@
*/
public void pushData1113(ApiRemoteService apiRemoteService, ApiParam param) {
//鑾峰彇浼佷笟淇＄敤淇℃伅
- List<Api1113> list = api1113Rep.findPushData(param.getKqdm());
+ List<Api1113> list = api1113Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
if (null == list || list.isEmpty()) {
log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌浼佷笟淇＄敤淇℃伅锛屼笉鎺ㄩ��-----");
@@ -462,7 +469,87 @@
* 1114 璐㈠姟鎶ヨ〃
*/
public void pushData1114(ApiRemoteService apiRemoteService, ApiParam param) {
- //TODO
+ this.pushData1501(apiRemoteService, param);
+ this.pushData1502(apiRemoteService, param);
+ this.pushData1503(apiRemoteService, param);
}
+
+ /**
+ * 1501 璐㈠姟鎶ヨ〃-璧勪骇璐熷��--鍗曟潯涓婁紶
+ */
+ public void pushData1501(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1501> list = api1501Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌璧勪骇璐熷�轰俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1114_1501);
+ ResponseDto responseDto;
+ Api1501 d;
+ for (Api1501 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1501Rep.save(data);
+ }
+ }
+ }
+ }
+ /**
+ * 1502 璐㈠姟鎶ヨ〃-鐜伴噾娴�
+ */
+ public void pushData1502(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1502> list = api1502Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鐜伴噾娴佷俊鎭紝涓嶆帹閫�-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1114_1502);
+ ResponseDto responseDto;
+ for (Api1502 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1502Rep.save(data);
+ }
+ }
+ }
+ }
+ /**
+ * 1503 璐㈠姟鎶ヨ〃-鍒╂鼎淇℃伅
+ */
+ public void pushData1503(ApiRemoteService apiRemoteService, ApiParam param) {
+ //鑾峰彇璐㈠姟鎶ヨ〃-璧勪骇璐熷��
+ List<Api1503> list = api1503Rep.findPushDataTime(param.getKqdm(), param.getStart(), param.getEnd());
+
+ if (null == list || list.isEmpty()) {
+ log.error("-----涓婃捣甯傚钩鍙�2023鐗堬細鏈幏鍙栧埌鍒╂鼎淇℃伅锛屼笉鎺ㄩ��-----");
+ return;
+ }
+ param.setInteId(SH2023Constant.SH_2023_API_CODE_1114_1503);
+ ResponseDto responseDto;
+ Api1503 d;
+ for (Api1503 data : list) {
+ responseDto = apiRemoteService.pushData(param, data);
+ if (responseDto.getSuccess() == 0) {
+ if (Constant.CZBZ_I.equals(data.getCzbz())) {
+
+ data.setCzbz(Constant.CZBZ_U);
+ //鏇存柊鐘舵��
+ api1503Rep.save(data);
+ }
+ }
+ }
+ }
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
index c686df1..2ea83ae 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
@@ -65,8 +65,7 @@
private String czclfs;
@PropertyDef(label = "淇濊川鏈�")
- @JSONField(format = "yyyy-MM-dd")
- private Date bzq;
+ private String bzq;
@PropertyDef(label = "搴撳瓨鏁伴噺")
private Double kcsl;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
index 2450b24..89da6c2 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
@@ -76,7 +76,7 @@
private String zy;
@PropertyDef(label = "鏈�楂樿亴绉�")
- private String zgzc;
+ private String zgzc = "鏃�";
@PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿")
@JSONField(format = "yyyy-MM-dd")
@@ -89,7 +89,7 @@
private String zw;
@PropertyDef(label = "鑽ｈ獕绉板彿")
- private String rych;
+ private String rych = "鏃�";
@PropertyDef(label = "鍙栧緱鑽ｈ獕绉板彿鏃堕棿")
@JSONField(format = "yyyy-MM-dd")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
index 43e6355..455dc04 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
@@ -97,19 +97,15 @@
@PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
private Date sswcsj;
- @JSONField(name = "Lysl")
@PropertyDef(label = "灞ョ害鏁伴噺")
private double lysl;
- @JSONField(name = "Lyl")
@PropertyDef(label = "灞ョ害鐜�")
- private double lyl;
+ private double lyl = 100;
- @JSONField(name = "Jsjg")
@PropertyDef(label = "缁撶畻浠锋牸")
private double jsjg;
- @JSONField(name = "Jszje", serializeUsing = NumberSerializer.class)
@PropertyDef(label = "缁撶畻鎬婚噾棰�")
private BigDecimal jszje;
@@ -152,7 +148,7 @@
private Date zhgxsj;
@PropertyDef(label = "鍚堝悓鏄惁涓")
- private String htsfzz;
+ private String htsfzz = "0";
@PropertyDef(label = "鏍囪浣�")
private String bjw;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
index 12677c3..b68ef72 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -47,9 +47,6 @@
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
- @PropertyDef(label = "绮潈褰掑睘鍗曚綅浠ｇ爜")
- private String lqgsdwdm;
-
@PropertyDef(label = "鎵胯繍浜�")
private String cyr;
@@ -65,11 +62,11 @@
@PropertyDef(label = "杩愯緭宸ュ叿")
private String ysgj;
- @PropertyDef(label = "杞﹁埞鍙�")
- private String cch;
-
@PropertyDef(label = "杞﹁埞鍙风被鍨�")
private String cchlx;
+
+ @PropertyDef(label = "杞﹁埞鍙�")
+ private String cch;
@PropertyDef(label = "鎸傝溅鍙�")
private String gch;
@@ -100,7 +97,7 @@
private String jjlx;
@PropertyDef(label = "姣涢噸(鍏枻)")
- private double mz;
+ private Double mz;
@PropertyDef(label = "姣涢噸鐩戠鍛�")
private String mzjby;
@@ -116,7 +113,7 @@
private String zcy;
@PropertyDef(label = "鐨噸(鍏枻)")
- private double pz;
+ private Double pz;
@PropertyDef(label = "鐨噸鐩戠鍛�")
private String pzjby;
@@ -132,65 +129,65 @@
private String bzw;
@PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
- private double bzbdbz = 25;
+ private Double bzbdbz;
@PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
private Integer bzbjs;
@PropertyDef(label = "璐ㄦ鎵ｉ噺(灏忚:鍏枻)")
- private double zjklxj;
+ private Double zjklxj;
@PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵ｉ噺(鍏枻)")
- private double qzsfzkl;
+ private Double qzsfzkl;
@PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵ｉ噺(鍏枻)")
- private double qzzzzkl;
+ private Double qzzzzkl;
@PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
- private double qzbwslkl;
+ private Double qzbwslkl;
@PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
- private double qzhhkl;
+ private Double qzhhkl;
@PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵ｉ噺(鍏枻)")
- private double qzsmlkl;
+ private Double qzsmlkl;
@PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
- private double qzzjmlkl;
+ private Double qzzjmlkl;
@PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
- private double qzgwcmkl;
+ private Double qzgwcmkl;
@PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
- private double qzhlmkl;
+ private Double qzhlmkl;
@PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
- private double qzqtkl;
+ private Double qzqtkl;
@PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
- private double zlfyzkl;
+ private Double zlfyzkl;
@PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
- private double bzwkl;
+ private Double bzwkl;
@PropertyDef(label = "鍏朵粬鎵ｉ噺(鍏枻)")
- private double qtkl;
+ private Double qtkl;
@PropertyDef(label = "鎵ｉ噺鍘熷洜")
private String klyy;
@PropertyDef(label = "鐜板満鎵ｉ噺(鍏枻)")
@Column(name = "xckl")
- private double xckl;
+ private Double xckl;
@PropertyDef(label = "澧炴墸浠�(鍏枻)")
- private double zkj;
+ private Double zkj;
@PropertyDef(label = "澧炴墸浠峰師鍥�")
private String zkhyy;
@PropertyDef(label = "鍑�閲�(鍏枻)")
- private double jz;
+ private Double jz;
@PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
private String zxzydw;
@@ -215,10 +212,10 @@
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date zhgxsj;
- private String pch;
+ private String pch = "鏃�";
private String bjw;
- private String bydh;
- private String jjdh;
+ private String bydh = "鏃�";
+ private String jjdh = "鏃�";
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "璁拌处鏃ユ湡")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
index 8cac8cf..e58a675 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -35,9 +35,6 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
- @PropertyDef(label = "璁″垝鏄庣粏鍙�")
- private String jhmxh;
-
@PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
private String cktzdh;
@@ -66,11 +63,13 @@
@PropertyDef(label = "鍗哥伯鍦扮偣")
private String xldd;
+ @PropertyDef(label = "杞﹁埞鍙风被鍨�")
+ private String cchlx;
+
@PropertyDef(label = "杞﹁埞鍙�")
private String cch;
- @PropertyDef(label = "杞﹁埞鍙风被鍨�")
- private String cchlx;
+
@PropertyDef(label = "鎸傝溅鍙�")
private String gch;
@@ -164,11 +163,17 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
- private String pch;
+ private String pch ="鏃�";
private String bjw;
- private String jjdh;
+ private String jjdh ="鏃�";
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍙�")
+ private String jhmxh = "鏃�";
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "璁拌处鏃ユ湡")
private Date jzrq;
+
+ @PropertyDef(label = "妫�鏂ょ被鍨�")
+ private String jjlx = "鏃�";
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
index bfcee7a..6366526 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
@@ -35,7 +35,7 @@
private String shnd;
@PropertyDef(label = "鍥藉埆")
- private Date gb;
+ private String gb;
@PropertyDef(label = "浜у湴")
private String cd;
@@ -103,16 +103,16 @@
private Date zhgxsj;
@PropertyDef(label = "鎵规鍙�")
- private String pch;
+ private String pch = "鏃�";
@PropertyDef(label = "鏍囪浣�")
private String bjw;
@PropertyDef(label = "鎴愬搧绮鏍�")
- private String cplgg;
+ private String cplgg = "鏃�";
@PropertyDef(label = "鏉ョ伯浠ｇ爜")
- private String goodscode;
+ private String goodscode = "鏃�";
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
index caa2853..70ebb05 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
@@ -89,14 +89,14 @@
private String ldshr;
@PropertyDef(label = "澶囨敞")
- private String bz;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
+ private String bz ="鏃�";
@PropertyDef(label = "鍗曟嵁绫诲瀷")
private String djlx;
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
+ private String czbz;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java
index 0c7ed9b..1d750d4 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java
@@ -89,13 +89,13 @@
private String lwmx;
@PropertyDef(label = "绮俯鐘舵��")
- private String lwzt;
+ private String lwzt = "0";
@PropertyDef(label = "寮傚父鐐逛釜鏁�")
- private String ycdgs;
+ private Integer ycdgs = 0;
@PropertyDef(label = "绮儏鎶�鏈�")
- private String lqjs;
+ private String lqjs = "2";
@PropertyDef(label = "鏍囪浣�")
private String bjw;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java b/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java
index 19a6199..712969f 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java
@@ -1,11 +1,8 @@
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 {
@@ -13,46 +10,31 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
- @PropertyDef(label = " 鎶ヨ〃鏈熷彿")
+ @PropertyDef(label = "鎶ヨ〃鏈熷彿")
private String bbsj;
@PropertyDef(label = "鎶ヨ〃鍚�")
private String bbm;
- @PropertyDef(label = " 鎸囨爣搴忓彿")
- @JsonProperty("Zbxh")
- private Integer Zbxh;
-
- @PropertyDef(label = " 鎸囨爣鍚嶇О")
+ @PropertyDef(label = "鎸囨爣鍚嶇О")
private String zbmc;
- @PropertyDef(label = " 鎸囨爣鍊� 1")
+ @PropertyDef(label = "鎸囨爣鍊� 1")
private String zbz1;
- @PropertyDef(label = " 鎸囨爣鍊� 2")
+ @PropertyDef(label = "鎸囨爣鍊� 2")
private String zbz2;
- @PropertyDef(label = " 鎿嶄綔鏍囧織")
+ @PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
- @PropertyDef(label = " 鏈�鍚庢洿鏂版椂闂�")
+ @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;
+ public SHFinanceDto(String zbmc, String zbz1, String zbz2){
this.zbmc = zbmc;
this.zbz1 = zbz1;
this.zbz2 = zbz2;
--
Gitblit v1.9.3