From adac5fc11cfb7a0c0500d59e5e9761c218f53a65 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 08 八月 2023 18:12:17 +0800
Subject: [PATCH] 武汉军粮省平台-推送基础信息2
---
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java | 40 --------------------
src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml | 1
src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml | 2
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java | 29 --------------
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuildKey.java | 20 ++++++++++
src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java | 2
6 files changed, 23 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java
index 1cd8310..787a5b1 100644
--- a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuild.java
@@ -15,7 +15,7 @@
@Data
@Entity
@Table(name = "D_BUILDING")
-@IdClass(Fz40WhjlDefaultBuild.class)
+@IdClass(Fz40WhjlDefaultBuildKey.class)
public class Fz40WhjlDefaultBuild implements Serializable {
/**
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuildKey.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuildKey.java
new file mode 100644
index 0000000..4a7a80b
--- /dev/null
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultBuildKey.java
@@ -0,0 +1,20 @@
+package com.fzzy.async.whhpjl.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author:YAN
+ */
+@Data
+@AllArgsConstructor
+public class Fz40WhjlDefaultBuildKey implements Serializable {
+ private String id;
+ private String companyId;
+
+ public Fz40WhjlDefaultBuildKey() {
+ super();
+ }
+}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java
index 56fcc13..2fba0e5 100644
--- a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultDepot.java
@@ -126,33 +126,4 @@
@PropertyDef(label = "鏁版嵁鏇存柊鏃堕棿")
private Date updateTime;
- // ------------鍏朵粬灞炴�т俊鎭�------------//
- @Transient
- @PropertyDef(label = "绮鍝佺")
- private String foodVarietyName;
-
- @Transient
- @PropertyDef(label = "绮鎬ц川")
- private String foodTypeName;
-
- @Transient
- @PropertyDef(label = "浠撳簱绫诲瀷")
- private String depotTypeName;
-
- @Transient
- @PropertyDef(label = "浠撳簱绫诲瀷")
- private String depotStatusName;
-
- @Transient
- @PropertyDef(label = "绮绛夌骇")
- private String foodLevelName;
-
- @Transient
- @PropertyDef(label = "X鍧愭爣", description = "涓夌淮妯″瀷涓潗鏍囷紝椤甸潰鏃犻渶缁存姢")
- private Double posX;
-
- @Transient
- @PropertyDef(label = "Y鍧愭爣", description = "涓夌淮妯″瀷涓潗鏍囷紝椤甸潰鏃犻渶缁存姢")
- private Double posY;
-
}
diff --git a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java
index 3a977dd..a4b0bc3 100644
--- a/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java
+++ b/src/main/java/com/fzzy/async/whhpjl/entity/Fz40WhjlDefaultUser.java
@@ -58,44 +58,4 @@
@Column(name = "CREATE_DATE_")
private Date createDate;
-
-
- // 閮ㄩ棬璇存槑
- @Transient
- private String deptName;
-
- @Transient
- private String deptId;
-
- // 瑙掕壊
- @Transient
- private String roleName;
-
- @Transient
- private String roleId;
-
-// /**
-// * 鐢ㄤ簬BDF2绯荤粺
-// */
-// @Transient
-// private List<IDept> depts;
-//
-// /**
-// * 鐢ㄤ簬BDF2绯荤粺
-// */
-// @Transient
-// private List<Role> roles;
-//
-// /**
-// * 鐢ㄤ簬BDF2绯荤粺
-// */
-// @Transient
-// private List<IPosition> positions;
-//
-// /**
-// * 鐢ㄤ簬BDF2绯荤粺
-// */
-// @Transient
-// private List<Group> groups;
-
}
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml b/src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml
index 189877b..d9cde7a 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml
+++ b/src/main/java/com/fzzy/whjl/view/WhjlApi1102.view.xml
@@ -326,6 +326,7 @@
}</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
+ <Property name="selectionMode">multiRows</Property>
<RowNumColumn/>
<RowSelectorColumn>
<Property name="caption">涓婁紶</Property>
diff --git a/src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml b/src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml
index 332a8ac..72da493 100644
--- a/src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml
+++ b/src/main/java/com/fzzy/whjl/view/WhjlApi1111.view.xml
@@ -56,7 +56,7 @@
<PropertyDef name="cgsj">
<Property></Property>
<Property name="label">閲囪喘鏃堕棿</Property>
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
</PropertyDef>
<PropertyDef name="gl">
<Property></Property>
--
Gitblit v1.9.3