From d1b7f2eb67cd87edc4b5eb11def5acba07c75698 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 21 十二月 2023 15:09:27 +0800
Subject: [PATCH] 根据上海新接口规则进行调整
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java | 23
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 2
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java | 16
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java | 2
src/main/java/com/fzzy/api/view/repository/Api1210Rep.java | 11
src/main/java/com/fzzy/api/view/repository/Api1303Rep.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java | 3
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java | 10
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java | 9
src/main/java/com/fzzy/api/view/Api1109.view.xml | 9
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java | 13
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java | 6
src/main/java/com/fzzy/api/view/Api1210.view.xml | 237 +++++++-----
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 14
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 58 ++
src/main/java/com/fzzy/api/entity/Api1109.java | 6
src/main/java/com/fzzy/api/entity/Api1210.java | 4
src/main/java/com/fzzy/api/entity/Api1310.java | 6
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1310.java | 123 ++++++
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1210.java | 74 ++++
src/main/java/com/fzzy/api/view/Api1310.view.xml | 395 ++++++++++++---------
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java | 6
25 files changed, 715 insertions(+), 324 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1109.java b/src/main/java/com/fzzy/api/entity/Api1109.java
index 2b12d44..749956d 100644
--- a/src/main/java/com/fzzy/api/entity/Api1109.java
+++ b/src/main/java/com/fzzy/api/entity/Api1109.java
@@ -71,4 +71,10 @@
@PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
@Column(name = "syncTime")
private Date syncTime;
+
+ /*-----涓婃捣浣跨敤-----*/
+
+ @PropertyDef(label = "涓氬姟鍗曞彿", description = "褰撴枃浠剁被鍨嬩负1锛屼负绌猴紱褰撴枃浠剁被鍨嬩负2銆�3銆�4銆�5浼犲嚭鍏ュ簱涓氬姟鍗曞彿锛涘綋鏂囦欢绫诲瀷涓�6锛屼紶鍚堝悓鍙凤紱褰撴枃浠剁被鍨嬩负10.銆�11锛屼紶椋庨櫓鐐圭紪鐮�")
+ @Column(name = "ywdh")
+ private String ywdh;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1210.java b/src/main/java/com/fzzy/api/entity/Api1210.java
index e3cec94..7dd16dd 100644
--- a/src/main/java/com/fzzy/api/entity/Api1210.java
+++ b/src/main/java/com/fzzy/api/entity/Api1210.java
@@ -102,4 +102,8 @@
private Date zhgxsj;
+ /*-----涓婃捣浣跨敤-----*/
+ @PropertyDef(label = "璁″垝鏄庣粏鍗曞彿")
+ @Column(name = "jhmxdh", length = 400)
+ private String jhmxdh;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1310.java b/src/main/java/com/fzzy/api/entity/Api1310.java
index 6324077..33b1dd3 100644
--- a/src/main/java/com/fzzy/api/entity/Api1310.java
+++ b/src/main/java/com/fzzy/api/entity/Api1310.java
@@ -159,4 +159,10 @@
@Column(name = "zhgxsj")
private Date zhgxsj;
+
+ /*-----涓婃捣浣跨敤-----*/
+ @PropertyDef(label = "鎶ュ憡绫诲瀷", description = "1-鍗曚綅妫�楠岋紱2-鏁翠綋妫�楠�(鍔犳潈骞冲潎)锛�3-鍏朵粬")
+ @Column(name = "bglx", length = 1)
+ private String bglx;
+
}
diff --git a/src/main/java/com/fzzy/api/view/Api1109.view.xml b/src/main/java/com/fzzy/api/view/Api1109.view.xml
index a3e0704..d91f6a6 100644
--- a/src/main/java/com/fzzy/api/view/Api1109.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1109.view.xml
@@ -25,6 +25,10 @@
<Property></Property>
<Property name="label">鏂囦欢id</Property>
</PropertyDef>
+ <PropertyDef name="ywdh">
+ <Property></Property>
+ <Property name="label">涓氬姟鍗曞彿</Property>
+ </PropertyDef>
<PropertyDef name="wjlx">
<Property></Property>
<Property name="label">鏂囦欢绫诲瀷</Property>
@@ -348,6 +352,11 @@
<Property name="property">bizId</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ywdh</Property>
+ <Property name="property">ywdh</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
diff --git a/src/main/java/com/fzzy/api/view/Api1210.view.xml b/src/main/java/com/fzzy/api/view/Api1210.view.xml
index c7cc4a4..01c31ce 100644
--- a/src/main/java/com/fzzy/api/view/Api1210.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1210.view.xml
@@ -101,6 +101,10 @@
<Property></Property>
<Property name="label">澶囨敞</Property>
</PropertyDef>
+ <PropertyDef name="jhmxdh">
+ <Property></Property>
+ <Property name="label">璁″垝鏄庣粏鍗曞彿</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtParam">
<Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -332,110 +336,135 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">lsxzzbdh</Property>
- <Property name="property">lsxzzbdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwdm</Property>
- <Property name="property">hwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lssl</Property>
- <Property name="property">lssl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hzsl</Property>
- <Property name="property">hzsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bzwh</Property>
- <Property name="property">bzwh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lspzdm</Property>
- <Property name="property">lspzdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hzqlsxzdm</Property>
- <Property name="property">hzqlsxzdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hzhlsxzdm</Property>
- <Property name="property">hzhlsxzdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hzrq</Property>
- <Property name="property">hzrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ccshr</Property>
- <Property name="property">ccshr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zjshr</Property>
- <Property name="property">zjshr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">tjshr</Property>
- <Property name="property">tjshr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kjshr</Property>
- <Property name="property">kjshr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ldshr</Property>
- <Property name="property">ldshr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:3">
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">lsxzzbdh</Property>
+ <Property name="property">lsxzzbdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lssl</Property>
+ <Property name="property">lssl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hzsl</Property>
+ <Property name="property">hzsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzwh</Property>
+ <Property name="property">bzwh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lspzdm</Property>
+ <Property name="property">lspzdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hzqlsxzdm</Property>
+ <Property name="property">hzqlsxzdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hzhlsxzdm</Property>
+ <Property name="property">hzhlsxzdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hzrq</Property>
+ <Property name="property">hzrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ccshr</Property>
+ <Property name="property">ccshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zjshr</Property>
+ <Property name="property">zjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">tjshr</Property>
+ <Property name="property">tjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kjshr</Property>
+ <Property name="property">kjshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ldshr</Property>
+ <Property name="property">ldshr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Property name="editorType">TextArea</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">涓婃捣甯傚钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">jhmxdh</Property>
+ <Property name="property">jhmxdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/Api1310.view.xml b/src/main/java/com/fzzy/api/view/Api1310.view.xml
index 906f00a..5046b4b 100644
--- a/src/main/java/com/fzzy/api/view/Api1310.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1310.view.xml
@@ -171,6 +171,30 @@
</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="bglx">
+ <Property></Property>
+ <Property name="label">鎶ュ憡绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-鍗曚綅妫�楠�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-鏁翠綋妫�楠�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-鍏朵粬</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="sfzcccnx">
<Property></Property>
<Property name="label">鏄惁姝ｅ父瀛樺偍骞撮檺</Property>
@@ -418,179 +442,204 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">zjbgdh</Property>
- <Property name="property">zjbgdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">hwdm</Property>
- <Property name="property">hwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lspzdm</Property>
- <Property name="property">lspzdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">lsdjdm</Property>
- <Property name="property">lsdjdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">rkrq</Property>
- <Property name="property">rkrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jylb</Property>
- <Property name="property">jylb</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jysj</Property>
- <Property name="property">jysj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jydw</Property>
- <Property name="property">jydw</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jyr</Property>
- <Property name="property">jyr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jyyj</Property>
- <Property name="property">jyyj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zblb</Property>
- <Property name="property">zblb</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qfrq</Property>
- <Property name="property">qfrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">jyxm</Property>
- <Property name="property">jyxm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bgcjsj</Property>
- <Property name="property">bgcjsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">jyxmz</Property>
- <Property name="property">jyxmz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">shrxm</Property>
- <Property name="property">shrxm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">zbjgpd</Property>
- <Property name="property">zbjgpd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">spaqzbsfhg</Property>
- <Property name="property">spaqzbsfhg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qydbh</Property>
- <Property name="property">qydbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qysj</Property>
- <Property name="property">qysj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qyqy</Property>
- <Property name="property">qyqy</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qyrxm</Property>
- <Property name="property">qyrxm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jdrxm</Property>
- <Property name="property">jdrxm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ypbh</Property>
- <Property name="property">ypbh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ypsl</Property>
- <Property name="property">ypsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dbsl</Property>
- <Property name="property">dbsl</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ypdj</Property>
- <Property name="property">ypdj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">sfzcccnx</Property>
- <Property name="property">sfzcccnx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bz</Property>
- <Property name="property">bz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">zjbgdh</Property>
+ <Property name="property">zjbgdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwdm</Property>
+ <Property name="property">hwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lspzdm</Property>
+ <Property name="property">lspzdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">lsdjdm</Property>
+ <Property name="property">lsdjdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rkrq</Property>
+ <Property name="property">rkrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jylb</Property>
+ <Property name="property">jylb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jysj</Property>
+ <Property name="property">jysj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jydw</Property>
+ <Property name="property">jydw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jyr</Property>
+ <Property name="property">jyr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jyyj</Property>
+ <Property name="property">jyyj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zblb</Property>
+ <Property name="property">zblb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qfrq</Property>
+ <Property name="property">qfrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">jyxm</Property>
+ <Property name="property">jyxm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgcjsj</Property>
+ <Property name="property">bgcjsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">jyxmz</Property>
+ <Property name="property">jyxmz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">shrxm</Property>
+ <Property name="property">shrxm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">zbjgpd</Property>
+ <Property name="property">zbjgpd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">spaqzbsfhg</Property>
+ <Property name="property">spaqzbsfhg</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qydbh</Property>
+ <Property name="property">qydbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qysj</Property>
+ <Property name="property">qysj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qyqy</Property>
+ <Property name="property">qyqy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qyrxm</Property>
+ <Property name="property">qyrxm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jdrxm</Property>
+ <Property name="property">jdrxm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ypbh</Property>
+ <Property name="property">ypbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ypsl</Property>
+ <Property name="property">ypsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dbsl</Property>
+ <Property name="property">dbsl</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ypdj</Property>
+ <Property name="property">ypdj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfzcccnx</Property>
+ <Property name="property">sfzcccnx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bz</Property>
+ <Property name="property">bz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">涓婃捣甯傚钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">bglx</Property>
+ <Property name="property">bglx</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1210Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1210Rep.java
index 714c35c..7b87ed9 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1210Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1210Rep.java
@@ -25,4 +25,15 @@
@Query("from Api1210 where lsxzzbdh=:lsxzzbdh ")
List<Api1210> getDataById(@Param("lsxzzbdh") String lsxzzbdh);
+
+
+ /**
+ * 鏍规嵁璐т綅浠ｇ爜鍜屼笟鍔℃椂闂存煡璇㈡�ц川杞彉鍗曚俊鎭�(姝ｅ簭)
+ * @param hwdm
+ * @param start
+ * @return
+ */
+ @Query("from Api1210 where hwdm=:hwdm and hzrq >=:start order by zhgxsj ")
+ List<Api1210> findDataByHwdmAndTime(@Param("hwdm") String hwdm, @Param("start") Date start);
+
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
index 6933ba7..c640546 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1303Rep.java
@@ -26,4 +26,7 @@
@Query("from Api1303 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1303> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
+
+ @Query("from Api1303 where bizId=:bizId ")
+ List<Api1303> getDataByBizId(@Param("bizId") String bizId);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
index 3af09f4..66e3766 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1205.java
@@ -105,12 +105,16 @@
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
apiData.setYwlx(Constant.INOUT_TYPE_1);
+ apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
+ apiData.setCyr(sysData.getUserName());
+
+ //榛樿涓�涓殢渚垮��
+ apiData.setLxdh(StringUtils.isEmpty(sysData.getUserContact()) ? "13012345678" : sysData.getUserContact().trim());
+
+ apiData.setSfzh(null == sysData.getUserId() ? "410183199003187055" : sysData.getUserId().trim());
//閫氱煡鍗曞彿
apiData.setCktzdh(sysData.getNoticeId());
-
- apiData.setYwrq(DateUtils.parseDate(sysData.getId().substring(2, 10), new String[] { "yyyyMMdd" }));
-
//鑾峰彇鍚堝悓鍙�
listInoutNotice = fzzySyncNoticeOutRep.listInoutNoticeOutById(sysData.getNoticeId());
if (null != listInoutNotice && listInoutNotice.size() > 0) {
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
index beaf755..8d24882 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1306.java
@@ -4,6 +4,7 @@
import com.fzzy.api.entity.*;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.view.repository.Api1303Rep;
import com.fzzy.api.view.repository.Api1306Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy40.entity.Fz40DrugLog;
@@ -32,7 +33,8 @@
private ApiCommonService commonService;
@Autowired
private Api1306Rep api1306Rep;
-
+ @Autowired
+ private Api1303Rep api1303Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -62,6 +64,7 @@
Api1306 api1306;
Api1105 api1105;
List<Api1306> api1306List;
+ List<Api1303> api1303List;
for (Fz40DrugLog fz40DrugLog : list) {
//鑾峰彇璐т綅淇℃伅
api1105 = commonService.getApi1105Cache(fz40DrugLog.getDepotId());
@@ -76,7 +79,13 @@
api1306.setCfdm(api1105.getHwdm().substring(0,25));
api1306.setXzkssj(fz40DrugLog.getStart());
api1306.setXzjssj(fz40DrugLog.getEnd());
- api1306.setHcjcdh(fz40DrugLog.getPestBatchId());
+ //璁剧疆铏妫�娴嬪崟鍙�
+ api1306.setHcjcdh(api1105.getHwdm() + fz40DrugLog.getPestBatchId());
+ api1303List = api1303Rep.getDataByHcjcdh(fz40DrugLog.getPestBatchId());
+ if (null != api1303List || api1303List.size() > 0) {
+ api1306.setHcjcdh(api1303List.get(0).getHcjcdh());
+ }
+
api1306.setDjcxz(fz40DrugLog.getNum());
api1306.setCgxzfs(fz40DrugLog.getMode());
api1306.setHlxzfs(fz40DrugLog.getRecirMode());
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 35af4a3..1700868 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -443,9 +443,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1210.equals(inteId)) {
- Api1210 apiData = (Api1210) data;
- apiData.setZhgxsj(new Date());
- return JSON.toJSONString(apiData);
+ Gd2022Api1210 api1210 = new Gd2022Api1210();
+ BeanUtils.copyProperties(data, api1210);
+ api1210.setZhgxsj(new Date());
+ return JSON.toJSONString(api1210);
}
if (Constant.API_CODE_1211.equals(inteId)) {
Api1211 apiData = (Api1211) data;
@@ -523,9 +524,10 @@
return JSON.toJSONString(apiData);
}
if (Constant.API_CODE_1310.equals(inteId)) {
- Api1310 apiData = (Api1310) data;
- apiData.setZhgxsj(new Date());
- return JSON.toJSONString(apiData);
+ Gd2022Api1310 api1310 = new Gd2022Api1310();
+ BeanUtils.copyProperties(data, api1310);
+ api1310.setZhgxsj(new Date());
+ return JSON.toJSONString(api1310);
}
if (Constant.API_CODE_1401.equals(inteId)) {
Api1401 apiData = (Api1401) data;
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1210.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1210.java
new file mode 100644
index 0000000..2741050
--- /dev/null
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1210.java
@@ -0,0 +1,74 @@
+package com.fzzy.push.gd2022.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-绮鎬ц川杞彉鍗�
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class Gd2022Api1210 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8223096234800082280L;
+
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿")
+ private String lsxzzbdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜")
+ private String hwdm;
+
+ @PropertyDef(label = "绮鏁伴噺(鍏枻)")
+ private double lssl;
+
+ @PropertyDef(label = "鍒掕浆鏁伴噺(鍏枻)")
+ private double hzsl;
+
+ @PropertyDef(label = "鎵瑰噯鏂囧彿")
+ private String bzwh;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜")
+ private String lspzdm;
+
+ @PropertyDef(label = "鍒掕浆鍓嶇伯椋熸�ц川浠ｇ爜")
+ private String hzqlsxzdm;
+
+ @PropertyDef(label = "鍒掕浆鍚庣伯椋熸�ц川浠ｇ爜")
+ private String hzhlsxzdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍒掕浆鏃ユ湡")
+ private Date hzrq;
+
+ @PropertyDef(label = "浠撳偍瀹℃牳浜�" )
+ private String ccshr;
+
+ @PropertyDef(label = "璐ㄦ瀹℃牳浜�" )
+ private String zjshr;
+
+ @PropertyDef(label = "缁熻瀹℃牳浜�" )
+ private String tjshr;
+
+ @PropertyDef(label = "浼氳瀹℃牳浜�" )
+ private String kjshr;
+
+ @PropertyDef(label = "棰嗗瀹℃牳浜�" )
+ private String ldshr;
+
+ @PropertyDef(label = "澶囨敞" )
+ private String bz;
+
+ @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/gd2022/dto/Gd2022Api1310.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1310.java
new file mode 100644
index 0000000..0baf8fc
--- /dev/null
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1310.java
@@ -0,0 +1,123 @@
+package com.fzzy.push.gd2022.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 鎺ュ彛琛�-璐ㄦ鏁版嵁琛�
+ *
+ * @author czt
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class Gd2022Api1310 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿" )
+ private String zjbgdh;
+
+ @PropertyDef(label = "璐т綅浠ｇ爜" )
+ private String hwdm;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜" )
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜" )
+ private String lsdjdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍏ュ簱鏃ユ湡" )
+ private Date rkrq;
+
+ @PropertyDef(label = "妫�楠岀被鍒�" )
+ private String jylb;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "妫�楠屾椂闂�" )
+ private Date jysj;
+
+ @PropertyDef(label = "妫�楠屽崟浣�" )
+ private String jydw;
+
+ @PropertyDef(label = "妫�楠屼汉" )
+ private String jyr;
+
+ @PropertyDef(label = "妫�楠屼緷鎹�" )
+ private String jyyj;
+
+ @PropertyDef(label = "鎸囨爣绫诲埆" )
+ private String zblb;
+
+ @PropertyDef(label = "妫�楠岄」鐩�" )
+ private String jyxm;
+
+ @PropertyDef(label = "妫�楠岄」鐩��" )
+ private String jyxmz;
+
+ @PropertyDef(label = "鎸囨爣缁撴灉鍒ゅ畾" )
+ private String zbjgpd;
+
+ @PropertyDef(label = "椋熷搧瀹夊叏鎸囨爣鏄惁鍚堟牸" )
+ private String spaqzbsfhg;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "绛惧彂鏃ユ湡" )
+ private Date qfrq;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎶ュ憡鍑哄叿鏃堕棿" )
+ private Date bgcjsj;
+
+ @PropertyDef(label = "瀹℃牳浜哄鍚�" )
+ private String shrxm;
+
+ @PropertyDef(label = "鎵︽牱鍗曠紪鍙�" )
+ private String qydbh;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鎵︽牱鏃堕棿" )
+ private Date qysj;
+
+ @PropertyDef(label = "鎵︽牱鍖哄煙" )
+ private String qyqy;
+
+ @PropertyDef(label = "鎵︽牱浜哄鍚�" )
+ private String qyrxm;
+
+ @PropertyDef(label = "鐩戠潱浜哄鍚�" )
+ private String jdrxm;
+
+ @PropertyDef(label = "鏍峰搧缂栧彿" )
+ private String ypbh;
+
+ @PropertyDef(label = "鏍峰搧鏁伴噺" )
+ private double ypsl;
+
+ @PropertyDef(label = "浠ｈ〃鏁伴噺" )
+ private double dbsl;
+
+ @PropertyDef(label = "鏍峰搧绛夌骇" )
+ private String ypdj;
+
+ @PropertyDef(label = "鏄惁姝ｅ父瀛樺偍骞撮檺" )
+ private String sfzcccnx;
+
+ @PropertyDef(label = "澶囨敞" )
+ private String bz;
+
+ @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/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index eb1dd66..5671e74 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -54,6 +54,8 @@
@Autowired
private Api1208Rep api1208Rep;
@Autowired
+ private Api1210Rep api1210Rep;
+ @Autowired
private Api1109Rep api1109Rep;
@Autowired
private Api1202Rep api1202Rep;
@@ -195,14 +197,11 @@
return responseDto;
}
- //鏌ヨ搴撳尯淇℃伅琛屾斂鍖哄垝鐮�
- List<Api1102> api1102List = api1102Rep.findPushData(kqdm);
//灏佽鏁版嵁
SH2023PullReqDto reqData = new SH2023PullReqDto();;
reqData.setName(conf.getUserName());
reqData.setPwd(conf.getAppCode());
-
log.info("鎷夊彇鍏变韩鏁版嵁璇锋眰淇℃伅=" + JSON.toJSONString(reqData));
String url = conf.getApiUrl().replace("UPLOAD", "Shared");
@@ -243,7 +242,6 @@
list.add(object);
return JSON.toJSONString(list);
}
-
}
/**
@@ -255,7 +253,6 @@
* @return
*/
private Object getJsonApiData(String inteId, Object data, String code) {
- List<Object> list = new ArrayList<>();
//鍏蜂綋鏍规嵁鎺ュ彛杩涜灏佽
if (SH2023Constant.SH_2023_API_CODE_1101.equals(inteId)) {
SH2023Api1101 api1101 = new SH2023Api1101();
@@ -302,7 +299,12 @@
BeanUtils.copyProperties(apiData, api1104);
api1104.setAjdm(apiData.getAjdh());
api1104.setCfdm(apiData.getCfbh());
- api1104.setLsxzdm("122");
+
+ //璁剧疆绮鎬ц川浠ｇ爜(鏌ョ湅寤掗棿瀵瑰簲鐨勬渶鏂板簱瀛樿繘琛岃祴鍊�)
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1104.getAjdm() + "01");
+ if (null != api1208List && api1208List.size() > 0) {
+ api1104.setLsxzdm(api1208List.get(0).getLsxzdm());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1104);
@@ -355,7 +357,7 @@
//涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
//涓氬姟绫诲瀷
- api1109.setYwdh(getYwdh(api1109.getWjlx(), api1109.getWjmc()));
+ api1109.setYwdh(getYwdh(api1109.getWjlx(), api1109.getWjmc(), api1109.getYwdh()));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -387,6 +389,7 @@
BeanUtils.copyProperties(data, api1112);
api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
api1112.setBjw(ShAreaBjw.getBjw(code));
+ api1112.setZy("01");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1112);
@@ -435,8 +438,7 @@
if (StringUtils.isEmpty(api1202.getRkjsdh())) {
api1202.setRkjsdh("0");
}
-
- //璁剧疆绮杞崲骞村害
+ //璁剧疆绮杞崲骞村害,鏍规嵁璁″垝鏄庣粏鍙锋煡璇㈣鍒掓槑缁嗭紝鍐嶆牴鎹鍒掓槑缁嗘煡璇㈣疆鎹㈣鍒�
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
if (null != api1404List && api1404List.size() > 0) {
List<Api1403> api1403List = api1403Rep.getDataByLhjhdh(api1404List.get(0).getLhjhdh());
@@ -446,12 +448,19 @@
}
}
}
-
+ //鏌ヨ绮鎬ц川杞彉鍗曞彿(鏍规嵁鍏ュ簱鏃堕棿鍜岃揣浣嶄唬鐮佹煡璇㈢伯椋熸�ц川杞彉鍗�)
+ List<Api1210> api1210List = api1210Rep.findDataByHwdmAndTime(api1202.getHwdm(), api1202.getCmsj());
+ if (null != api1210List && api1210List.size() > 0) {
+ api1202.setLsxzzbdh(api1210List.get(0).getLsxzzbdh());
+ }
//璁剧疆鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //绮鎬ц川
+ api1202.setLsxzdm("200");
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
return api1202;
@@ -478,6 +487,8 @@
if (null != api1208List && api1208List.size() > 0) {
api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //璁剧疆璐ㄦ缂栫爜(榛樿绛夊悓浜庡叆搴撹川妫�鍗曞彿)
+ api1203.setZjbh(api1203.getRkjydh());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
@@ -542,6 +553,8 @@
api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
+ //绮鎬ц川
+ api1205.setLsxzdm("200");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -615,6 +628,9 @@
api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
}
+ //绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
+ api1209.setLsxzdm("122");
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
return api1209;
@@ -646,7 +662,8 @@
if (null != api1208List && api1208List.size() > 0) {
api1211.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //涓荤绮簱浠ｇ爜
+ api1211.setZglkdm(apiData.getKqdm());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
return api1211;
@@ -854,6 +871,22 @@
api1403.setJhzxdw(api1101List.get(0).getDwdm());
api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
+
+ //鏌ヨ杞崲璁″垝鐨勮疆鍏ユ暟閲忓拰杞嚭鏁伴噺
+ List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
+ Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
+ if(null != list && list.size() > 0){
+ for (Api1404 api1404 : list) {
+ if(null!= api1404.getLhlx() && "2".equals(api1404.getLhlx())){
+ lrsl += api1404.getLhsl();
+ }
+ if(null!= api1404.getLhlx() && "1".equals(api1404.getLhlx())){
+ lcsl += api1404.getLhsl();
+ }
+ }
+ }
+ api1403.setLrsl(lrsl);
+ api1403.setLcsl(lcsl);
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1403);
@@ -1261,8 +1294,7 @@
}
return wjmc;
}
- private String getYwdh(String wjlx, String wjmc) {
- String ywdh = "";
+ private String getYwdh(String wjlx, String wjmc, String ywdh) {
String[] s = wjmc.split("_");
if ("2".equals(wjlx) || "3".equals(wjlx)) {
ywdh = s[1];
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
index 160e450..21dd4b1 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
@@ -91,6 +91,9 @@
@PropertyDef(label = "寤掗棿鏁�")
private Integer ajs;
+ @PropertyDef(label = "鍗曚綅鐘舵��")
+ private String dwzt;
+
@PropertyDef(label = "娌圭綈鏁�")
private Integer ygs;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
index df3557b..579887d 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
@@ -39,9 +39,6 @@
@PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
private String kqcq;
- @PropertyDef(label = "鍌ㄥ浠撳")
- private Double cbcr;
-
@PropertyDef(label = "鏈夋晥浠撳")
private Double yxcr;
@@ -54,9 +51,6 @@
@PropertyDef(label = "浠撴埧鏁�")
private Integer cfs;
- @PropertyDef(label = "寤掗棿鏁�")
- private Integer ajs;
-
@PropertyDef(label = "娌圭綈鏁�")
private Integer ygs;
@@ -65,6 +59,9 @@
@PropertyDef(label = "搴撳尯绾害")
private Double wd;
+
+ @PropertyDef(label = "搴撳尯鐘舵��", description = "1:姝ｅ父锛堥粯璁わ級 2:閫�鍑哄偍澶囩伯鎵垮偍")
+ private String kqzt;
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
@@ -76,9 +73,12 @@
@PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:甯傜骇浠ｅ偍锛�3:鍖虹骇鐩村偍锛�4:鍖虹骇浠ｅ偍锛�9锛氬叾浠�")
private String kqsx;
- @PropertyDef(label = "搴撳尯鐘舵��")
- private String kqzt;
+ @PropertyDef(label = "寤掗棿鏁�")
+ private Integer ajs;
@PropertyDef(label = "鏍囪浣�", description = "1:姝ｅ父(榛樿), 2:閫�鍑哄偍澶囩伯鎵垮偍")
private String bjw;
+
+ @PropertyDef(label = "鍌ㄥ浠撳")
+ private Double cbcr;
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
index ac5daf4..2c57f4c 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
@@ -190,10 +190,10 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
- @PropertyDef(label = "绮鎬ц川浠ｇ爜")
- private String lsxzdm;
-
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
}
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 e2cd350..00817d1 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -2,14 +2,9 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -24,7 +19,6 @@
*
*/
private static final long serialVersionUID = 760284619085936798L;
-
//12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
@@ -212,15 +206,26 @@
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date zhgxsj;
+ @PropertyDef(label = "鎵规鍙�")
private String pch = "鏃�";
+
+ @PropertyDef(label = "鏍囪浣�")
private String bjw;
+
+ @PropertyDef(label = "椹宠繍鍗曞彿")
private String bydh = "鏃�";
+
+ @PropertyDef(label = "妫�鏂ゅ崟鍙�")
private String jjdh = "鏃�";
- @PropertyDef(label = "鎿嶄綔鏍囧織")
+
+ @PropertyDef(label = "杞崲骞村害")
private String lhnd;
-
+
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿")
+ private String lsxzzbdh;
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "璁拌处鏃ユ湡")
private Date jzrq;
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
index 7d77d0c..3fb872f 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
@@ -91,4 +91,7 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+
+ @PropertyDef(label = "璐ㄦ缂栧彿")
+ private String zjbh;
}
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 e3c72be..cd7b4c7 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -69,8 +69,6 @@
@PropertyDef(label = "杞﹁埞鍙�")
private String cch;
-
-
@PropertyDef(label = "鎸傝溅鍙�")
private String gch;
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 6366526..371eeab 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
@@ -109,7 +109,7 @@
private String bjw;
@PropertyDef(label = "鎴愬搧绮鏍�")
- private String cplgg = "鏃�";
+ private String cplgg = "3";
@PropertyDef(label = "鏉ョ伯浠ｇ爜")
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 70ebb05..1f63806 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
@@ -70,6 +70,9 @@
@PropertyDef(label = "鎹熺泭鏄惁姝ｅ父")
private String sysfzc;
+ @PropertyDef(label = "鎹熸孩绫诲瀷",description = "1:鎹熻�楋紝2锛氭崯澶憋紝3.鍏朵粬")
+ private String sylx;
+
@PropertyDef(label = "鎹熸孩鍘熷洜")
private String syyy;
@@ -107,4 +110,10 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜")
+ private String lsxzdm;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "涓氬姟鏃ユ湡" )
+ private Date ywrq;
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
index 7a5fbcd..9e4e9a1 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
@@ -78,4 +78,7 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+ @PropertyDef(label = "璁″垝鏄庣粏鍗曞彿")
+ private String jhmxdh;
+
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
index 065bc2a..1ad29fb 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
@@ -129,4 +129,7 @@
@PropertyDef(label = "绮鎬ц川浠ｇ爜")
private String lsxzdm;
+ @PropertyDef(label = "鎶ュ憡绫诲瀷", description = "1-鍗曚綅妫�楠岋紱2-鏁翠綋妫�楠岋紱3-鍏朵粬")
+ private String bglx;
+
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
index 900830e..b0b4de9 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
@@ -65,5 +65,11 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
+ @PropertyDef(label = "杞叆鏁伴噺")
+ private Double lrsl;
+
+ @PropertyDef(label = "杞嚭鏁伴噺")
+ private Double lcsl;
+
}
--
Gitblit v1.9.3