From f23f7a18fe8fe3729dfb91af5b55b515b835c7d8 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 17 八月 2023 17:40:16 +0800
Subject: [PATCH] 问题修改
---
igds-core/src/main/java/com/ld/igds/models/Building.java | 4 --
igds-core/src/main/java/com/ld/igds/view/Depot.view.xml | 5 ++
igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml | 3 +
igds-recir/src/main/java/com/ld/igds/models/Drug.java | 2
igds-recir/src/main/java/models/recir.model.xml | 3 +
igds-core/src/main/java/com/ld/igds/models/Depot.java | 6 ++
igds-manager/src/main/java/com/ld/igds/models/OAStaff.java | 4 +-
igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml | 48 ++++++++++++------------
igds-core/src/main/java/com/ld/igds/view/Building.view.xml | 5 --
igds-recir/src/main/java/com/ld/igds/drug/service/DrugRowMapper.java | 2
igds-core/src/main/java/models/igds.model.xml | 18 ++++----
11 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/Building.java b/igds-core/src/main/java/com/ld/igds/models/Building.java
index a96d9b1..a46af0b 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Building.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Building.java
@@ -36,10 +36,6 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @Column(name = "ggm", length = 50)
- @PropertyDef(label = "鍥借鐮�")
- private String ggm;
-
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鎵�灞炲簱鐐�")
private String deptId;
diff --git a/igds-core/src/main/java/com/ld/igds/models/Depot.java b/igds-core/src/main/java/com/ld/igds/models/Depot.java
index c1a3c79..8f92fd0 100644
--- a/igds-core/src/main/java/com/ld/igds/models/Depot.java
+++ b/igds-core/src/main/java/com/ld/igds/models/Depot.java
@@ -40,6 +40,10 @@
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鎵�灞炲垎搴�")
private String deptId;
+
+ @Column(name = "ggm", length = 50)
+ @PropertyDef(label = "鍥借鐮�")
+ private String ggm;
@Column(name = "NAME_", length = 50)
@PropertyDef(label = "璐т綅鍚嶇О")
@@ -112,7 +116,7 @@
@Column(name = "STORE_KEEPER_NAME_", length = 50)
@PropertyDef(label = "淇濈鍛�", description = "涓枃鍚嶇О")
private String storeKeeperName;
-
+
@Column(name = "STORE_DATE_")
@PropertyDef(label = "鍏ュ簱鏃堕棿", description = "榛樿绌猴紝閫氳繃搴撳瓨鍙樻洿")
private Date storeDate;
diff --git a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
index 695fb29..2a4c0c3 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Building.view.xml
@@ -153,11 +153,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">ggm</Property>
- <Property name="property">ggm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">deptId</Property>
<Property name="property">deptId</Property>
<Editor/>
diff --git a/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml b/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
index 7abcd92..a015b3c 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Depot.view.xml
@@ -341,6 +341,11 @@
<Property name="trigger">autoMappingDropDown2</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">ggm</Property>
+ <Property name="property">ggm</Property>
+ <Editor/>
+ </AutoFormElement>
<Label layoutConstraint="colSpan:3">
<Property name="text">璇存槑锛�1銆佸疄闄呭偍閲忚皟鏁磋浣跨敤鈥滃簱瀛樼鐞嗏�濆姛鑳斤紱2銆佷粨鐘舵�侊細绌轰粨銆佹弧浠撱�佸嚭鍏ュ簱涓姸鎬佽浣跨敤鈥滃簱瀛樼鐞嗏�濆姛鑳�</Property>
<Property name="style">
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index 68c3feb..cb59728 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -154,10 +154,6 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="ggm">
- <Property></Property>
- <Property name="label">鍥借鐮�</Property>
- </PropertyDef>
</DataType>
<DataType name="dtDepot">
<Property name="creationType">com.ld.igds.models.Depot</Property>
@@ -316,6 +312,10 @@
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞</Property>
+ </PropertyDef>
+ <PropertyDef name="ggm">
+ <Property/>
+ <Property name="label">鍥借鐮�</Property>
</PropertyDef>
</DataType>
<DataType name="dtDepotStore">
@@ -604,23 +604,23 @@
<Property name="label">浣嶇疆</Property>
</PropertyDef>
<PropertyDef name="modbus">
- <Property/>
+ <Property></Property>
<Property name="label">Modbus閰嶇疆</Property>
</PropertyDef>
<PropertyDef name="ext1">
- <Property/>
+ <Property></Property>
<Property name="label">鎵╁睍瀛楁1</Property>
</PropertyDef>
<PropertyDef name="ext2">
- <Property/>
+ <Property></Property>
<Property name="label">鎵╁睍瀛楁2</Property>
</PropertyDef>
<PropertyDef name="ext3">
- <Property/>
+ <Property></Property>
<Property name="label">鎵╁睍瀛楁3</Property>
</PropertyDef>
<PropertyDef name="statusName">
- <Property/>
+ <Property></Property>
<Property name="label">褰撳墠鐘舵��</Property>
</PropertyDef>
</DataType>
diff --git a/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java b/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
index 10eea9a..c359c92 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
@@ -84,9 +84,9 @@
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date lzrq;
- @Column(name = "zidh", length = 16)
+ @Column(name = "zjdh", length = 16)
@PropertyDef(label = "搴ф満鐢佃瘽")
- private String zidh;
+ private String zjdh;
@Column(name = "yddh", length = 16)
@PropertyDef(label = "绉诲姩鐢佃瘽")
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
index 9c815cb..83ea38b 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -671,9 +671,10 @@
<Property name="trigger">listDropYN</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
+ <Property name="editorType">TextArea</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
index c174882..1329fae 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
@@ -6,35 +6,35 @@
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.OAStaff</Property>
<PropertyDef name="id">
- <Property/>
+ <Property></Property>
<Property name="label">ID</Property>
</PropertyDef>
<PropertyDef name="companyId">
- <Property/>
+ <Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
<PropertyDef name="dwdm">
- <Property/>
+ <Property></Property>
<Property name="label">鍗曚綅浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="dwmc">
- <Property/>
+ <Property></Property>
<Property name="label">鍗曚綅鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="lsbm">
- <Property/>
+ <Property></Property>
<Property name="label">闅跺睘閮ㄩ棬</Property>
</PropertyDef>
<PropertyDef name="xzqhdm">
- <Property/>
+ <Property></Property>
<Property name="label">琛屾斂鍖哄垝浠ｇ爜</Property>
</PropertyDef>
<PropertyDef name="xm">
- <Property/>
+ <Property></Property>
<Property name="label">濮撳悕</Property>
</PropertyDef>
<PropertyDef name="xb">
- <Property/>
+ <Property></Property>
<Property name="label">鎬у埆</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
@@ -54,7 +54,7 @@
</Property>
</PropertyDef>
<PropertyDef name="sfzhm">
- <Property/>
+ <Property></Property>
<Property name="label">韬唤璇佸彿鐮�</Property>
</PropertyDef>
<PropertyDef name="rzrq">
@@ -62,7 +62,7 @@
<Property name="label">鍏ヨ亴鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="gwxz">
- <Property/>
+ <Property></Property>
<Property name="label">宀椾綅鎬ц川</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("GWXZ")}</Property>
@@ -71,7 +71,7 @@
</Property>
</PropertyDef>
<PropertyDef name="zgzt">
- <Property/>
+ <Property></Property>
<Property name="label">鍦ㄥ矖鐘舵��</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZGZT")}</Property>
@@ -80,24 +80,24 @@
</Property>
</PropertyDef>
<PropertyDef name="lzrq">
- <Property/>
+ <Property></Property>
<Property name="label">绂昏亴鏃ユ湡</Property>
<Property name="dataType">Date</Property>
</PropertyDef>
- <PropertyDef name="zidh">
- <Property/>
+ <PropertyDef name="zjdh">
+ <Property></Property>
<Property name="label">搴ф満鐢佃瘽</Property>
</PropertyDef>
<PropertyDef name="yddh">
- <Property/>
+ <Property></Property>
<Property name="label">绉诲姩鐢佃瘽</Property>
</PropertyDef>
<PropertyDef name="dzyx">
- <Property/>
+ <Property></Property>
<Property name="label">鐢靛瓙閭</Property>
</PropertyDef>
<PropertyDef name="mz">
- <Property/>
+ <Property></Property>
<Property name="label">姘戞棌</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("MZ")}</Property>
@@ -106,7 +106,7 @@
</Property>
</PropertyDef>
<PropertyDef name="zzmm">
- <Property/>
+ <Property></Property>
<Property name="label">鏀挎不闈㈣矊</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZZMM")}</Property>
@@ -115,7 +115,7 @@
</Property>
</PropertyDef>
<PropertyDef name="rylb">
- <Property/>
+ <Property></Property>
<Property name="label">浜哄憳绫诲埆</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RYLB")}</Property>
@@ -124,7 +124,7 @@
</Property>
</PropertyDef>
<PropertyDef name="zy">
- <Property/>
+ <Property></Property>
<Property name="label">涓撲笟</Property>
</PropertyDef>
<PropertyDef name="qdzgzchzyzgsj">
@@ -132,7 +132,7 @@
<Property name="label">鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="xl">
- <Property/>
+ <Property></Property>
<Property name="label">瀛﹀巻</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("XL")}</Property>
@@ -141,7 +141,7 @@
</Property>
</PropertyDef>
<PropertyDef name="zw">
- <Property/>
+ <Property></Property>
<Property name="label">鑱屽姟</Property>
</PropertyDef>
<PropertyDef name="updateTime">
@@ -402,8 +402,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">zidh</Property>
- <Property name="property">zidh</Property>
+ <Property name="name">zjdh</Property>
+ <Property name="property">zjdh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/DrugRowMapper.java b/igds-recir/src/main/java/com/ld/igds/drug/service/DrugRowMapper.java
index 23c1663..4a93d3d 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/DrugRowMapper.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/DrugRowMapper.java
@@ -14,7 +14,7 @@
Drug data = new Drug();
data.setId(rs.getString("ID_"));
data.setCompanyId(rs.getString("COMPANY_ID_"));
- data.setCount(rs.getInt("COUNT_"));
+ data.setCount(rs.getDouble("COUNT_"));
data.setDosage(rs.getString("DOSAGE_"));
data.setName(rs.getString("NAME_"));
// data.setSpec(rs.getString("SPEC_"));
diff --git a/igds-recir/src/main/java/com/ld/igds/models/Drug.java b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
index 06f4130..b15da85 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/Drug.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
@@ -108,7 +108,7 @@
@Column(name = "COUNT_")
@PropertyDef(label = "搴撳瓨閲�")
- private int count = 0;
+ private Double count = 0.0;
@Column(name = "kcsldw", length = 1)
@PropertyDef(label = "搴撳瓨閲忓崟浣�", description = "1(榛樿)锛氬叕鏂わ紱2锛氬厠锛�3锛氭鍗囷紱")
diff --git a/igds-recir/src/main/java/models/recir.model.xml b/igds-recir/src/main/java/models/recir.model.xml
index b27ceb3..0e12c47 100644
--- a/igds-recir/src/main/java/models/recir.model.xml
+++ b/igds-recir/src/main/java/models/recir.model.xml
@@ -25,9 +25,10 @@
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="count">
- <Property name="dataType">int</Property>
+ <Property name="dataType">Double</Property>
<Property name="label">搴撳瓨閲�</Property>
<Property name="required">true</Property>
+ <Property name="displayFormat">#0.000000</Property>
</PropertyDef>
<PropertyDef name="updateUser">
<Property></Property>
--
Gitblit v1.9.3