From 7a14f207f67d6638a7c7fbe93fbccbd5d7645783 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 16 八月 2023 16:01:05 +0800
Subject: [PATCH] 优化提交
---
src/main/java/com/fzzy/api/entity/Api1101.java | 5 --
src/main/java/com/fzzy/api/view/Api1102.view.xml | 2
src/main/java/com/fzzy/api/entity/Api1403.java | 2
src/main/java/com/fzzy/api/entity/Api1202.java | 44 +++++++++------------
src/main/java/com/fzzy/api/view/Api1101.view.xml | 25 ++++++++++++
5 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1101.java b/src/main/java/com/fzzy/api/entity/Api1101.java
index ac9602b..ca41c52 100644
--- a/src/main/java/com/fzzy/api/entity/Api1101.java
+++ b/src/main/java/com/fzzy/api/entity/Api1101.java
@@ -141,26 +141,21 @@
@Column(name = "dwzt",length = 1)
private String dwzt;
- @JSONField(serialize = false)
@Column(name = "balx", length = 1)
@PropertyDef(label = "澶囨绫诲瀷", description = "0:鍒濇澶囨 1:鍙樻洿澶囨 2:閲嶆柊澶囨")
private String balx;
- @JSONField(serialize = false)
@Column(name = "ccywlx", length = 20)
@PropertyDef(label = "浠撳偍涓氬姟绫诲瀷")
private String ccywlx;
- @JSONField(serialize = false)
@Column(name = "ccpz", length = 20)
@PropertyDef(label = "浠撳偍鍝佺")
private String ccpz;
- @JSONField(serialize = false)
@Column(name = "bazt", length = 1)
@PropertyDef(label = "澶囨鐘舵��")
private String bazt;
-
@PropertyDef(label = "鎿嶄綔鏍囧織")
@Column(name = "czbz", length = 1, nullable = false)
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index f8f9a08..be445d6 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -26,12 +26,6 @@
public static String SORT_PROP = "rkywdh";
-
-// @Id
-// @JSONField(serialize = false)
-// @Column(name = "id", length = 40)
-// private String id;
-
//12 浣嶆暟瀛楃粍鎴愶紝绗� 1-2 浣嶄负涓氬姟浠ｇ爜锛�14浠ｈ〃绮鍏ュ簱锛夛紝绗� 3-8 浣嶄緷娆′负骞翠唤鐨勫悗涓や綅銆�2 浣嶆湀浠姐��2 浣嶆棩鏈燂紝鍚庡洓浣嶄负椤哄簭鐮併�備緥濡傦細141605041234
@Id
@PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
@@ -129,7 +123,7 @@
private String jjlx;
@PropertyDef(label = "姣涢噸(鍏枻)")
- @Column(name = "mz", precision = 20, scale = 6)
+ @Column(name = "mz")
private double mz;
@PropertyDef(label = "姣涢噸鐩戠鍛�")
@@ -150,7 +144,7 @@
private String zcy;
@PropertyDef(label = "鐨噸(鍏枻)")
- @Column(name = "pz", precision = 20, scale = 6)
+ @Column(name = "pz")
private double pz;
@PropertyDef(label = "鐨噸鐩戠鍛�")
@@ -171,7 +165,7 @@
private String bzw;
@PropertyDef(label = "鏍囧噯鍖呭崟鍖呴噸(鍏枻)")
- @Column(name = "bzbdbz", precision = 20, scale = 6)
+ @Column(name = "bzbdbz")
private double bzbdbz = 25;
@PropertyDef(label = "鏍囧噯鍖呬欢鏁�(浠�)")
@@ -179,55 +173,55 @@
private Integer bzbjs;
@PropertyDef(label = "璐ㄦ鎵ｉ噺(灏忚:鍏枻)")
- @Column(name = "zjklxj", precision = 20, scale = 6)
+ @Column(name = "zjklxj")
private double zjklxj;
@PropertyDef(label = "鍏朵腑锛氭按鍒嗗鎵ｉ噺(鍏枻)")
- @Column(name = "qzsfzkl", precision = 20, scale = 6)
+ @Column(name = "qzsfzkl")
private double qzsfzkl;
@PropertyDef(label = "鍏朵腑锛氭潅璐ㄥ鎵ｉ噺(鍏枻)")
- @Column(name = "qzzzzkl", precision = 20, scale = 6)
+ @Column(name = "qzzzzkl")
private double qzzzzkl;
@PropertyDef(label = "鍏朵腑锛氫笉瀹屽杽绮掓墸閲�(鍏枻)")
- @Column(name = "qzbwslkl", precision = 20, scale = 6)
+ @Column(name = "qzbwslkl")
private double qzbwslkl;
@PropertyDef(label = "鍏朵腑锛氫簰娣锋墸閲�(鍏枻)")
- @Column(name = "qzhhkl", precision = 20, scale = 6)
+ @Column(name = "qzhhkl")
private double qzhhkl;
@PropertyDef(label = "鍏朵腑锛氱敓闇夌矑鎵ｉ噺(鍏枻)")
- @Column(name = "qzsmlkl", precision = 20, scale = 6)
+ @Column(name = "qzsmlkl")
private double qzsmlkl;
@PropertyDef(label = "鍏朵腑锛氭暣绮剧背绮掓墸閲�(鍏枻)")
- @Column(name = "qzzjmlkl", precision = 20, scale = 6)
+ @Column(name = "qzzjmlkl")
private double qzzjmlkl;
@PropertyDef(label = "鍏朵腑锛氳胺澶栫硻绫虫墸閲�(鍏枻)")
- @Column(name = "qzgwcmkl", precision = 20, scale = 6)
+ @Column(name = "qzgwcmkl")
private double qzgwcmkl;
@PropertyDef(label = "鍏朵腑榛勭矑绫虫墸閲�(鍏枻)")
- @Column(name = "qzhlmkl", precision = 20, scale = 6)
+ @Column(name = "qzhlmkl")
private double qzhlmkl;
@PropertyDef(label = "鍏朵腑锛氬叾浠栨墸閲�(鍏枻)")
- @Column(name = "qzqtkl", precision = 20, scale = 6)
+ @Column(name = "qzqtkl")
private double qzqtkl;
@PropertyDef(label = "鏁寸悊璐圭敤鎶樻墸閲�(鍏枻)")
- @Column(name = "zlfyzkl", precision = 20, scale = 6)
+ @Column(name = "zlfyzkl")
private double zlfyzkl;
@PropertyDef(label = "鍖呰鐗╂墸閲�(鍏枻)")
- @Column(name = "bzwkl", precision = 20, scale = 6)
+ @Column(name = "bzwkl")
private double bzwkl;
@PropertyDef(label = "鍏朵粬鎵ｉ噺(鍏枻)")
- @Column(name = "qtkl", precision = 20, scale = 6)
+ @Column(name = "qtkl")
private double qtkl;
@PropertyDef(label = "鎵ｉ噺鍘熷洜")
@@ -235,11 +229,11 @@
private String klyy;
@PropertyDef(label = "鐜板満鎵ｉ噺(鍏枻)")
- @Column(name = "xckl", precision = 20, scale = 6)
+ @Column(name = "xckl")
private double xckl;
@PropertyDef(label = "澧炴墸浠�(鍏枻)")
- @Column(name = "zkj", precision = 20, scale = 6)
+ @Column(name = "zkj")
private double zkj;
@PropertyDef(label = "澧炴墸浠峰師鍥�")
@@ -247,7 +241,7 @@
private String zkhyy;
@PropertyDef(label = "鍑�閲�(鍏枻)")
- @Column(name = "jz", precision = 20, scale = 6)
+ @Column(name = "jz")
private double jz;
@PropertyDef(label = "瑁呭嵏浣滀笟鍗曚綅")
diff --git a/src/main/java/com/fzzy/api/entity/Api1403.java b/src/main/java/com/fzzy/api/entity/Api1403.java
index 0c7f357..28a57c4 100644
--- a/src/main/java/com/fzzy/api/entity/Api1403.java
+++ b/src/main/java/com/fzzy/api/entity/Api1403.java
@@ -60,7 +60,7 @@
private String jhxddw;
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅鍚嶇О" )
- @Column(name = "jhxddw", length = 256)
+ @Column(name = "jhxddwmc", length = 256)
private String jhxddwmc;
@JSONField(format = "yyyy-MM-dd")
diff --git a/src/main/java/com/fzzy/api/view/Api1101.view.xml b/src/main/java/com/fzzy/api/view/Api1101.view.xml
index 15e690d..921af6c 100644
--- a/src/main/java/com/fzzy/api/view/Api1101.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1101.view.xml
@@ -152,6 +152,26 @@
<Property></Property>
<Property name="label">澶囨鐘舵��</Property>
</PropertyDef>
+ <PropertyDef name="dwzt">
+ <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>
</DataType>
<DataType name="dtGBArea">
<Property name="creationType">com.fzzy.api.entity.GbArea</Property>
@@ -607,6 +627,11 @@
<Property name="property">bazt</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwzt</Property>
+ <Property name="property">dwzt</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
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 e7b6343..d0fe9a1 100644
--- a/src/main/java/com/fzzy/api/view/Api1102.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1102.view.xml
@@ -79,7 +79,7 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="key">1-姝ｅ父</Property>
+ <Property name="key">1</Property>
<Property name="value">姝ｅ父</Property>
</Entity>
<Entity>
--
Gitblit v1.9.3