From c8758e2ecad0d3acd8e100619030b132844c6331 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 16 十一月 2023 17:47:47 +0800
Subject: [PATCH] 广东省平台接口-新增轮换计划文件信息提交
---
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java | 5 +++++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 5 ++++-
src/main/java/com/fzzy/api/entity/Api1403.java | 6 ++++++
src/main/java/com/fzzy/api/entity/Api1307.java | 1 +
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 4 ++++
src/main/java/com/fzzy/api/view/Api1403.view.xml | 22 ++++++++++++++++++++++
6 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1307.java b/src/main/java/com/fzzy/api/entity/Api1307.java
index 4222665..4c1a78d 100644
--- a/src/main/java/com/fzzy/api/entity/Api1307.java
+++ b/src/main/java/com/fzzy/api/entity/Api1307.java
@@ -45,6 +45,7 @@
@JSONField(serialize = false)
@PropertyDef(label = "鏂囦欢鍦板潃")
@Column(name = "wjdz")
+
private String wjdz;
/*----------鍥芥爣瀛楁----------*/
diff --git a/src/main/java/com/fzzy/api/entity/Api1403.java b/src/main/java/com/fzzy/api/entity/Api1403.java
index bbc2033..d0ed5c1 100644
--- a/src/main/java/com/fzzy/api/entity/Api1403.java
+++ b/src/main/java/com/fzzy/api/entity/Api1403.java
@@ -78,11 +78,17 @@
@Column(name = "zhgxsj")
private Date zhgxsj;
+ /*----------鑷富涓氬姟瀛楁----------*/
@JSONField(serialize = false)
@PropertyDef(label = "涓氬姟id")
@Column(name = "bizId", length = 40)
private String bizId;
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鏂囦欢鍦板潃")
+ @Column(name = "wjdz")
+ private String wjdz;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
@Column(name = "kqdm", length = 21)
private String kqdm;
diff --git a/src/main/java/com/fzzy/api/view/Api1403.view.xml b/src/main/java/com/fzzy/api/view/Api1403.view.xml
index dc0c06e..54e77cd 100644
--- a/src/main/java/com/fzzy/api/view/Api1403.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1403.view.xml
@@ -116,6 +116,9 @@
<Property></Property>
<Property name="label">鏂囦欢瀛樺偍ID</Property>
</PropertyDef>
+ <PropertyDef name="wjdz">
+ <Property name="label">鏂囦欢鍦板潃</Property>
+ </PropertyDef>
<PropertyDef name="fileName">
<Property></Property>
<Property name="label">鏂囦欢鍚嶇О</Property>
@@ -351,6 +354,12 @@
<Property name="exClassName">toolbar-button</Property>
</Button>
<Button>
+ <Property name="caption">涓婁紶鏂囦欢</Property>
+ <Property name="iconClass">fa fa-upload</Property>
+ <Property name="exClassName">toolbar-button-warm</Property>
+ <Property name="action">uploadAction</Property>
+ </Button>
+ <Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
self.get("parent").hide();
if(cur) cur.cancel();</ClientEvent>
@@ -436,6 +445,11 @@
<Property name="property">kqdm</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wjdz</Property>
+ <Property name="property">wjdz</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
@@ -505,5 +519,13 @@
<Property name="service">api1403PR#delUpdate</Property>
<Property name="confirmMessage">纭畾瑕佸皢鏁版嵁鏍囪涓哄垹闄や箞锛�</Property>
</AjaxAction>
+ <UploadAction id="uploadAction">
+ <ClientEvent name="onFileUploaded">var returnValue = arg.returnValue;//鑾峰彇FileResolver鏂规硶杩斿洖鐨勪俊鎭�&#xD;
+ 
+ var cur = view.get("#dsMain.data:#");
+ cur.set("wjdz",returnValue);</ClientEvent>
+ <Property name="fileResolver">uploadProcessor#uploadFile</Property>
+ <Filters/>
+ </UploadAction>
</View>
</ViewConfig>
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index 0a032b6..aae96d8 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -133,7 +133,10 @@
apiData.setRcsj(fz40DepotStore.getStoreDate());
//灏佷粨鏃ユ湡
if ("3".equals(apiData.getHwzt()) || "4".equals(apiData.getHwzt())) {
- apiData.setFcrq(DateUtils.addDays(fz40DepotStore.getStoreDate(), 10));
+ if(null == fz40DepotStore.getFullDate()){
+ fz40DepotStore.setFullDate(DateUtils.addDays(fz40DepotStore.getStoreDate(), 30));
+ }
+ apiData.setFcrq(fz40DepotStore.getFullDate());
}
if ("1".equals(apiData.getHwzt())) {
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 251e9dd..be60750 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -418,6 +418,10 @@
api1403.setRotationInQty(lrsl);
api1403.setRotationOutQty(lcsl);
api1403.setDtls(dtls);
+ //鍏堜笂浼犳枃浠�,鑾峰彇鏂囦欢id
+ GD2022ResponseDto responseDto = GD2022HttpClientUtil.postUploadData(url, authToken, api1403.getWjdz());
+ //璁剧疆涓婁紶鏂囦欢id
+ api1403.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1403);
}
if (Constant.API_CODE_1404.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java
index a228142..21d83e0 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java
@@ -91,4 +91,9 @@
@Column(name = "kqdm", length = 21)
private String kqdm;
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鏂囦欢鍦板潃")
+ @Column(name = "wjdz", length = 21)
+ private String wjdz;
+
}
--
Gitblit v1.9.3