From 99f928a971a5d2c58d5fafb38728471a39b5a759 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 02 十一月 2023 15:20:57 +0800
Subject: [PATCH] 优化人员信息
---
igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java | 27 -
igds-manager/src/main/java/com/ld/igds/models/OAStaff.java | 27 +-
igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml | 610 +++++++++++++++++++++++++++++++++++++++++++-------
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | 2
igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java | 8
igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java | 44 +++
6 files changed, 587 insertions(+), 131 deletions(-)
diff --git a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
index ec90fa8..6436f8d 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
@@ -3,7 +3,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -20,29 +19,17 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID")
- private String id;
-
- @Column(name = "kqdm", length = 40)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
+ @Column(name = "sbbh", length = 20)
+ @PropertyDef(label = "璁惧缂栧彿")
+ private String sbbh;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜", description = "")
private String companyId;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @Column(name = "kqmc", length = 256)
- @PropertyDef(label = "搴撳尯鍚嶇О")
- private String kqmc;
-
- @Column(name = "sbbh", length = 20)
- @PropertyDef(label = "璁惧缂栧彿")
- private String sbbh;
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲簱鍖�")
+ private String deptId;
@Column(name = "sbyqmc", length = 50)
@PropertyDef(label = "璁惧浠櫒鍚嶇О")
@@ -75,7 +62,6 @@
@Column(name = "jdsj")
@PropertyDef(label = "妫�瀹氭椂闂�")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date jdsj;
@Column(name = "jddw", length = 256)
@@ -84,7 +70,6 @@
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏇存柊鏃堕棿")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
}
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 c359c92..0b862ad 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
@@ -25,30 +25,31 @@
@Table(name = "D_OA_STAFF")
public class OAStaff implements Serializable {
private static final long serialVersionUID = 1L;
+
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID")
- private String id;
+ @Column(name = "sfzhm", length = 18)
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜", description = "")
private String companyId;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @Column(name = "dwmc", length = 256)
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
+ @Column(name = "DEPT_ID_", length = 20)
+ @PropertyDef(label = "搴撳尯缂栫爜", description = "")
+ private String deptId;
@Column(name = "lsbm", length = 256)
@PropertyDef(label = "闅跺睘閮ㄩ棬", description = "闅跺睘閮ㄩ棬鍚嶇О")
private String lsbm;
@Column(name = "xzqhdm", length = 6)
- @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
private String xzqhdm;
+
+ @Column(name = "xzqhmc", length = 6)
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
+ private String xzqhmc;
@Column(name = "xm", length = 32)
@PropertyDef(label = "濮撳悕")
@@ -57,10 +58,6 @@
@Column(name = "xb", length = 1)
@PropertyDef(label = "鎬у埆")
private String xb;
-
- @Column(name = "sfzhm", length = 18)
- @PropertyDef(label = "韬唤璇佸彿鐮�")
- private String sfzhm;
@Column(name = "rzrq")
@PropertyDef(label = "鍏ヨ亴鏃ユ湡")
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
index 37a7a54..0e6091b 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
@@ -9,6 +9,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -57,14 +58,12 @@
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
- if (StringUtils.isEmpty(data.getKqdm())) {
- data.setKqdm(ContextUtil.subDeptId(null));
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(null));
}
- DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
- data.setKqmc(dept.getName());
data.setUpdateTime(new Date());
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getSbbh()) {
+ data.setSbbh(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
}
session.saveOrUpdate(data);
} finally {
@@ -74,6 +73,39 @@
return null;
}
+ public String getIndex(String companyId) {
+ List<DeptDevice> list = getDataByTime(companyId);
+ int index = 10000;
+ if (list != null && list.size() > 0) {
+ String id = list.get(0).getSbbh().substring(8);
+ int temp = Integer.valueOf(id) + 1;
+ index += temp;
+ }else {
+ index ++;
+ }
+ return String.valueOf(index).substring(1);
+ }
+
+ private List<DeptDevice> getDataByTime(String companyId) {
+ String hql = " from " + DeptDevice.class.getName()
+ + " where companyId =:companyId ";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", companyId);
+
+ hql += " and updateTime >:startTime";
+ args.put("startTime", DateUtil.getCurZero(new Date()));
+
+
+ hql += " and updateTime <:endTime";
+ args.put("endTime", DateUtil.getNextZero(new Date()));
+
+
+ hql += " order by id desc";
+
+ return this.query(hql, args);
+ }
+
public String delData(DeptDevice data) {
Session session = this.getSessionFactory().openSession();
try {
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
index a867e98..c9b088b 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
@@ -68,13 +68,13 @@
}
public String saveOrUpdate(OAStaff data) {
-
+ //鍒ゆ柇缁勭粐缂栫爜
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(data.getCompanyId());
+ }
Session session = this.getSessionFactory().openSession();
try {
data.setCompanyId(ContextUtil.getCompanyId());
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
- }
session.saveOrUpdate(data);
} finally {
session.flush();
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 12c3b54..7b453e3 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
@@ -5,21 +5,24 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.OAStaff</Property>
- <PropertyDef name="id">
+ <PropertyDef name="sfzhm">
<Property></Property>
- <Property name="label">ID</Property>
+ <Property name="label">韬唤璇佸彿鐮�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="dwdm">
+ <PropertyDef name="deptId">
<Property></Property>
- <Property name="label">鍗曚綅浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="dwmc">
- <Property></Property>
- <Property name="label">鍗曚綅鍚嶇О</Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lsbm">
<Property></Property>
@@ -28,7 +31,12 @@
</PropertyDef>
<PropertyDef name="xzqhdm">
<Property></Property>
- <Property name="label">琛屾斂鍖哄垝浠ｇ爜</Property>
+ <Property name="label">鎵�灞炶鏀垮尯鍒�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhmc">
+ <Property></Property>
+ <Property name="label">鎵�灞炶鏀垮尯鍒�</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xm">
@@ -57,11 +65,6 @@
</Property>
<Property name="required">true</Property>
</PropertyDef>
- <PropertyDef name="sfzhm">
- <Property></Property>
- <Property name="label">韬唤璇佸彿鐮�</Property>
- <Property name="required">true</Property>
- </PropertyDef>
<PropertyDef name="rzrq">
<Property name="dataType">Date</Property>
<Property name="label">鍏ヨ亴鏃ユ湡</Property>
@@ -71,9 +74,24 @@
<Property></Property>
<Property name="label">宀椾綅鎬ц川</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("GWXZ")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-鍦ㄥ矖鑱屽伐(闀挎湡)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-鍦ㄥ矖鑱屽伐(涓存椂)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">20</Property>
+ <Property name="value">20-鍏朵粬浠庝笟浜哄憳</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
<Property name="required">true</Property>
</PropertyDef>
@@ -81,9 +99,20 @@
<Property></Property>
<Property name="label">鍦ㄥ矖鐘舵��</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZGZT")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-鍦ㄥ矖</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-宸茬鑱�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
<Property name="required">true</Property>
</PropertyDef>
@@ -108,9 +137,236 @@
<Property></Property>
<Property name="label">姘戞棌</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("MZ")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-姹夋棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-钂欏彜鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">03</Property>
+ <Property name="value">03-鍥炴棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">04</Property>
+ <Property name="value">04-钘忔棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">05</Property>
+ <Property name="value">05-缁村惥灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">06</Property>
+ <Property name="value">06-鑻楁棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">07</Property>
+ <Property name="value">07-褰濇棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">08</Property>
+ <Property name="value">08-澹棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">09</Property>
+ <Property name="value">09-甯冧緷鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10-鏈濋矞鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-婊℃棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-渚楁棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-鐟舵棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14-鐧芥棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15-鍦熷鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16-鍝堝凹鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">17</Property>
+ <Property name="value">17-鍝堣惃鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">18</Property>
+ <Property name="value">18-鍌ｆ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">19</Property>
+ <Property name="value">19-榛庢棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">20</Property>
+ <Property name="value">20-鍌堝兂鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">21</Property>
+ <Property name="value">21-浣ゆ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">22</Property>
+ <Property name="value">22-鐣叉棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">23</Property>
+ <Property name="value">23-楂樺北鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">24</Property>
+ <Property name="value">24-鎷夌鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">25</Property>
+ <Property name="value">25-姘存棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">26</Property>
+ <Property name="value">26-涓滀埂鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">27</Property>
+ <Property name="value">27-绾宠タ鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">28</Property>
+ <Property name="value">28-鏅鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">29</Property>
+ <Property name="value">29-鏌皵鍏嬪瓬鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">30</Property>
+ <Property name="value">30-鍦熸棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">31</Property>
+ <Property name="value">31-杈炬枴灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">32</Property>
+ <Property name="value">32-浠浆鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">33</Property>
+ <Property name="value">33-缇屾棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">34</Property>
+ <Property name="value">34-甯冩湕鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">35</Property>
+ <Property name="value">35-鎾掓媺鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">36</Property>
+ <Property name="value">36-姣涘崡鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">37</Property>
+ <Property name="value">37-浠′浆</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">38</Property>
+ <Property name="value">38-閿′集鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">39</Property>
+ <Property name="value">39-闃挎槍鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">40</Property>
+ <Property name="value">40-鏅背鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">41</Property>
+ <Property name="value">41-濉斿悏鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">42</Property>
+ <Property name="value">42-鎬掓棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">43</Property>
+ <Property name="value">43-涔屽瓬鍒厠鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">44</Property>
+ <Property name="value">44-淇勭綏鏂棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">45</Property>
+ <Property name="value">45-閯傛俯鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">46</Property>
+ <Property name="value">46-宕╅緳鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">47</Property>
+ <Property name="value">47-淇濆畨鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">48</Property>
+ <Property name="value">48-瑁曞浐鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">49</Property>
+ <Property name="value">49-浜棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">50</Property>
+ <Property name="value">50-濉斿灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">51</Property>
+ <Property name="value">51-鐙緳鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">52</Property>
+ <Property name="value">52-閯備鸡鏄ユ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">53</Property>
+ <Property name="value">53-璧摬鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">54</Property>
+ <Property name="value">54-闂ㄥ反鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">55</Property>
+ <Property name="value">55-鐝炲反鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">56</Property>
+ <Property name="value">56-鍩鸿鏃�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
<Property name="required">true</Property>
</PropertyDef>
@@ -118,9 +374,64 @@
<Property></Property>
<Property name="label">鏀挎不闈㈣矊</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZZMM")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-涓浗鍏变骇鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-涓浗鍏变骇鍏氶澶囧厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">03</Property>
+ <Property name="value">03-涓浗鍏变骇涓讳箟闈掑勾鍥㈠洟鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">04</Property>
+ <Property name="value">04-涓浗鍥芥皯鍏氶潻鍛藉鍛樹細浼氬憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">05</Property>
+ <Property name="value">05-涓浗涓诲悓鐩熺洘鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">06</Property>
+ <Property name="value">06-涓浗姘戜富寤哄浗浼氫細鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">07</Property>
+ <Property name="value">07-涓浗姘戜富淇冭繘浼氫細鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">08</Property>
+ <Property name="value">08-涓浗鍐滃伐姘戜富鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">09</Property>
+ <Property name="value">09-涓浗鑷村叕鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10-涔濅笁瀛︾ぞ绀惧憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-鍙版咕姘戜富鑷不鍚岀洘鐩熷憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-鏃犲厷娲炬皯涓讳汉澹�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-缇や紬</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
<Property name="required">true</Property>
</PropertyDef>
@@ -128,9 +439,80 @@
<Property></Property>
<Property name="label">浜哄憳绫诲埆</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RYLB")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1100</Property>
+ <Property name="value">1100-鍏姟鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1200</Property>
+ <Property name="value">1200-浜嬩笟鍗曚綅绠＄悊浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1300</Property>
+ <Property name="value">1300-浼佷笟缁忚惀绠＄悊浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1400</Property>
+ <Property name="value">1400-涓撲笟鎶�鏈汉鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1410</Property>
+ <Property name="value">1410-楂樼骇鑱岀О</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1411</Property>
+ <Property name="value">1411-姝ｉ珮绾ц亴绉�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1420</Property>
+ <Property name="value">1420-涓骇鑱岀О</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1430</Property>
+ <Property name="value">1430-鍒濈骇鍙婁互涓嬭亴绉�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1431</Property>
+ <Property name="value">1431-涓昏涓撹亴淇濈浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1432</Property>
+ <Property name="value">1432-涓昏涓撹亴妫�鍖栭獙浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1500</Property>
+ <Property name="value">1500-宸ヤ汉</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1510</Property>
+ <Property name="value">1510-鎶�鏈伐浜�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1511</Property>
+ <Property name="value">1511-楂樼骇鎶�甯�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1512</Property>
+ <Property name="value">1512-鎶�甯�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1513</Property>
+ <Property name="value">1513-楂樼骇宸�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1514</Property>
+ <Property name="value">1514-涓骇宸�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1515</Property>
+ <Property name="value">1515-鍒濈骇宸�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
</PropertyDef>
<PropertyDef name="zy">
@@ -139,15 +521,38 @@
</PropertyDef>
<PropertyDef name="qdzgzchzyzgsj">
<Property name="dataType">Date</Property>
- <Property name="label">鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿</Property>
+ <Property name="label">鑱屼笟璧勬牸鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="xl">
<Property></Property>
<Property name="label">瀛﹀巻</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("XL")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">0-鐮旂┒鐢�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-澶у鏈</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-澶у涓撶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-涓笓</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-楂樹腑鍙婁互涓�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
<Property name="required">true</Property>
</PropertyDef>
@@ -169,14 +574,6 @@
</PropertyDef>
<PropertyDef name="userId">
<Property name="label">韬唤璇佸彿</Property>
- </PropertyDef>
- <PropertyDef name="start">
- <Property name="label">鍏ヨ亴鏃ユ湡锛堝紑濮嬶級</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="end">
- <Property name="label">鍏ヨ亴鏃ユ湡锛堢粨鏉燂級</Property>
- <Property name="dataType">Date</Property>
</PropertyDef>
</DataType>
</Model>
@@ -262,12 +659,6 @@
<Property name="exClassName">btn-normal</Property>
<Property name="iconClass">fa fa-search</Property>
</Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsParam").flushAsync();</ClientEvent>
- <Property name="caption">閲嶇疆</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- <Property name="exClassName">btn-default</Property>
- </Button>
</Container>
</AutoForm>
<DataGrid id="dgMain">
@@ -278,12 +669,12 @@
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
</RowNumColumn>
- <DataColumn name="lsbm">
- <Property name="property">lsbm</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="xm">
<Property name="property">xm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lsbm">
+ <Property name="property">lsbm</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="xb">
@@ -306,22 +697,6 @@
<Property name="property">mz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="rylb">
- <Property name="property">rylb</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="zy">
- <Property name="property">zy</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="qdzgzchzyzgsj">
- <Property name="property">qdzgzchzyzgsj</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="xl">
- <Property name="property">xl</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="zw">
<Property name="property">zw</Property>
<Property name="align">center</Property>
@@ -341,8 +716,8 @@
</Container>
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
- <Property name="caption">浠撳簱璁惧淇℃伅</Property>
- <Property name="width">80%</Property>
+ <Property name="caption">浜哄憳淇℃伅</Property>
+ <Property name="width">70%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
<Button id="btnOk">
@@ -367,23 +742,23 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelAlign">left</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">lsbm</Property>
- <Property name="property">lsbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhdm</Property>
- <Property name="property">xzqhdm</Property>
- <Editor/>
- </AutoFormElement>
+ <Property name="labelWidth">120</Property>
<AutoFormElement>
<Property name="name">xm</Property>
<Property name="property">xm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfzhm</Property>
+ <Property name="property">sfzhm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -392,8 +767,14 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfzhm</Property>
- <Property name="property">sfzhm</Property>
+ <Property name="name">lsbm</Property>
+ <Property name="property">lsbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhmc</Property>
+ <Property name="property">xzqhmc</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -487,5 +868,66 @@
<Property name="service">staffPR#delData</Property>
<Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
</AjaxAction>
+ <CustomDropDown id="ddFoodOrigin">
+ <Property name="minHeight">500</Property>
+ <Property name="assignmentMap">xzqhmc=name,xzqhdm=code</Property>
+ <Property name="minWidth">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsFoodOrigin">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="parameter"></Property>
+ <Property name="pageSize">30</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+ view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;</ClientEvent>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="simple">
+ <Property name="property">simple</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <DataPilot layoutConstraint="bottom">
+ <Property name="dataSet">dsFoodOrigin</Property>
+ </DataPilot>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
index d257254..64b0173 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -39,7 +39,7 @@
//寰愰椈鏈嶅姟鍣ㄤ娇鐢�
// bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
- //姹熻タ璧ｅ窞銆佸箍涓滈珮宸炰娇鐢�
+ //姹熻タ璧ｅ窞銆佸箍涓滈珮宸炰娇鐢ㄣ�佽タ钘忓北鍗椼�佸畞澶忕煶鍢村北銆佸箍涓滀經灞�
bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
//骞夸笢楂樺窞浣跨敤
// bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
--
Gitblit v1.9.3