From b419882d270acd9b08426de497ade37a16e10970 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 10 八月 2023 18:35:56 +0800
Subject: [PATCH] 人员,设备,维修

---
 igds-manager/src/main/java/com/ld/igds/oa/view/Asset.view.xml             |    6 
 igds-manager/src/main/java/com/ld/igds/models/OAStaff.java                |  133 +++
 igds-manager/src/main/java/com/ld/igds/oa/view/StaffPR.java               |   59 +
 igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java      |   98 ++
 igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java |  143 +++
 igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml        |  530 ++++++++++++
 igds-core/src/main/java/com/ld/igds/view/Granary.view.xml                 |  364 ++++++++
 igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java             |   93 ++
 igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java     |   82 +
 igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml             |  476 +++++++++++
 igds-manager/src/main/java/com/ld/igds/models/DeviceCheckup.java          |   73 +
 igds-core/src/main/java/com/ld/igds/view/GranaryPR.java                   |   60 +
 igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevicePR.java          |   99 ++
 igds-manager/src/main/java/com/ld/igds/oa/view/DeviceCheckup.view.xml     |  317 +++++++
 14 files changed, 2,529 insertions(+), 4 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml b/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
new file mode 100644
index 0000000..1e5df6d
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+  <Arguments/>
+  <Context/>
+  <Model>
+    <DataType name="dtMain">
+      <Property name="creationType">com.ld.igds.models.Granary</Property>
+      <PropertyDef name="ajdh">
+        <Property></Property>
+        <Property name="label">寤掗棿浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property></Property>
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="deptId">
+        <Property></Property>
+        <Property name="label">鎵�灞炲垎搴�</Property>
+      </PropertyDef>
+      <PropertyDef name="ajmc">
+        <Property></Property>
+        <Property name="label">寤掗棿鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="cfbh">
+        <Property></Property>
+        <Property name="label">浠撴埧(鎴栨补缃�)缂栫爜</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;buildingPR#getCacheBuilding&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="ajcd">
+        <Property name="dataType">double</Property>
+        <Property name="label">寤掗棿闀垮害</Property>
+        <Property name="displayFormat">#0.00绫�</Property>
+      </PropertyDef>
+      <PropertyDef name="ajkd">
+        <Property name="dataType">double</Property>
+        <Property name="label">寤掗棿瀹藉害</Property>
+        <Property name="displayFormat">#0.00绫�</Property>
+      </PropertyDef>
+      <PropertyDef name="ajgd">
+        <Property name="dataType">double</Property>
+        <Property name="label">寤掗棿楂樺害</Property>
+        <Property name="displayFormat">#0.00绫�</Property>
+      </PropertyDef>
+      <PropertyDef name="ajsjcr">
+        <Property name="dataType">double</Property>
+        <Property name="label">寤掗棿璁捐浠撳</Property>
+        <Property name="displayFormat">#0.000鍚�</Property>
+      </PropertyDef>
+      <PropertyDef name="ajlxdh">
+        <Property></Property>
+        <Property name="label">寤掗棿鑱旂郴鐢佃瘽</Property>
+      </PropertyDef>
+      <PropertyDef name="ajqyrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">寤掗棿鍚敤鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="ajzt">
+        <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">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>
+              <Entity>
+                <Property name="key">5</Property>
+                <Property name="value">5锛氬甫鎷嗛櫎</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">6</Property>
+                <Property name="value">6锛氭瑙掍粨</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">9</Property>
+                <Property name="value">9锛氬叾浠�</Property>
+              </Entity>
+            </Collection>
+          </Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="updateTime">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtParam">
+      <PropertyDef name="depotId">
+        <Property name="label">鎵�灞炰粨搴�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;buildingPR#getCacheBuilding&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="name">
+        <Property name="label">寤掗棿鍚嶇О</Property>
+      </PropertyDef>
+    </DataType>
+  </Model>
+  <View layout="regionPadding:10">
+    <ClientEvent name="onReady">view.get(&quot;#dsParam&quot;).insert({});</ClientEvent>
+    <Property name="packages">font-awesome,css-common</Property>
+    <DataSet id="dsMain">
+      <Property name="dataProvider">granaryPR#pageGranary</Property>
+      <Property name="dataType">[dtMain]</Property>
+      <Property name="pageSize">15</Property>
+    </DataSet>
+    <DataSet id="dsParam">
+      <Property name="dataType">dtParam</Property>
+    </DataSet>
+    <Container layout="regionPadding:10" layoutConstraint="top">
+      <Property name="exClassName">bg-color</Property>
+      <Property name="height">55</Property>
+      <Property name="contentOverflow">hidden</Property>
+      <Label layoutConstraint="left">
+        <Property name="text">鑿滃崟鏍忥細</Property>
+      </Label>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
+view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
+        <Property name="caption">鏂板</Property>
+        <Property name="exClassName">btn-normal</Property>
+        <Property name="iconClass">fa fa-plus</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var dialog= view.get(&quot;#dialogMain&quot;);&#xD;
+dialog.show();</ClientEvent>
+        <Property name="caption">缂栬緫</Property>
+        <Property name="exClassName">btn-warm</Property>
+        <Property name="iconClass">fa fa-pencil</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+if(!cur) return;&#xD;
+view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+		return;&#xD;
+	}else{&#xD;
+		cur.remove();&#xD;
+	}&#xD;
+});</ClientEvent>
+        <Property name="caption">鍒犻櫎</Property>
+        <Property name="exClassName">btn-warn</Property>
+        <Property name="iconClass">fa fa-trash-o</Property>
+      </Button>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="center">
+      <Property name="exClassName">bg-color</Property>
+      <AutoForm>
+        <Property name="dataSet">dsParam</Property>
+        <Property name="cols">*,*,*,*</Property>
+        <AutoFormElement>
+          <Property name="name">depotId</Property>
+          <Property name="property">depotId</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">name</Property>
+          <Property name="property">name</Property>
+          <Editor/>
+        </AutoFormElement>
+        <Container layout="regionPadding:10">
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
+view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();</ClientEvent>
+            <Property name="caption">鏌ヨ</Property>
+            <Property name="exClassName">btn-normal</Property>
+            <Property name="iconClass">fa fa-search</Property>
+          </Button>
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).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">
+        <ClientEvent name="onDataRowDoubleClick">var dialog= view.get(&quot;#dialogMain&quot;);&#xD;
+dialog.show();</ClientEvent>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="readOnly">true</Property>
+        <RowNumColumn/>
+        <DataColumn name="ajdh">
+          <Property name="property">ajdh</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="ajmc">
+          <Property name="property">ajmc</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="cfbh">
+          <Property name="property">cfbh</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="ajcd">
+          <Property name="property">ajcd</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="ajkd">
+          <Property name="property">ajkd</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="ajgd">
+          <Property name="property">ajgd</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="ajsjcr">
+          <Property name="property">ajsjcr</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="ajqyrq">
+          <Property name="property">ajqyrq</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="ajzt">
+          <Property name="property">ajzt</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="updateTime">
+          <Property name="property">updateTime</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+      </DataGrid>
+    </Container>
+    <Container layoutConstraint="bottom">
+      <Property name="exClassName">bg-color</Property>
+      <DataPilot layoutConstraint="right">
+        <Property name="dataSet">dsMain</Property>
+        <Property name="itemCodes">pageSize,pages</Property>
+      </DataPilot>
+    </Container>
+    <Dialog id="dialogMain">
+      <Property name="closeable">false</Property>
+      <Property name="caption">寤掗棿淇℃伅</Property>
+      <Property name="width">60%</Property>
+      <Property name="iconClass">fa fa-tasks</Property>
+      <Buttons>
+        <Button id="btnOk">
+          <ClientEvent name="onClick">view.get(&quot;#uaSave&quot;).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+	}else{&#xD;
+		$notify(&quot;淇濆瓨鎴愬姛锛侊紒&quot;);&#xD;
+		view.get(&quot;#dialogMain&quot;).hide();&#xD;
+	}&#xD;
+});</ClientEvent>
+          <Property name="caption">纭畾</Property>
+          <Property name="iconClass">fa fa-check</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
+self.get(&quot;parent&quot;).hide();</ClientEvent>
+          <Property name="caption">鍙栨秷</Property>
+          <Property name="iconClass">fa fa-times</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <AutoForm>
+          <Property name="dataSet">dsMain</Property>
+          <Property name="cols">*,*</Property>
+          <Property name="labelAlign">right</Property>
+          <Property name="labelSeparator">锛�</Property>
+          <Property name="labelWidth">150</Property>
+          <AutoFormElement>
+            <Property name="name">ajdh</Property>
+            <Property name="property">ajdh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">deptId</Property>
+            <Property name="property">deptId</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajmc</Property>
+            <Property name="property">ajmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">cfbh</Property>
+            <Property name="property">cfbh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajcd</Property>
+            <Property name="property">ajcd</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajkd</Property>
+            <Property name="property">ajkd</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajgd</Property>
+            <Property name="property">ajgd</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajsjcr</Property>
+            <Property name="property">ajsjcr</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajlxdh</Property>
+            <Property name="property">ajlxdh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajqyrq</Property>
+            <Property name="property">ajqyrq</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">ajzt</Property>
+            <Property name="property">ajzt</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">updateTime</Property>
+            <Property name="property">updateTime</Property>
+            <Editor/>
+          </AutoFormElement>
+        </AutoForm>
+      </Children>
+      <Tools/>
+    </Dialog>
+    <UpdateAction id="uaSave">
+      <Property name="dataResolver">granaryPR#saveGranary</Property>
+      <Property name="successMessage">鏁版嵁淇濆瓨瀹屾垚锛�</Property>
+      <UpdateItem>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="dataPath">[#current]</Property>
+        <Property name="validateData">false</Property>
+      </UpdateItem>
+    </UpdateAction>
+    <AjaxAction id="ajaxDel">
+      <Property name="service">granaryPR#delGranary</Property>
+      <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
+    </AjaxAction>
+  </View>
+</ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
new file mode 100644
index 0000000..81310e9
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
@@ -0,0 +1,60 @@
+package com.ld.igds.view;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.Granary;
+import com.ld.igds.view.service.HGranaryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 寤掗棿淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class GranaryPR {
+
+    @Autowired
+    private HGranaryService granaryService;
+
+    /**
+     * granaryPR#pageGranary
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageGranary(Page<Granary> page, Map<String, Object> param)
+            throws Exception {
+        granaryService.pageData(page, param);
+    }
+
+    /**
+     * granaryPR#delGranary
+     *
+     * @param data
+     * @throws Exception
+     */
+    @Expose
+    public String delGranary(Granary data) throws Exception {
+        return granaryService.delData(data);
+    }
+
+    /**
+     * granaryPR#saveGranary 鏂板鎴栬�呬慨鏀�
+     *
+     * @param data
+     * @throws Exception
+     */
+    @DataResolver
+    public String saveGranary(Granary data) throws Exception {
+        granaryService.saveOrUpdate(data);
+        return "";
+    }
+}
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
new file mode 100644
index 0000000..ea68d32
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
@@ -0,0 +1,82 @@
+package com.ld.igds.view.service;
+
+import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.Granary;
+import com.ld.igds.util.ContextUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Session;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 鍩虹淇℃伅-寤掗棿淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class HGranaryService extends HibernateDao {
+
+
+    public void pageData(Page<Granary> page, Map<String, Object> param)
+            throws Exception {
+        String hql = " from " + Granary.class.getName()
+                + " where companyId=:companyId";
+
+        Map<String, Object> args = new HashMap<String, Object>();
+        args.put("companyId", ContextUtil.getCompanyId());
+
+        if (null != param) {
+
+            String str = (String) param.get("depotId");
+            if (StringUtils.isNotEmpty(str)) {
+                hql += " and cfbh =:depotId";
+                args.put("depotId", str);
+            }
+            str = (String) param.get("name");
+            if (StringUtils.isNotEmpty(str)) {
+                hql += " and ajmc like:name";
+                args.put("name", "%" + str + "%");
+            }
+
+        }
+
+        String count = "select count(*) " + hql;
+
+        hql += " order by  updateTime desc";
+
+        this.pagingQuery(page, hql, count, args);
+
+    }
+
+    public String saveOrUpdate(Granary data) {
+
+        Session session = this.getSessionFactory().openSession();
+        try {
+            if (null == data.getDeptId()) {
+                data.setDeptId(ContextUtil.subDeptId(null));
+            }
+            data.setCompanyId(ContextUtil.getCompanyId());
+            session.saveOrUpdate(data);
+        } finally {
+            session.flush();
+            session.close();
+        }
+        return null;
+    }
+
+    public String delData(Granary data) {
+        Session session = this.getSessionFactory().openSession();
+        try {
+            session.delete(data);
+        } finally {
+            session.flush();
+            session.close();
+        }
+        return null;
+    }
+
+
+}
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
new file mode 100644
index 0000000..19b51e3
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
@@ -0,0 +1,93 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DEPT_DEVICE")
+public class DeptDevice implements Serializable {
+
+    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 = "搴撳尯浠g爜")
+    private String kqdm;
+
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+    private String companyId;
+
+    @Column(name = "dwdm", length = 18)
+    @PropertyDef(label = "鍗曚綅浠g爜")
+    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 = "sbyqmc", length = 50)
+    @PropertyDef(label = "璁惧浠櫒鍚嶇О")
+    private String sbyqmc;
+
+    @Column(name = "sbyqdm", length = 8)
+    @PropertyDef(label = "璁惧浠櫒浠g爜")
+    private String sbyqdm;
+
+    @Column(name = "sbggxh", length = 50)
+    @PropertyDef(label = "璁惧瑙勬牸鍨嬪彿")
+    private String sbggxh;
+
+    @Column(name = "sccj", length = 256)
+    @PropertyDef(label = "鐢熶骇鍘傚")
+    private String sccj;
+
+    @Column(name = "scrq")
+    @PropertyDef(label = "鐢熶骇鏃ユ湡")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date scrq;
+
+    @Column(name = "sbms", length = 50)
+    @PropertyDef(label = "璁惧鎻忚堪")
+    private String sbms;
+
+    @Column(name = "sbzt", length = 1)
+    @PropertyDef(label = "璁惧鐘舵��")
+    private String sbzt;
+
+    @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)
+    @PropertyDef(label = "妫�瀹氬崟浣�")
+    private String jddw;
+
+    @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/DeviceCheckup.java b/igds-manager/src/main/java/com/ld/igds/models/DeviceCheckup.java
new file mode 100644
index 0000000..369662f
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/models/DeviceCheckup.java
@@ -0,0 +1,73 @@
+package com.ld.igds.models;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 璁惧妫�淇褰�
+ *
+ * @Author:YAN
+ */
+@Data
+@Entity
+@Table(name = "D_DEVICE_CHECKUP")
+public class DeviceCheckup implements Serializable {
+    /**
+     *
+     */
+    private static final long serialVersionUID = 9157617424050247565L;
+
+    @Id
+    @Column(name = "id", length = 38)
+    private String id;
+
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+    private String companyId;
+
+    @PropertyDef(label = "璁惧缂栧彿")
+    @Column(name = "sbbh", length = 20)
+    private String sbbh;
+
+    @PropertyDef(label = "搴撳尯浠g爜")
+    @Column(name = "kqdm", length = 21)
+    private String kqdm;
+
+    @PropertyDef(label = "搴撳尯鍚嶇О")
+    @Column(name = "kqmc", length = 256)
+    private String kqmc;
+
+    @PropertyDef(label = "鍗曚綅浠g爜")
+    @Column(name = "dwdm", length = 18)
+    private String dwdm;
+
+    @PropertyDef(label = "璁惧浠櫒鍚嶇О")
+    @Column(name = "sbyqmc", length = 50)
+    private String sbyqmc;
+
+    @PropertyDef(label = "璁惧浠櫒浠g爜")
+    @Column(name = "sbyqdm", length = 8)
+    private String sbyqdm;
+
+    @PropertyDef(label = "妫�瀹氭椂闂�")
+    @JSONField(format = "yyyy-MM-dd")
+    @Column(name = "jdsj")
+    private Date jdsj;
+
+    @PropertyDef(label = "妫�瀹氬崟浣�")
+    @Column(name = "jddw", length = 256)
+    private String jddw;
+
+    @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    @Column(name = "zhgxsj")
+    private Date zhgxsj;
+}
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
new file mode 100644
index 0000000..10eea9a
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
@@ -0,0 +1,133 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * OA-浜哄憳绠$悊
+ *
+ * @author: YAN
+ * @description:
+ * @version:
+ * @data:2023骞�8鏈�10鏃�
+ */
+@Data
+@Entity
+@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 = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜", description = "")
+    private String companyId;
+
+    @Column(name = "dwdm", length = 18)
+    @PropertyDef(label = "鍗曚綅浠g爜")
+    private String dwdm;
+
+    @Column(name = "dwmc", length = 256)
+    @PropertyDef(label = "鍗曚綅鍚嶇О")
+    private String dwmc;
+
+    @Column(name = "lsbm", length = 256)
+    @PropertyDef(label = "闅跺睘閮ㄩ棬", description = "闅跺睘閮ㄩ棬鍚嶇О")
+    private String lsbm;
+
+    @Column(name = "xzqhdm", length = 6)
+    @PropertyDef(label = "琛屾斂鍖哄垝浠g爜")
+    private String xzqhdm;
+
+    @Column(name = "xm", length = 32)
+    @PropertyDef(label = "濮撳悕")
+    private String xm;
+
+    @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 = "鍏ヨ亴鏃ユ湡")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date rzrq;
+    /**
+     * 11锛� 鍦ㄥ矖鑱屽伐(闀挎湡)锛�12锛� 鍦ㄥ矖 鑱屽伐(涓存椂)锛�20锛� 鍏朵粬浠庝笟浜哄憳
+     */
+    @Column(name = "gwxz", length = 2)
+    @PropertyDef(label = "宀椾綅鎬ц川")
+    private String gwxz;
+    /**
+     * 01锛� 鍦ㄥ矖 02锛� 宸茬鑱�
+     */
+    @Column(name = "zgzt", length = 2)
+    @PropertyDef(label = "鍦ㄥ矖鐘舵��")
+    private String zgzt;
+
+    @Column(name = "lzrq")
+    @PropertyDef(label = "绂昏亴鏃ユ湡")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date lzrq;
+
+    @Column(name = "zidh", length = 16)
+    @PropertyDef(label = "搴ф満鐢佃瘽")
+    private String zidh;
+
+    @Column(name = "yddh", length = 16)
+    @PropertyDef(label = "绉诲姩鐢佃瘽")
+    private String yddh;
+
+    @Column(name = "dzyx", length = 32)
+    @PropertyDef(label = "鐢靛瓙閭")
+    private String dzyx;
+
+    @Column(name = "mz", length = 2)
+    @PropertyDef(label = "姘戞棌")
+    private String mz;
+
+    @Column(name = "zzmm", length = 2)
+    @PropertyDef(label = "鏀挎不闈㈣矊")
+    private String zzmm;
+
+    @Column(name = "rylb", length = 4)
+    @PropertyDef(label = "浜哄憳绫诲埆")
+    private String rylb;
+
+    @Column(name = "zy", length = 128)
+    @PropertyDef(label = "涓撲笟")
+    private String zy;
+
+    @Column(name = "qdzgzchzyzgsj")
+    @PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date qdzgzchzyzgsj;
+
+    @Column(name = "xl", length = 1)
+    @PropertyDef(label = "瀛﹀巻")
+    private String xl;
+
+    @Column(name = "zw", length = 16)
+    @PropertyDef(label = "鑱屽姟")
+    private String zw;
+
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "鏇存柊鏃堕棿")
+    private Date updateTime;
+
+
+}
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
new file mode 100644
index 0000000..7b64f1b
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
@@ -0,0 +1,143 @@
+package com.ld.igds.oa.service;
+
+import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.DeptDevice;
+import com.ld.igds.models.DeviceCheckup;
+import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.DateUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Session;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 搴撳尯璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class HDeptDeviceService extends HibernateDao {
+
+    //=====================================搴撳尯璁惧=======================================//
+    public void pageData(Page<DeptDevice> page, Map<String, Object> param)
+            throws Exception {
+        String hql = " from " + DeptDevice.class.getName() + " where companyId=:companyId";
+
+        Map<String, Object> args = new HashMap<>();
+        args.put("companyId", ContextUtil.getCompanyId());
+
+        if (null != param) {
+            hql = buildHql(hql, param, args);
+        }
+
+        String count = "select count(*) " + hql;
+
+        hql += " order by  updateTime desc";
+        this.pagingQuery(page, hql, count, args);
+
+    }
+
+    public String saveOrUpdate(DeptDevice data) {
+
+        Session session = this.getSessionFactory().openSession();
+        try {
+            data.setCompanyId(ContextUtil.getCompanyId());
+            if (null == data.getId()) {
+                data.setId(ContextUtil.getUUID());
+            }
+            session.saveOrUpdate(data);
+        } finally {
+            session.flush();
+            session.close();
+        }
+        return null;
+    }
+
+    public String delData(DeptDevice data) {
+        Session session = this.getSessionFactory().openSession();
+        try {
+            session.delete(data);
+        } finally {
+            session.flush();
+            session.close();
+        }
+        return null;
+    }
+
+
+    //==================================璁惧妫�淇褰�===================================//
+    public void pageCheck(Page<DeviceCheckup> page, Map<String, Object> param)
+            throws Exception {
+        String hql = " from " + DeviceCheckup.class.getName() + " where companyId=:companyId";
+
+        Map<String, Object> args = new HashMap<>();
+        args.put("companyId", ContextUtil.getCompanyId());
+
+        if (null != param) {
+            hql = buildHql(hql, param, args);
+        }
+
+        String count = "select count(*) " + hql;
+
+        hql += " order by  zhgxsj desc";
+        this.pagingQuery(page, hql, count, args);
+
+    }
+
+    public String saveCheck(DeviceCheckup data) {
+
+        Session session = this.getSessionFactory().openSession();
+        try {
+            data.setCompanyId(ContextUtil.getCompanyId());
+            if (null == data.getId()) {
+                data.setId(ContextUtil.getUUID());
+            }
+            session.saveOrUpdate(data);
+        } finally {
+            session.flush();
+            session.close();
+        }
+        return null;
+    }
+
+    public String delCheck(DeviceCheckup data) {
+        Session session = this.getSessionFactory().openSession();
+        try {
+            session.delete(data);
+        } finally {
+            session.flush();
+            session.close();
+        }
+        return null;
+    }
+
+
+    public String buildHql(String hql, Map<String, Object> param, Map<String, Object> args) {
+        String str = (String) param.get("name");
+        if (StringUtils.isNotEmpty(str)) {
+            hql += " and sbyqmc like:name";
+            args.put("name", "%" + str + "%");
+        }
+        str = (String) param.get("code");
+        if (StringUtils.isNotEmpty(str)) {
+            hql += " and sbbh =:code";
+            args.put("code", str);
+        }
+        Date date = (Date) param.get("start");
+        if (null != date) {
+            hql += " and jdsj >=:start";
+            args.put("start", DateUtil.getCurZero(date));
+        }
+        date = (Date) param.get("end");
+        if (null != date) {
+            hql += " and jdsj <:end";
+            args.put("end", DateUtil.getNextZero(date));
+        }
+        return hql;
+    }
+
+}
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
new file mode 100644
index 0000000..a867e98
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
@@ -0,0 +1,98 @@
+package com.ld.igds.oa.service;
+
+import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.OAStaff;
+import com.ld.igds.models.OAStaff;
+import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.DateUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.Session;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 浜哄憳绠$悊
+ *
+ * @Author:YAN
+ */
+@Component
+public class HStaffService extends HibernateDao {
+
+
+    public void pageData(Page<OAStaff> page, Map<String, Object> param)
+            throws Exception {
+        String hql = " from " + OAStaff.class.getName() + " where companyId=:companyId";
+
+        Map<String, Object> args = new HashMap<>();
+        args.put("companyId", ContextUtil.getCompanyId());
+
+        if (null != param) {
+
+            String str = (String) param.get("sector");
+            if (StringUtils.isNotEmpty(str)) {
+                hql += " and lsbm like:sector";
+                args.put("sector", "%" + str + "%");
+            }
+            str = (String) param.get("name");
+            if (StringUtils.isNotEmpty(str)) {
+                hql += " and xm like :name";
+                args.put("name", "%" + str + "%");
+            }
+            str = (String) param.get("userId");
+            if (StringUtils.isNotEmpty(str)) {
+                hql += " and sfzhm like :userId";
+                args.put("userId", "%" + str + "%");
+            }
+            Date date = (Date) param.get("start");
+            if (null != date) {
+                hql += " and rzrq >=:start";
+                args.put("start", DateUtil.getCurZero(date));
+            }
+            date = (Date) param.get("end");
+            if (null != date) {
+                hql += " and rzrq <:end";
+                args.put("end", DateUtil.getNextZero(date));
+            }
+
+        }
+
+        String count = "select count(*) " + hql;
+
+        hql += " order by  updateTime desc";
+        this.pagingQuery(page, hql, count, args);
+
+    }
+
+    public String saveOrUpdate(OAStaff data) {
+
+        Session session = this.getSessionFactory().openSession();
+        try {
+            data.setCompanyId(ContextUtil.getCompanyId());
+            if (null == data.getId()) {
+                data.setId(ContextUtil.getUUID());
+            }
+            session.saveOrUpdate(data);
+        } finally {
+            session.flush();
+            session.close();
+        }
+        return null;
+    }
+
+    public String delData(OAStaff data) {
+        Session session = this.getSessionFactory().openSession();
+        try {
+            session.delete(data);
+        } finally {
+            session.flush();
+            session.close();
+        }
+        return null;
+    }
+
+
+}
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/Asset.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/Asset.view.xml
index 28f5519..435d93b 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/Asset.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Asset.view.xml
@@ -98,11 +98,9 @@
   <View layout="padding:5;regionPadding:5">
     <ClientEvent name="onReady">&#xD;
 view.get(&quot;#dsParam&quot;).insert({});&#xD;
-&#xD;
 addMain = function(){&#xD;
-	view.get(&quot;#dsMain&quot;).insert({&#xD;
-	});&#xD;
-	view.get(&quot;#dialogMain&quot;).show();&#xD;
+	view.get(&quot;#dsMain&quot;).insert({});&#xD;
+ 	view.get(&quot;#dialogMain&quot;).show();&#xD;
 }</ClientEvent>
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
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
new file mode 100644
index 0000000..78cb4ab
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -0,0 +1,530 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+  <Arguments/>
+  <Context/>
+  <Model>
+    <DataType name="dtMain">
+      <Property name="creationType">com.ld.igds.models.DeptDevice</Property>
+      <PropertyDef name="id">
+        <Property name="label">ID</Property>
+      </PropertyDef>
+      <PropertyDef name="kqdm">
+        <Property></Property>
+        <Property name="label">搴撳尯浠g爜</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property></Property>
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="dwdm">
+        <Property></Property>
+        <Property name="label">鍗曚綅浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="kqmc">
+        <Property></Property>
+        <Property name="label">搴撳尯鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="sbbh">
+        <Property></Property>
+        <Property name="label">璁惧缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="sbyqmc">
+        <Property></Property>
+        <Property name="label">璁惧浠櫒鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="sbyqdm">
+        <Property></Property>
+        <Property name="label">璁惧浠櫒浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="sbggxh">
+        <Property></Property>
+        <Property name="label">璁惧瑙勬牸鍨嬪彿</Property>
+      </PropertyDef>
+      <PropertyDef name="sccj">
+        <Property></Property>
+        <Property name="label">鐢熶骇鍘傚</Property>
+      </PropertyDef>
+      <PropertyDef name="scrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鐢熶骇鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="sbms">
+        <Property></Property>
+        <Property name="label">璁惧鎻忚堪</Property>
+      </PropertyDef>
+      <PropertyDef name="sbzt">
+        <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">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>
+      </PropertyDef>
+      <PropertyDef name="jdsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">妫�瀹氭椂闂�</Property>
+      </PropertyDef>
+      <PropertyDef name="jddw">
+        <Property></Property>
+        <Property name="label">妫�瀹氬崟浣�</Property>
+      </PropertyDef>
+      <PropertyDef name="updateTime">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鏇存柊鏃堕棿</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtParam">
+      <PropertyDef name="name">
+        <Property name="label">璁惧鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="start">
+        <Property name="dataType">Date</Property>
+        <Property name="label">寮�濮嬫椂闂达紙妫�瀹氾級</Property>
+      </PropertyDef>
+      <PropertyDef name="end">
+        <Property name="dataType">Date</Property>
+        <Property name="label">缁撴潫鏃堕棿锛堟瀹氾級</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtCheck">
+      <Property name="creationType">com.ld.igds.models.DeviceCheckup</Property>
+      <PropertyDef name="id">
+        <Property/>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property/>
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="sbbh">
+        <Property/>
+        <Property name="label">璁惧缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="kqdm">
+        <Property/>
+        <Property name="label">搴撳尯浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="kqmc">
+        <Property/>
+        <Property name="label">搴撳尯鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="dwdm">
+        <Property/>
+        <Property name="label">鍗曚綅浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="sbyqmc">
+        <Property/>
+        <Property name="label">璁惧浠櫒鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="sbyqdm">
+        <Property/>
+        <Property name="label">璁惧浠櫒浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="jdsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">妫�瀹氭椂闂�</Property>
+      </PropertyDef>
+      <PropertyDef name="jddw">
+        <Property/>
+        <Property name="label">妫�瀹氬崟浣�</Property>
+      </PropertyDef>
+      <PropertyDef name="zhgxsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+      </PropertyDef>
+    </DataType>
+  </Model>
+  <View layout="regionPadding:10">
+    <ClientEvent name="onReady">view.get(&quot;#dsParam&quot;).insert({});</ClientEvent>
+    <Property name="packages">font-awesome,css-common</Property>
+    <DataSet id="dsMain">
+      <Property name="dataType">[dtMain]</Property>
+      <Property name="dataProvider">deptDevicePR#pageDeptDevice</Property>
+      <Property name="pageSize">15</Property>
+    </DataSet>
+    <DataSet id="dsParam">
+      <Property name="dataType">dtParam</Property>
+    </DataSet>
+    <DataSet id="dsCheck">
+      <Property name="dataType">[dtCheck]</Property>
+      <Property name="dataProvider">deptDevicePR#pageCheck</Property>
+    </DataSet>
+    <Container layout="regionPadding:10" layoutConstraint="top">
+      <Property name="exClassName">bg-color</Property>
+      <Property name="height">55</Property>
+      <Property name="contentOverflow">hidden</Property>
+      <Label layoutConstraint="left">
+        <Property name="text">鑿滃崟鏍忥細</Property>
+      </Label>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
+view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
+        <Property name="caption">鏂板</Property>
+        <Property name="exClassName">btn-normal</Property>
+        <Property name="iconClass">fa fa-plus</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var dialog= view.get(&quot;#dialogMain&quot;);&#xD;
+dialog.show();</ClientEvent>
+        <Property name="caption">缂栬緫</Property>
+        <Property name="exClassName">btn-warm</Property>
+        <Property name="iconClass">fa fa-pencil</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+if(!cur) return;&#xD;
+view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+		return;&#xD;
+	}else{&#xD;
+		cur.remove();&#xD;
+	}&#xD;
+});</ClientEvent>
+        <Property name="caption">鍒犻櫎</Property>
+        <Property name="exClassName">btn-warn</Property>
+        <Property name="iconClass">fa fa-trash-o</Property>
+      </Button>
+      <Button layoutConstraint="right">
+        <ClientEvent name="onClick">//鏄剧ず璁板綍&#xD;
+view.get(&quot;#iFrame&quot;).reload();&#xD;
+view.get(&quot;#dialogCheck&quot;).show();</ClientEvent>
+        <Property name="caption">鏌ョ湅妫�淇褰�</Property>
+        <Property name="exClassName">btn-flush</Property>
+        <Property name="iconClass">fa fa-bars</Property>
+        <Property name="visible">false</Property>
+      </Button>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="center">
+      <Property name="exClassName">bg-color</Property>
+      <AutoForm>
+        <Property name="dataSet">dsParam</Property>
+        <Property name="cols">*,*,*,*</Property>
+        <Property name="labelAlign">right</Property>
+        <Property name="labelSeparator">:</Property>
+        <Property name="labelWidth">140</Property>
+        <AutoFormElement>
+          <Property name="name">name</Property>
+          <Property name="property">name</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">start</Property>
+          <Property name="property">start</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">end</Property>
+          <Property name="property">end</Property>
+          <Editor/>
+        </AutoFormElement>
+        <Container layout="regionPadding:10">
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
+view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();</ClientEvent>
+            <Property name="caption">鏌ヨ</Property>
+            <Property name="exClassName">btn-normal</Property>
+            <Property name="iconClass">fa fa-search</Property>
+          </Button>
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).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">
+        <ClientEvent name="onDataRowDoubleClick">var dialog= view.get(&quot;#dialogMain&quot;);&#xD;
+dialog.show();</ClientEvent>
+        <Property name="dataSet">dsMain</Property>
+        <RowNumColumn>
+          <Property name="caption">搴忓彿</Property>
+        </RowNumColumn>
+        <DataColumn name="dwdm">
+          <Property name="property">dwdm</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="kqmc">
+          <Property name="property">kqmc</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="sbyqmc">
+          <Property name="property">sbyqmc</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="sbyqdm">
+          <Property name="property">sbyqdm</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="sbggxh">
+          <Property name="property">sbggxh</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="sccj">
+          <Property name="property">sccj</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="scrq">
+          <Property name="property">scrq</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="sbms">
+          <Property name="property">sbms</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="sbzt">
+          <Property name="property">sbzt</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="jdsj">
+          <Property name="property">jdsj</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="jddw">
+          <Property name="property">jddw</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+        <DataColumn name="updateTime">
+          <Property name="property">updateTime</Property>
+          <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
+        </DataColumn>
+      </DataGrid>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="bottom">
+      <Property name="exClassName">bg-color</Property>
+      <DataPilot layoutConstraint="right">
+        <Property name="dataSet">dsMain</Property>
+        <Property name="itemCodes">pageSize,pages</Property>
+      </DataPilot>
+    </Container>
+    <Dialog id="dialogMain">
+      <Property name="closeable">false</Property>
+      <Property name="caption">浠撳簱璁惧淇℃伅</Property>
+      <Property name="width">60%</Property>
+      <Property name="iconClass">fa fa-tasks</Property>
+      <Buttons>
+        <Button id="btnOk">
+          <ClientEvent name="onClick">view.get(&quot;#uaSave&quot;).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+	}else{&#xD;
+		$notify(&quot;淇濆瓨鎴愬姛锛侊紒&quot;);&#xD;
+		view.get(&quot;#dialogMain&quot;).hide();&#xD;
+	}&#xD;
+});</ClientEvent>
+          <Property name="caption">纭畾</Property>
+          <Property name="iconClass">fa fa-check</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
+self.get(&quot;parent&quot;).hide();</ClientEvent>
+          <Property name="caption">鍙栨秷</Property>
+          <Property name="iconClass">fa fa-times</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <AutoForm>
+          <Property name="dataSet">dsMain</Property>
+          <Property name="cols">*,*</Property>
+          <Property name="labelAlign">right</Property>
+          <Property name="labelSeparator">锛�</Property>
+          <Property name="labelWidth">150</Property>
+          <AutoFormElement>
+            <Property name="name">kqdm</Property>
+            <Property name="property">kqdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">dwdm</Property>
+            <Property name="property">dwdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">kqmc</Property>
+            <Property name="property">kqmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbbh</Property>
+            <Property name="property">sbbh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbyqmc</Property>
+            <Property name="property">sbyqmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbyqdm</Property>
+            <Property name="property">sbyqdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbggxh</Property>
+            <Property name="property">sbggxh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sccj</Property>
+            <Property name="property">sccj</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">scrq</Property>
+            <Property name="property">scrq</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbms</Property>
+            <Property name="property">sbms</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbzt</Property>
+            <Property name="property">sbzt</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jdsj</Property>
+            <Property name="property">jdsj</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jddw</Property>
+            <Property name="property">jddw</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">updateTime</Property>
+            <Property name="property">updateTime</Property>
+            <Editor/>
+          </AutoFormElement>
+        </AutoForm>
+      </Children>
+      <Tools/>
+    </Dialog>
+    <UpdateAction id="uaSave">
+      <Property name="dataResolver">deptDevicePR#saveDeptDevice</Property>
+      <UpdateItem>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="dataPath">[#current]</Property>
+        <Property name="validateData">false</Property>
+      </UpdateItem>
+    </UpdateAction>
+    <AjaxAction id="ajaxDel">
+      <Property name="service">deptDevicePR#delDeptDevice</Property>
+      <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
+    </AjaxAction>
+    <AjaxAction id="ajaxDelCheck">
+      <Property name="service">deptDevicePR#delCheck</Property>
+      <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
+    </AjaxAction>
+    <Dialog id="dialogCheck">
+      <Property name="width">90%</Property>
+      <Property name="height">90%</Property>
+      <Buttons>
+        <Button layoutConstraint="center">
+          <ClientEvent name="onClick">self.get(&quot;parent&quot;).hide();</ClientEvent>
+          <Property name="caption">鍏抽棴</Property>
+          <Property name="iconClass">fa fa-times</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <Container>
+          <Button>
+            <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();</ClientEvent>
+            <Property name="caption">鏂板</Property>
+            <Property name="exClassName">btn-normal</Property>
+            <Property name="iconClass">fa fa-plus</Property>
+          </Button>
+          <Button>
+            <ClientEvent name="onClick">var cur = view.get(&quot;#dsCheck.data:#&quot;);&#xD;
+if(!cur) return;&#xD;
+view.get(&quot;#ajaxDelCheck&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+		return;&#xD;
+	}else{&#xD;
+		cur.remove();&#xD;
+	}&#xD;
+});</ClientEvent>
+            <Property name="caption">鍒犻櫎</Property>
+            <Property name="exClassName">btn-warn</Property>
+            <Property name="iconClass">fa fa-trash-o</Property>
+          </Button>
+        </Container>
+        <Container>
+          <DataGrid id="dgCheck">
+            <Property name="dataSet">dsCheck</Property>
+            <Property name="readOnly">true</Property>
+            <DataColumn name="sbbh">
+              <Property name="property">sbbh</Property>
+            </DataColumn>
+            <DataColumn name="kqdm">
+              <Property name="property">kqdm</Property>
+            </DataColumn>
+            <DataColumn name="kqmc">
+              <Property name="property">kqmc</Property>
+            </DataColumn>
+            <DataColumn name="dwdm">
+              <Property name="property">dwdm</Property>
+            </DataColumn>
+            <DataColumn name="sbyqmc">
+              <Property name="property">sbyqmc</Property>
+            </DataColumn>
+            <DataColumn name="sbyqdm">
+              <Property name="property">sbyqdm</Property>
+            </DataColumn>
+            <DataColumn name="jdsj">
+              <Property name="property">jdsj</Property>
+            </DataColumn>
+            <DataColumn name="jddw">
+              <Property name="property">jddw</Property>
+            </DataColumn>
+            <DataColumn name="zhgxsj">
+              <Property name="property">zhgxsj</Property>
+            </DataColumn>
+          </DataGrid>
+        </Container>
+      </Children>
+      <Tools/>
+    </Dialog>
+  </View>
+</ViewConfig>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevicePR.java b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevicePR.java
new file mode 100644
index 0000000..9060343
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevicePR.java
@@ -0,0 +1,99 @@
+package com.ld.igds.oa.view;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.DeptDevice;
+import com.ld.igds.models.DeviceCheckup;
+import com.ld.igds.oa.service.HDeptDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 浠撳簱璁惧淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class DeptDevicePR {
+    @Autowired
+    private HDeptDeviceService deptDeviceService;
+
+    /**
+     * deptDevicePR#pageDeptDevice
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageDeptDevice(Page<DeptDevice> page, Map<String, Object> param)
+            throws Exception {
+        deptDeviceService.pageData(page, param);
+    }
+
+    /**
+     * deptDevicePR#delDeptDevice
+     *
+     * @param data
+     * @throws Exception
+     */
+    @Expose
+    public String delDeptDevice(DeptDevice data) throws Exception {
+        return deptDeviceService.delData(data);
+    }
+
+    /**
+     * deptDevicePR#saveDeptDevice 鏂板鎴栬�呬慨鏀�
+     *
+     * @param data
+     * @throws Exception
+     */
+    @DataResolver
+    public String saveDeptDevice(DeptDevice data) throws Exception {
+        deptDeviceService.saveOrUpdate(data);
+        return "";
+    }
+
+    //===================================璁惧妫�淇褰�========================================//
+
+
+    /**
+     * deptDevicePR#pageCheck
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageCheck(Page<DeviceCheckup> page, Map<String, Object> param)
+            throws Exception {
+        deptDeviceService.pageCheck(page, param);
+    }
+
+    /**
+     * deptDevicePR#delCheck
+     *
+     * @param data
+     * @throws Exception
+     */
+    @Expose
+    public String delCheck(DeviceCheckup data) throws Exception {
+        return deptDeviceService.delCheck(data);
+    }
+
+    /**
+     * deptDevicePR#saveCheck 鏂板鎴栬�呬慨鏀�
+     *
+     * @param data
+     * @throws Exception
+     */
+    @DataResolver
+    public String saveCheck(DeviceCheckup data) throws Exception {
+        deptDeviceService.saveCheck(data);
+        return "";
+    }
+}
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeviceCheckup.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeviceCheckup.view.xml
new file mode 100644
index 0000000..c28e8c4
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeviceCheckup.view.xml
@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+  <Arguments/>
+  <Context/>
+  <Model>
+    <DataType name="dtMain">
+      <Property name="creationType">com.ld.igds.models.DeviceCheckup</Property>
+      <PropertyDef name="id">
+        <Property/>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property/>
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="sbbh">
+        <Property/>
+        <Property name="label">璁惧缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="kqdm">
+        <Property/>
+        <Property name="label">搴撳尯浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="kqmc">
+        <Property/>
+        <Property name="label">搴撳尯鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="dwdm">
+        <Property/>
+        <Property name="label">鍗曚綅浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="sbyqmc">
+        <Property/>
+        <Property name="label">璁惧浠櫒鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="sbyqdm">
+        <Property/>
+        <Property name="label">璁惧浠櫒浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="jdsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">妫�瀹氭椂闂�</Property>
+      </PropertyDef>
+      <PropertyDef name="jddw">
+        <Property/>
+        <Property name="label">妫�瀹氬崟浣�</Property>
+      </PropertyDef>
+      <PropertyDef name="zhgxsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtParam">
+      <PropertyDef name="code">
+        <Property name="label">璁惧缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="start">
+        <Property name="dataType">Date</Property>
+        <Property name="label">寮�濮嬫椂闂达紙妫�瀹氾級</Property>
+      </PropertyDef>
+      <PropertyDef name="end">
+        <Property name="dataType">Date</Property>
+        <Property name="label">缁撴潫鏃堕棿锛堟瀹氾級</Property>
+      </PropertyDef>
+    </DataType>
+  </Model>
+  <View>
+    <ClientEvent name="onReady">view.get(&quot;#dsParam&quot;).insert({});</ClientEvent>
+    <Property name="packages">font-awesome,css-common</Property>
+    <DataSet id="dsMain">
+      <Property name="dataType">[dtMain]</Property>
+      <Property name="dataProvider">deptDevicePR#pageCheck</Property>
+      <Property name="pageSize">15</Property>
+    </DataSet>
+    <DataSet id="dsParam">
+      <Property name="dataType">dtParam</Property>
+    </DataSet>
+    <Container layout="regionPadding:10" layoutConstraint="top">
+      <Property name="exClassName">bg-color</Property>
+      <Property name="height">55</Property>
+      <Property name="contentOverflow">hidden</Property>
+      <Label layoutConstraint="left">
+        <Property name="text">鑿滃崟鏍忥細</Property>
+      </Label>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
+view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
+        <Property name="caption">鏂板</Property>
+        <Property name="exClassName">btn-normal</Property>
+        <Property name="iconClass">fa fa-plus</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var dialog= view.get(&quot;#dialogMain&quot;);&#xD;
+dialog.show();</ClientEvent>
+        <Property name="caption">缂栬緫</Property>
+        <Property name="exClassName">btn-warm</Property>
+        <Property name="iconClass">fa fa-pencil</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+if(!cur) return;&#xD;
+view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+		return;&#xD;
+	}else{&#xD;
+		cur.remove();&#xD;
+	}&#xD;
+});</ClientEvent>
+        <Property name="caption">鍒犻櫎</Property>
+        <Property name="exClassName">btn-warn</Property>
+        <Property name="iconClass">fa fa-trash-o</Property>
+      </Button>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="center">
+      <Property name="exClassName">bg-color</Property>
+      <AutoForm>
+        <Property name="dataSet">dsParam</Property>
+        <Property name="cols">*,*,*,*</Property>
+        <Property name="labelAlign">right</Property>
+        <Property name="labelSeparator">:</Property>
+        <Property name="labelWidth">140</Property>
+        <AutoFormElement>
+          <Property name="name">code</Property>
+          <Property name="property">code</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">start</Property>
+          <Property name="property">start</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">end</Property>
+          <Property name="property">end</Property>
+          <Editor/>
+        </AutoFormElement>
+        <Container layout="regionPadding:10">
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
+view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();</ClientEvent>
+            <Property name="caption">鏌ヨ</Property>
+            <Property name="exClassName">btn-normal</Property>
+            <Property name="iconClass">fa fa-search</Property>
+          </Button>
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).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">
+        <ClientEvent name="onDataRowDoubleClick">var dialog= view.get(&quot;#dialogMain&quot;);&#xD;
+dialog.show();</ClientEvent>
+        <Property name="dataSet">dsMain</Property>
+        <RowNumColumn>
+          <Property name="caption">搴忓彿</Property>
+        </RowNumColumn>
+        <DataColumn name="id">
+          <Property name="property">id</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="companyId">
+          <Property name="property">companyId</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="sbbh">
+          <Property name="property">sbbh</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="kqdm">
+          <Property name="property">kqdm</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="kqmc">
+          <Property name="property">kqmc</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="dwdm">
+          <Property name="property">dwdm</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="sbyqmc">
+          <Property name="property">sbyqmc</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="sbyqdm">
+          <Property name="property">sbyqdm</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="jdsj">
+          <Property name="property">jdsj</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="jddw">
+          <Property name="property">jddw</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="zhgxsj">
+          <Property name="property">zhgxsj</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+      </DataGrid>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="bottom">
+      <Property name="exClassName">bg-color</Property>
+      <DataPilot layoutConstraint="right">
+        <Property name="dataSet">dsMain</Property>
+        <Property name="itemCodes">pageSize,pages</Property>
+      </DataPilot>
+    </Container>
+    <Dialog id="dialogMain">
+      <Property name="closeable">false</Property>
+      <Property name="caption">浠撳簱璁惧淇℃伅</Property>
+      <Property name="width">60%</Property>
+      <Property name="iconClass">fa fa-tasks</Property>
+      <Buttons>
+        <Button id="btnOk">
+          <ClientEvent name="onClick">view.get(&quot;#uaSave&quot;).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+	}else{&#xD;
+		$notify(&quot;淇濆瓨鎴愬姛锛侊紒&quot;);&#xD;
+		view.get(&quot;#dialogMain&quot;).hide();&#xD;
+	}&#xD;
+});</ClientEvent>
+          <Property name="caption">纭畾</Property>
+          <Property name="iconClass">fa fa-check</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
+self.get(&quot;parent&quot;).hide();</ClientEvent>
+          <Property name="caption">鍙栨秷</Property>
+          <Property name="iconClass">fa fa-times</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <AutoForm>
+          <Property name="dataSet">dsMain</Property>
+          <Property name="cols">*,*</Property>
+          <Property name="labelAlign">right</Property>
+          <Property name="labelSeparator">锛�</Property>
+          <Property name="labelWidth">150</Property>
+          <AutoFormElement>
+            <Property name="name">id</Property>
+            <Property name="property">id</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">companyId</Property>
+            <Property name="property">companyId</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbbh</Property>
+            <Property name="property">sbbh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">kqdm</Property>
+            <Property name="property">kqdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">kqmc</Property>
+            <Property name="property">kqmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">dwdm</Property>
+            <Property name="property">dwdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbyqmc</Property>
+            <Property name="property">sbyqmc</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sbyqdm</Property>
+            <Property name="property">sbyqdm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jdsj</Property>
+            <Property name="property">jdsj</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">jddw</Property>
+            <Property name="property">jddw</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">zhgxsj</Property>
+            <Property name="property">zhgxsj</Property>
+            <Editor/>
+          </AutoFormElement>
+        </AutoForm>
+      </Children>
+      <Tools/>
+    </Dialog>
+    <UpdateAction id="uaSave">
+      <Property name="dataResolver">deptDevicePR#saveCheck</Property>
+      <UpdateItem>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="dataPath">[#current]</Property>
+        <Property name="validateData">false</Property>
+      </UpdateItem>
+    </UpdateAction>
+    <AjaxAction id="ajaxDel">
+      <Property name="service">deptDevicePR#delCheck</Property>
+      <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
+    </AjaxAction>
+  </View>
+</ViewConfig>
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
new file mode 100644
index 0000000..c174882
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+  <Arguments/>
+  <Context/>
+  <Model>
+    <DataType name="dtMain">
+      <Property name="creationType">com.ld.igds.models.OAStaff</Property>
+      <PropertyDef name="id">
+        <Property/>
+        <Property name="label">ID</Property>
+      </PropertyDef>
+      <PropertyDef name="companyId">
+        <Property/>
+        <Property name="label">缁勭粐缂栫爜</Property>
+      </PropertyDef>
+      <PropertyDef name="dwdm">
+        <Property/>
+        <Property name="label">鍗曚綅浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="dwmc">
+        <Property/>
+        <Property name="label">鍗曚綅鍚嶇О</Property>
+      </PropertyDef>
+      <PropertyDef name="lsbm">
+        <Property/>
+        <Property name="label">闅跺睘閮ㄩ棬</Property>
+      </PropertyDef>
+      <PropertyDef name="xzqhdm">
+        <Property/>
+        <Property name="label">琛屾斂鍖哄垝浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="xm">
+        <Property/>
+        <Property name="label">濮撳悕</Property>
+      </PropertyDef>
+      <PropertyDef name="xb">
+        <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">1锛氱敺</Property>
+              </Entity>
+              <Entity>
+                <Property name="key">2</Property>
+                <Property name="value">2锛氬コ</Property>
+              </Entity>
+            </Collection>
+          </Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="sfzhm">
+        <Property/>
+        <Property name="label">韬唤璇佸彿鐮�</Property>
+      </PropertyDef>
+      <PropertyDef name="rzrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鍏ヨ亴鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="gwxz">
+        <Property/>
+        <Property name="label">宀椾綅鎬ц川</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;GWXZ&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="zgzt">
+        <Property/>
+        <Property name="label">鍦ㄥ矖鐘舵��</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;ZGZT&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="lzrq">
+        <Property/>
+        <Property name="label">绂昏亴鏃ユ湡</Property>
+        <Property name="dataType">Date</Property>
+      </PropertyDef>
+      <PropertyDef name="zidh">
+        <Property/>
+        <Property name="label">搴ф満鐢佃瘽</Property>
+      </PropertyDef>
+      <PropertyDef name="yddh">
+        <Property/>
+        <Property name="label">绉诲姩鐢佃瘽</Property>
+      </PropertyDef>
+      <PropertyDef name="dzyx">
+        <Property/>
+        <Property name="label">鐢靛瓙閭</Property>
+      </PropertyDef>
+      <PropertyDef name="mz">
+        <Property/>
+        <Property name="label">姘戞棌</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;MZ&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="zzmm">
+        <Property/>
+        <Property name="label">鏀挎不闈㈣矊</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;ZZMM&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="rylb">
+        <Property/>
+        <Property name="label">浜哄憳绫诲埆</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;RYLB&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="zy">
+        <Property/>
+        <Property name="label">涓撲笟</Property>
+      </PropertyDef>
+      <PropertyDef name="qdzgzchzyzgsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿</Property>
+      </PropertyDef>
+      <PropertyDef name="xl">
+        <Property/>
+        <Property name="label">瀛﹀巻</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;XL&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="zw">
+        <Property/>
+        <Property name="label">鑱屽姟</Property>
+      </PropertyDef>
+      <PropertyDef name="updateTime">
+        <Property name="dataType">DateTime</Property>
+        <Property name="label">鏇存柊鏃堕棿</Property>
+      </PropertyDef>
+    </DataType>
+    <DataType name="dtParam">
+      <PropertyDef name="sector">
+        <Property name="label">闅跺睘閮ㄩ棬</Property>
+      </PropertyDef>
+      <PropertyDef name="name">
+        <Property name="label">濮撳悕</Property>
+      </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>
+  <View layout="regionPadding:10">
+    <ClientEvent name="onReady">view.get(&quot;#dsParam&quot;).insert({});</ClientEvent>
+    <Property name="packages">font-awesome,css-common</Property>
+    <DataSet id="dsMain">
+      <Property name="dataType">[dtMain]</Property>
+      <Property name="dataProvider">staffPR#pageData</Property>
+      <Property name="pageSize">15</Property>
+    </DataSet>
+    <DataSet id="dsParam">
+      <Property name="dataType">dtParam</Property>
+    </DataSet>
+    <Container layout="regionPadding:10" layoutConstraint="top">
+      <Property name="exClassName">bg-color</Property>
+      <Property name="height">55</Property>
+      <Property name="contentOverflow">hidden</Property>
+      <Label layoutConstraint="left">
+        <Property name="text">鑿滃崟鏍忥細</Property>
+      </Label>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
+view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
+        <Property name="caption">鏂板</Property>
+        <Property name="exClassName">btn-normal</Property>
+        <Property name="iconClass">fa fa-plus</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var dialog= view.get(&quot;#dialogMain&quot;);&#xD;
+dialog.show();</ClientEvent>
+        <Property name="caption">缂栬緫</Property>
+        <Property name="exClassName">btn-warm</Property>
+        <Property name="iconClass">fa fa-pencil</Property>
+      </Button>
+      <Button layoutConstraint="left">
+        <ClientEvent name="onClick">var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+if(!cur) return;&#xD;
+view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+		return;&#xD;
+	}else{&#xD;
+		cur.remove();&#xD;
+	}&#xD;
+});</ClientEvent>
+        <Property name="caption">鍒犻櫎</Property>
+        <Property name="exClassName">btn-warn</Property>
+        <Property name="iconClass">fa fa-trash-o</Property>
+      </Button>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="center">
+      <Property name="exClassName">bg-color</Property>
+      <AutoForm>
+        <Property name="dataSet">dsParam</Property>
+        <Property name="cols">*,*,*,*</Property>
+        <Property name="labelAlign">right</Property>
+        <Property name="labelSeparator">:</Property>
+        <AutoFormElement>
+          <Property name="name">sector</Property>
+          <Property name="property">sector</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">name</Property>
+          <Property name="property">name</Property>
+          <Editor/>
+        </AutoFormElement>
+        <AutoFormElement>
+          <Property name="name">userId</Property>
+          <Property name="property">userId</Property>
+          <Editor/>
+        </AutoFormElement>
+        <Container layout="regionPadding:10">
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
+view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param).flushAsync();</ClientEvent>
+            <Property name="caption">鏌ヨ</Property>
+            <Property name="exClassName">btn-normal</Property>
+            <Property name="iconClass">fa fa-search</Property>
+          </Button>
+          <Button layoutConstraint="left">
+            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).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">
+        <ClientEvent name="onDataRowDoubleClick">var dialog= view.get(&quot;#dialogMain&quot;);&#xD;
+dialog.show();</ClientEvent>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="readOnly">true</Property>
+        <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="xb">
+          <Property name="property">xb</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="sfzhm">
+          <Property name="property">sfzhm</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="rzrq">
+          <Property name="property">rzrq</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="zgzt">
+          <Property name="property">zgzt</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+        <DataColumn name="mz">
+          <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>
+        </DataColumn>
+        <DataColumn name="updateTime">
+          <Property name="property">updateTime</Property>
+          <Property name="align">center</Property>
+        </DataColumn>
+      </DataGrid>
+    </Container>
+    <Container layout="regionPadding:10" layoutConstraint="bottom">
+      <Property name="exClassName">bg-color</Property>
+      <DataPilot layoutConstraint="right">
+        <Property name="dataSet">dsMain</Property>
+        <Property name="itemCodes">pageSize,pages</Property>
+      </DataPilot>
+    </Container>
+    <Dialog id="dialogMain">
+      <Property name="closeable">false</Property>
+      <Property name="caption">浠撳簱璁惧淇℃伅</Property>
+      <Property name="width">80%</Property>
+      <Property name="iconClass">fa fa-tasks</Property>
+      <Buttons>
+        <Button id="btnOk">
+          <ClientEvent name="onClick">view.get(&quot;#uaSave&quot;).execute(function(result){&#xD;
+	if(result){&#xD;
+		$alert(result);&#xD;
+	}else{&#xD;
+		$notify(&quot;淇濆瓨鎴愬姛锛侊紒&quot;);&#xD;
+		view.get(&quot;#dialogMain&quot;).hide();&#xD;
+	}&#xD;
+});</ClientEvent>
+          <Property name="caption">纭畾</Property>
+          <Property name="iconClass">fa fa-check</Property>
+        </Button>
+        <Button>
+          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
+self.get(&quot;parent&quot;).hide();</ClientEvent>
+          <Property name="caption">鍙栨秷</Property>
+          <Property name="iconClass">fa fa-times</Property>
+        </Button>
+      </Buttons>
+      <Children>
+        <AutoForm>
+          <Property name="dataSet">dsMain</Property>
+          <Property name="cols">*,*,*</Property>
+          <Property name="labelAlign">left</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>
+          <AutoFormElement>
+            <Property name="name">xm</Property>
+            <Property name="property">xm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">xb</Property>
+            <Property name="property">xb</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">sfzhm</Property>
+            <Property name="property">sfzhm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">rzrq</Property>
+            <Property name="property">rzrq</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">gwxz</Property>
+            <Property name="property">gwxz</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">zgzt</Property>
+            <Property name="property">zgzt</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">lzrq</Property>
+            <Property name="property">lzrq</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">zidh</Property>
+            <Property name="property">zidh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">yddh</Property>
+            <Property name="property">yddh</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">dzyx</Property>
+            <Property name="property">dzyx</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">mz</Property>
+            <Property name="property">mz</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">zzmm</Property>
+            <Property name="property">zzmm</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">rylb</Property>
+            <Property name="property">rylb</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">zy</Property>
+            <Property name="property">zy</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">qdzgzchzyzgsj</Property>
+            <Property name="property">qdzgzchzyzgsj</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">xl</Property>
+            <Property name="property">xl</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">zw</Property>
+            <Property name="property">zw</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">updateTime</Property>
+            <Property name="property">updateTime</Property>
+            <Editor/>
+          </AutoFormElement>
+        </AutoForm>
+      </Children>
+      <Tools/>
+    </Dialog>
+    <UpdateAction id="uaSave">
+      <Property name="dataResolver">staffPR#saveData</Property>
+      <UpdateItem>
+        <Property name="dataSet">dsMain</Property>
+        <Property name="dataPath">[#current]</Property>
+        <Property name="validateData">false</Property>
+      </UpdateItem>
+    </UpdateAction>
+    <AjaxAction id="ajaxDel">
+      <Property name="service">staffPR#delData</Property>
+      <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
+    </AjaxAction>
+  </View>
+</ViewConfig>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/StaffPR.java b/igds-manager/src/main/java/com/ld/igds/oa/view/StaffPR.java
new file mode 100644
index 0000000..478193a
--- /dev/null
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/StaffPR.java
@@ -0,0 +1,59 @@
+package com.ld.igds.oa.view;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.OAStaff;
+import com.ld.igds.oa.service.HStaffService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 浜哄憳淇℃伅
+ *
+ * @Author:YAN
+ */
+@Component
+public class StaffPR {
+    @Autowired
+    private HStaffService staffService;
+
+    /**
+     * staffPR#pageData
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageData(Page<OAStaff> page, Map<String, Object> param)
+            throws Exception {
+        staffService.pageData(page, param);
+    }
+
+    /**
+     * staffPR#delData
+     *
+     * @param data
+     * @throws Exception
+     */
+    @Expose
+    public String delData(OAStaff data) throws Exception {
+        return staffService.delData(data);
+    }
+
+    /**
+     * staffPR#saveData 鏂板鎴栬�呬慨鏀�
+     *
+     * @param data
+     * @throws Exception
+     */
+    @DataResolver
+    public String saveData(OAStaff data) throws Exception {
+        staffService.saveOrUpdate(data);
+        return "";
+    }
+}

--
Gitblit v1.9.3