From 07cc0a3e45a2f4db1d991877393e2759922231c8 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 22 四月 2024 20:09:13 +0800
Subject: [PATCH] 统一编码-调整轮换计划及计划明细接口字段名称
---
src/main/java/com/fzzy/api/view/Api1404.view.xml | 6 +++---
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java | 2 +-
src/main/java/com/fzzy/api/entity/Api1403.java | 4 ++--
src/main/java/com/fzzy/api/entity/Api1404.java | 4 ++--
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 9 +++++----
src/main/java/com/fzzy/api/view/Api1403.view.xml | 6 +++---
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java | 2 +-
7 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1403.java b/src/main/java/com/fzzy/api/entity/Api1403.java
index 277625a..ca06f3d 100644
--- a/src/main/java/com/fzzy/api/entity/Api1403.java
+++ b/src/main/java/com/fzzy/api/entity/Api1403.java
@@ -61,8 +61,8 @@
private String jhxddw;
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- @Column(name = "tydwbm", length = 20)
- private String tydwbm;
+ @Column(name = "jhxddwtybm", length = 20)
+ private String jhxddwtybm;
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅鍚嶇О" )
@Column(name = "jhxddwmc", length = 256)
diff --git a/src/main/java/com/fzzy/api/entity/Api1404.java b/src/main/java/com/fzzy/api/entity/Api1404.java
index a1e9134..24deebe 100644
--- a/src/main/java/com/fzzy/api/entity/Api1404.java
+++ b/src/main/java/com/fzzy/api/entity/Api1404.java
@@ -58,8 +58,8 @@
private String lhhwdm;
@PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- @Column(name = "tyhwbm", length = 28)
- private String tyhwbm;
+ @Column(name = "lhhwtybm", length = 28)
+ private String lhhwtybm;
@PropertyDef(label = "杞崲鏁伴噺" )
@Column(name = "lhsl", precision = 20, scale = 6)
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 f466ae1..4bd0dd4 100644
--- a/src/main/java/com/fzzy/api/view/Api1403.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1403.view.xml
@@ -31,7 +31,7 @@
<PropertyDef name="jhxddw">
<Property name="label">璁″垝涓嬭揪鍗曚綅</Property>
</PropertyDef>
- <PropertyDef name="tydwbm">
+ <PropertyDef name="jhxddwtybm">
<Property name="label">鍥藉缁熶竴鍗曚綅缂栫爜</Property>
</PropertyDef>
<PropertyDef name="jhxddwmc">
@@ -419,8 +419,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">tydwbm</Property>
- <Property name="property">tydwbm</Property>
+ <Property name="name">jhxddwtybm</Property>
+ <Property name="property">jhxddwtybm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/api/view/Api1404.view.xml b/src/main/java/com/fzzy/api/view/Api1404.view.xml
index 3105dfc..ecc13eb 100644
--- a/src/main/java/com/fzzy/api/view/Api1404.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1404.view.xml
@@ -44,7 +44,7 @@
<PropertyDef name="lhhwdm">
<Property name="label">杞崲璐т綅浠ｇ爜</Property>
</PropertyDef>
- <PropertyDef name="tyhwbm">
+ <PropertyDef name="lhhwtybm">
<Property name="label">鍥藉缁熶竴璐т綅缂栫爜</Property>
</PropertyDef>
<PropertyDef name="lhsl">
@@ -366,8 +366,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">tyhwbm</Property>
- <Property name="property">tyhwbm</Property>
+ <Property name="name">lhhwtybm</Property>
+ <Property name="property">lhhwtybm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 482be71..6444f65 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -751,14 +751,15 @@
lcsl += gd2022Api1404.getLhsl();
}
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(gd2022Api1404.getTyhwbm())){
+ if(StringUtils.isEmpty(gd2022Api1404.getLhhwtybm())){
String tyhwbm = apiCommonService.getTyhwbm(gd2022Api1404.getLhhwdm());
- gd2022Api1404.setTyhwbm(tyhwbm);
+ gd2022Api1404.setLhhwtybm(tyhwbm);
}
gd2022Api1404.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
dtls.add(gd2022Api1404);
}
}
+
api1403.setRotationInQty(lrsl);
api1403.setRotationOutQty(lcsl);
api1403.setDtls(dtls);
@@ -767,9 +768,9 @@
//璁剧疆涓婁紶鏂囦欢id
api1403.setFileStorageId((String) responseDto.getData());
//鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
- if(StringUtils.isEmpty(api1403.getTydwbm())){
+ if(StringUtils.isEmpty(api1403.getJhxddwtybm())){
String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
- api1403.setTydwbm(tydwbm);
+ api1403.setJhxddwtybm(tydwbm);
}
api1403.setZhgxsj(DateUtils.addSeconds(new Date(), -10));
return JSON.toJSONString(api1403);
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 0f1fa5d..8374549 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java
@@ -49,7 +49,7 @@
private String jhxddw;
@PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
+ private String jhxddwtybm;
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅鍚嶇О" )
private String jhxddwmc;
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java
index 0f46967..ca239b9 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java
@@ -39,7 +39,7 @@
private String lhhwdm;
@PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
- private String tyhwbm;
+ private String lhhwtybm;
@PropertyDef(label = "杞崲鏁伴噺" )
private double lhsl;
--
Gitblit v1.9.3