From 94d050025f9a45db83fd421beae66e0918261121 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 15 八月 2023 11:38:50 +0800
Subject: [PATCH] 新增库区信息字段
---
src/main/java/com/fzzy/api/view/Api1102.view.xml | 43 +++++++++++++++++++++
src/main/java/com/fzzy/api/entity/Api1102.java | 15 ++++++-
src/main/java/com/fzzy/api/view/pr/Api1212PR.java | 3 +
3 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1102.java b/src/main/java/com/fzzy/api/entity/Api1102.java
index 5742d99..4120b8a 100644
--- a/src/main/java/com/fzzy/api/entity/Api1102.java
+++ b/src/main/java/com/fzzy/api/entity/Api1102.java
@@ -91,6 +91,18 @@
@Column(name = "wd", precision = 20, scale = 6)
private double wd;
+ @PropertyDef(label = "搴撳尯鐘舵��" ,description = "1:姝ｅ父锛堥粯璁わ級 2:閫�鍑哄偍澶囩伯鎵垮偍")
+ @Column(name = "kqzt", length = 1)
+ private String kqzt;
+
+ @PropertyDef(label = "娴峰悍鍖哄煙ID" ,description = "瀵瑰簲娴峰悍瑙嗛骞冲彴regionIndexCode瀛楁")
+ @Column(name = "hkRegionId", length = 36)
+ private String hkRegionId;
+
+ @PropertyDef(label = "浜ф潈鏂瑰簱鍖轰唬鐮�" ,description = "鑷湁浜ф潈鏃跺簱鍖轰唬鐮佸繀椤荤瓑浜庝骇鏉冩柟搴撳尯浠ｇ爜,闈炶嚜鏈変骇鏉冩椂搴撳尯浠ｇ爜涓嶈兘绛変簬浜ф潈鏂瑰簱鍖轰唬鐮�")
+ @Column(name = "cqfkqdm", length = 21)
+ private String cqfkqdm;
+
@PropertyDef(label = "鎿嶄綔鏍囧織" )
@Column(name = "czbz", length = 1)
private String czbz;
@@ -100,5 +112,4 @@
@Column(name = "zhgxsj", nullable = false)
private Date zhgxsj;
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/api/view/Api1102.view.xml b/src/main/java/com/fzzy/api/view/Api1102.view.xml
index 7e32e42..e7b6343 100644
--- a/src/main/java/com/fzzy/api/view/Api1102.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1102.view.xml
@@ -70,6 +70,34 @@
<Property name="dataType">double</Property>
<Property name="label">搴撳尯绾害</Property>
</PropertyDef>
+ <PropertyDef name="kqzt">
+ <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">姝ｅ父</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">閫�鍑哄偍澶囩伯鎵垮偍</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="hkRegionId">
+ <Property></Property>
+ <Property name="label">娴峰悍鍖哄煙ID</Property>
+ </PropertyDef>
+ <PropertyDef name="cqfkqdm">
+ <Property></Property>
+ <Property name="label">浜ф潈鏂瑰簱鍖轰唬鐮�</Property>
+ </PropertyDef>
<PropertyDef name="czbz">
<Property></Property>
<Property name="label">鎿嶄綔鏍囧織</Property>
@@ -397,6 +425,21 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">kqzt</Property>
+ <Property name="property">kqzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hkRegionId</Property>
+ <Property name="property">hkRegionId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cqfkqdm</Property>
+ <Property name="property">cqfkqdm</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/Api1212PR.java b/src/main/java/com/fzzy/api/view/pr/Api1212PR.java
index 455b839..9585656 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1212PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1212PR.java
@@ -119,6 +119,9 @@
Api1212 data = new Api1212();
BeanUtils.copyProperties(entity, data);
+ if(StringUtils.isEmpty(data.getId())){
+ data.setId(ContextUtil.getUUID());
+ }
apiRepository.save(data);
}
--
Gitblit v1.9.3