From a673b25a0bc23b3b8b914088bdb7dca3d2e89d45 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 12 八月 2023 16:18:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml          |    4 
 igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml          |   19 
 igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java               |   11 
 igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java   |    3 
 igds-manager/src/main/java/com/ld/igds/models/DeviceCheckup.java            |    8 
 igds-manager/src/main/java/com/ld/igds/models/OAArchives.java               |   95 ++--
 igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml            |  207 +++++++--
 igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevicePR.java            |   11 
 igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java |    2 
 igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java   |   31 +
 igds-manager/src/main/java/com/ld/igds/oa/view/DeviceCheckup.view.xml       |   70 ++-
 igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java            |  687 +++++++++++++++++-----------------
 12 files changed, 662 insertions(+), 486 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
index d1c8478..3359796 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -682,9 +682,7 @@
 	list.forEach(item=>{&#xD;
 		if(item == 1)metrics+=&quot;1:璐ㄩ噺鎸囨爣妫�楠�#&quot;;&#xD;
 		if(item == 2)metrics+=&quot;2:鍌ㄥ瓨鍝佽川妫�楠�#&quot;;&#xD;
-		if(item == 3)metrics+=&quot;3:椋熷搧瀹夊叏妫�楠�#&quot;;&#xD;
-		console.log(item)&#xD;
-		console.log(metrics)	&#xD;
+		if(item == 3)metrics+=&quot;3:椋熷搧瀹夊叏妫�楠�#&quot;;	&#xD;
 	});&#xD;
 	data.set(&quot;zblb&quot;, metrics.substring(0,metrics.length-1));&#xD;
 }</ClientEvent>
diff --git a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
index 19b51e3..2470036 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
@@ -4,12 +4,10 @@
 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 javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 璁惧淇℃伅
@@ -90,4 +88,9 @@
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date updateTime;
 
+    /**
+     * 妫�淇褰�
+     */
+    @Transient
+    private List<DeviceCheckup> checkupList;
 }
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
index 369662f..b1140f1 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/DeviceCheckup.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/DeviceCheckup.java
@@ -66,6 +66,14 @@
     @Column(name = "jddw", length = 256)
     private String jddw;
 
+    @PropertyDef(label = "妫�瀹氱粨鏋�")
+    @Column(name = "jdjg", length = 10)
+    private String jdjg;
+
+    @PropertyDef(label = "澶囨敞")
+    @Column(name = "remark", length = 500)
+    private String remark;
+
     @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "zhgxsj")
diff --git a/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java b/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
index 58d62cf..f24f6ac 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/OAArchives.java
@@ -2,83 +2,84 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 
+import com.ld.igds.file.dto.FileData;
 import lombok.Data;
 
 import com.bstek.dorado.annotation.PropertyDef;
 
 /**
  * OA-妗ｆ绠＄悊
- * 
+ *
  * @author: andy.jia
  * @description:
  * @version:
  * @data:2020骞�5鏈�30鏃�
- *
  */
 @Data
 @Entity
 @Table(name = "D_OA_ARCHIVES")
 public class OAArchives implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "ID")
-	private String id;
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "ID")
+    private String id;
 
-	@Column(name = "COMPANY_ID_", length = 10)
-	@PropertyDef(label = "缁勭粐缂栫爜")
-	private String companyId;
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
 
-	@Column(name = "DEPT_ID_", length = 40)
-	@PropertyDef(label = "鎵�灞炲垎搴�")
-	private String deptId;
+    @Column(name = "DEPT_ID_", length = 40)
+    @PropertyDef(label = "鎵�灞炲垎搴�")
+    private String deptId;
 
-	@Column(name = "NAME_", length = 100)
-	@PropertyDef(label = "鏂囦欢姝ｅ悕棰�")
-	private String name;
+    @Column(name = "NAME_", length = 100)
+    @PropertyDef(label = "鏂囦欢姝ｅ悕棰�")
+    private String name;
 
-	@Column(name = "CODE_", length = 40)
-	@PropertyDef(label = "妗ｆ缂栫爜")
-	private String code;
+    @Column(name = "CODE_", length = 40)
+    @PropertyDef(label = "妗ｆ缂栫爜")
+    private String code;
 
-	@Column(name = "CATEGORY_", length = 20)
-	@PropertyDef(label = "鏂囦欢鍒嗙被")
-	private String category;
+    @Column(name = "CATEGORY_", length = 20)
+    @PropertyDef(label = "鏂囦欢鍒嗙被")
+    private String category;
 
-	@Column(name = "YEAR_", length = 10)
-	@PropertyDef(label = "褰掓。骞翠唤")
-	private String year;
+    @Column(name = "YEAR_", length = 10)
+    @PropertyDef(label = "褰掓。骞翠唤")
+    private String year;
 
-	@Column(name = "LOCATION_", length = 100)
-	@PropertyDef(label = "妗ｆ瀛樺潃")
-	private String location;
+    @Column(name = "LOCATION_", length = 100)
+    @PropertyDef(label = "妗ｆ瀛樺潃")
+    private String location;
 
-	@Column(name = "SEC_LEVEL_", length = 20)
-	@PropertyDef(label = "瀹夊叏绾у埆")
-	private String secLevel;
+    @Column(name = "SEC_LEVEL_", length = 20)
+    @PropertyDef(label = "瀹夊叏绾у埆")
+    private String secLevel;
 
-	@Column(name = "FILE_NAME_", length = 50)
-	@PropertyDef(label = "闄勪欢鍚嶇О")
-	private String fileName;
+    @Column(name = "FILE_NAME_", length = 50)
+    @PropertyDef(label = "闄勪欢鍚嶇О")
+    private String fileName;
 
-	@Column(name = "UPDATE_TIME_")
-	@PropertyDef(label = "淇敼鏃堕棿", description = "鏈�鍚庝慨鏀规椂闂�")
-	private Date updateTime;
+    @Column(name = "UPDATE_TIME_")
+    @PropertyDef(label = "淇敼鏃堕棿", description = "鏈�鍚庝慨鏀规椂闂�")
+    private Date updateTime;
 
-	@Column(name = "UPDATE_USER_", length = 30)
-	@PropertyDef(label = "淇敼浜�", description = "鏈�鍚庝慨鏀逛汉")
-	private String updateUser;
+    @Column(name = "UPDATE_USER_", length = 30)
+    @PropertyDef(label = "淇敼浜�", description = "鏈�鍚庝慨鏀逛汉")
+    private String updateUser;
 
-	@Column(name = "REMARK_", length = 255)
-	@PropertyDef(label = "澶囨敞")
-	private String remark;
+    @Column(name = "REMARK_", length = 255)
+    @PropertyDef(label = "澶囨敞")
+    private String remark;
+
+    @Transient
+    private List<FileInfo> fileData;
 
 }
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
index 7b64f1b..25e52fa 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
@@ -9,9 +9,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Session;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -46,10 +48,23 @@
         Session session = this.getSessionFactory().openSession();
         try {
             data.setCompanyId(ContextUtil.getCompanyId());
+            data.setUpdateTime(new Date());
             if (null == data.getId()) {
                 data.setId(ContextUtil.getUUID());
             }
             session.saveOrUpdate(data);
+//            if (!CollectionUtils.isEmpty(data.getCheckupList())) {
+//                for (DeviceCheckup item : data.getCheckupList()) {
+//                    if (null == item.getId()) {
+//                        item.setCompanyId(ContextUtil.getCompanyId());
+//                        item.setId(ContextUtil.getCompanyId());
+//                        item.setSbbh(data.getSbbh());
+//                        item.setSbyqdm(data.getSbyqdm());
+//                        item.setSbyqmc(data.getSbyqmc());
+//                    }
+//                    session.saveOrUpdate(item);
+//                }
+//            }
         } finally {
             session.flush();
             session.close();
@@ -88,11 +103,27 @@
 
     }
 
+    public List<DeviceCheckup> listCheck(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);
+        }
+
+        hql += " order by jdsj desc";
+
+        return this.query(hql, args);
+    }
+
     public String saveCheck(DeviceCheckup data) {
 
         Session session = this.getSessionFactory().openSession();
         try {
             data.setCompanyId(ContextUtil.getCompanyId());
+            data.setZhgxsj(new Date());
             if (null == data.getId()) {
                 data.setId(ContextUtil.getUUID());
             }
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java
index ecc352d..477ecce 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HOfficeAutoService.java
@@ -327,7 +327,7 @@
         this.pagingQuery(page, hql, count, args);
     }
 
-    public void saveArchives(OAArchives data) {
+    public String saveArchives(OAArchives data) {
         if (null == data.getCompanyId()) {
             data.setCompanyId(ContextUtil.getCompanyId());
         }
@@ -347,6 +347,7 @@
             session.flush();
             session.close();
         }
+        return data.getId();
     }
 
     public String delArchives(OAArchives data) {
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
index e63b915..4568e99 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
@@ -69,6 +69,11 @@
         <Property></Property>
         <Property name="label">澶囨敞</Property>
       </PropertyDef>
+      <Reference name="fileData">
+        <Property name="dataProvider">sys.fileManager#listFile</Property>
+        <Property name="dataType">[dtFileData]</Property>
+        <Property name="parameter">$${this.id}</Property>
+      </Reference>
     </DataType>
     <DataType name="dtParam">
       <PropertyDef name="name">
@@ -93,11 +98,36 @@
   <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;#dsMain&quot;).insert({});&#xD;
 	view.get(&quot;#dialogMain&quot;).show();&#xD;
+}&#xD;
+//闄勪欢涓嬭浇&#xD;
+downLodFile = function(){&#xD;
+	var entity = view.get(&quot;#dgFiles&quot;).getCurrentItem();&#xD;
+	view.get(&quot;#downloadFile&quot;).set(&quot;parameter&quot;,{&#xD;
+		fileId:entity.get(&quot;fileId&quot;),&#xD;
+		fileName:entity.get(&quot;fileName&quot;),&#xD;
+		createTime:entity.get(&quot;createTime&quot;)&#xD;
+	}).execute();&#xD;
+}&#xD;
+&#xD;
+&#xD;
+//鍒犻櫎闄勪欢&#xD;
+delFile = function(){&#xD;
+	var entity = view.get(&quot;#dgFiles&quot;).getCurrentItem();&#xD;
+	view.get(&quot;#ajaxDelFile&quot;).set(&quot;parameter&quot;,{&#xD;
+		fileId:entity.get(&quot;fileId&quot;),&#xD;
+		fileName:entity.get(&quot;fileName&quot;),&#xD;
+		createTime:entity.get(&quot;createTime&quot;)&#xD;
+	}).execute(function(result){&#xD;
+		if(result){&#xD;
+			$alert(result);&#xD;
+		}else{&#xD;
+			entity.remove();&#xD;
+			$alert(&quot;鍒犻櫎鎴愬姛锛�&quot;);&#xD;
+		}&#xD;
+	});&#xD;
 }</ClientEvent>
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
@@ -247,7 +277,6 @@
       </DataPilot>
     </Container>
     <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
-      <Property name="height">500</Property>
       <Property name="width">85%</Property>
       <Property name="caption">妗ｆ淇℃伅</Property>
       <Property name="iconClass">fa fa-flag-o</Property>
@@ -275,55 +304,127 @@
         </Button>
       </Buttons>
       <Children>
-        <AutoForm>
-          <Property name="dataSet">dsMain</Property>
-          <Property name="cols">*,*,*</Property>
-          <Property name="labelWidth">100</Property>
-          <Property name="labelAlign">right</Property>
-          <Property name="labelSeparator">锛�</Property>
-          <AutoFormElement layoutConstraint="colSpan:2">
-            <Property name="name">name</Property>
-            <Property name="property">name</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">code</Property>
-            <Property name="property">code</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">category</Property>
-            <Property name="property">category</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">year</Property>
-            <Property name="property">year</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">secLevel</Property>
-            <Property name="property">secLevel</Property>
-            <Property name="trigger">listSecLevel</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement layoutConstraint="colSpan:2">
-            <Property name="name">location</Property>
-            <Property name="property">location</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">fileName</Property>
-            <Property name="property">fileName</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement layoutConstraint="colSpan:3">
-            <Property name="name">remark</Property>
-            <Property name="property">remark</Property>
-            <Property name="editorType">TextArea</Property>
-            <Editor/>
-          </AutoFormElement>
-        </AutoForm>
+        <FieldSet layout="regionPadding:10">
+          <Property name="caption">鍩虹淇℃伅</Property>
+          <Buttons/>
+          <Children>
+            <AutoForm>
+              <Property name="dataSet">dsMain</Property>
+              <Property name="cols">*,*,*</Property>
+              <Property name="labelWidth">100</Property>
+              <Property name="labelAlign">right</Property>
+              <Property name="labelSeparator">锛�</Property>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">name</Property>
+                <Property name="property">name</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">code</Property>
+                <Property name="property">code</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">category</Property>
+                <Property name="property">category</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">year</Property>
+                <Property name="property">year</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">secLevel</Property>
+                <Property name="property">secLevel</Property>
+                <Property name="trigger">listSecLevel</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">location</Property>
+                <Property name="property">location</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">fileName</Property>
+                <Property name="property">fileName</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:3">
+                <Property name="name">remark</Property>
+                <Property name="property">remark</Property>
+                <Property name="editorType">TextArea</Property>
+                <Editor/>
+              </AutoFormElement>
+            </AutoForm>
+          </Children>
+        </FieldSet>
+        <FieldSet layout="regionPadding:10">
+          <Property name="caption">涓婁紶闄勪欢</Property>
+          <Property name="height">200</Property>
+          <Buttons>
+            <Button id="addFile">
+              <Property name="caption">娣诲姞闄勪欢</Property>
+              <Property name="exClassName">btn-default</Property>
+              <Property name="iconClass">fa fa-cloud-upload</Property>
+              <Property name="action">uploadFile</Property>
+            </Button>
+          </Buttons>
+          <Children>
+            <DataGrid id="dgFiles">
+              <ClientEvent name="onDataRowClick">view.get(&quot;#dgFiles&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
+              <Property name="dataPath">#.fileData</Property>
+              <Property name="dataSet">dsMain</Property>
+              <Property name="readOnly">true</Property>
+              <Property name="selectionMode">singleRow</Property>
+              <RowNumColumn/>
+              <RowSelectorColumn/>
+              <DataColumn name="fileName">
+                <Property name="property">fileName</Property>
+              </DataColumn>
+              <DataColumn name="createTime">
+                <Property name="property">createTime</Property>
+                <Property name="align">center</Property>
+              </DataColumn>
+              <DataColumn name="fileId">
+                <ClientEvent name="onRenderCell">arg.dom.innerHTML = &quot;&lt;a href='javascript:;' onClick='downLodFile()'>涓嬭浇&lt;/a>&amp;nbsp;&amp;nbsp;|&amp;nbsp;&amp;nbsp;&lt;a href='javascript:;' onClick='delFile()'>鍒犻櫎&lt;/a>&quot;;&#xD;
+</ClientEvent>
+                <Property name="property">fileId</Property>
+                <Property name="align">center</Property>
+                <Property name="caption">鎿嶄綔</Property>
+                <Property name="readOnly">true</Property>
+                <Property name="width">90</Property>
+              </DataColumn>
+            </DataGrid>
+            <UploadAction id="uploadFile">
+              <ClientEvent name="onFileUploaded">var files = view.get(&quot;#dsMain.data:#&quot;).get(&quot;fileData&quot;);&#xD;
+if(files.entityCount>=1){&#xD;
+	$alert(&quot;鍙兘涓婁紶涓�涓檮浠�&quot;)&#xD;
+	return;&#xD;
+}else{&#xD;
+	//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�&#xD;
+var mainData = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+var fileId = arg.returnValue;&#xD;
+var files = view.get(&quot;#dsMain.data:#&quot;).get(&quot;fileData&quot;);&#xD;
+files.insert({fileId:fileId,fileName:arg.file.name,createTime:new Date()});&#xD;
+}&#xD;
+</ClientEvent>
+              <Property name="fileResolver">applyOrderUploadProcessor#uploadApplyOrderFile</Property>
+              <Property name="maxFileSize">50MB</Property>
+              <Property name="successMessage">闄勪欢涓婁紶鎴愬姛锛侊紒</Property>
+              <Filters/>
+            </UploadAction>
+            <DownloadAction id="downloadFile">
+              <Property name="caption">涓嬭浇闄勪欢</Property>
+              <Property name="fileProvider">applyOrderUploadProcessor#downloadApplyOrderFile</Property>
+              <Property name="successMessage">闄勪欢涓嬭浇鎴愬姛锛�</Property>
+            </DownloadAction>
+            <AjaxAction id="ajaxDelFile">
+              <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
+              <Property name="service">applyOrderUploadProcessor#delFile</Property>
+            </AjaxAction>
+          </Children>
+        </FieldSet>
       </Children>
       <Tools/>
     </Dialog>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
index 78cb4ab..71d6772 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -96,6 +96,7 @@
       <PropertyDef name="updateTime">
         <Property name="dataType">Date</Property>
         <Property name="label">鏇存柊鏃堕棿</Property>
+        <Property name="readOnly">true</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtParam">
@@ -114,34 +115,34 @@
     <DataType name="dtCheck">
       <Property name="creationType">com.ld.igds.models.DeviceCheckup</Property>
       <PropertyDef name="id">
-        <Property/>
+        <Property></Property>
       </PropertyDef>
       <PropertyDef name="companyId">
-        <Property/>
+        <Property></Property>
         <Property name="label">缁勭粐缂栫爜</Property>
       </PropertyDef>
       <PropertyDef name="sbbh">
-        <Property/>
+        <Property></Property>
         <Property name="label">璁惧缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="kqdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">搴撳尯浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="kqmc">
-        <Property/>
+        <Property></Property>
         <Property name="label">搴撳尯鍚嶇О</Property>
       </PropertyDef>
       <PropertyDef name="dwdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍗曚綅浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="sbyqmc">
-        <Property/>
+        <Property></Property>
         <Property name="label">璁惧浠櫒鍚嶇О</Property>
       </PropertyDef>
       <PropertyDef name="sbyqdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">璁惧浠櫒浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="jdsj">
@@ -149,7 +150,7 @@
         <Property name="label">妫�瀹氭椂闂�</Property>
       </PropertyDef>
       <PropertyDef name="jddw">
-        <Property/>
+        <Property></Property>
         <Property name="label">妫�瀹氬崟浣�</Property>
       </PropertyDef>
       <PropertyDef name="zhgxsj">
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
index 9060343..713a4e7 100644
--- 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
@@ -75,6 +75,17 @@
     }
 
     /**
+     * deptDevicePR#listCheck
+     *
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void listCheck(Map<String, Object> param) throws Exception {
+        deptDeviceService.listCheck(param);
+    }
+
+    /**
      * deptDevicePR#delCheck
      *
      * @param data
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
index c28e8c4..19ea3db 100644
--- 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
@@ -6,34 +6,34 @@
     <DataType name="dtMain">
       <Property name="creationType">com.ld.igds.models.DeviceCheckup</Property>
       <PropertyDef name="id">
-        <Property/>
+        <Property></Property>
       </PropertyDef>
       <PropertyDef name="companyId">
-        <Property/>
+        <Property></Property>
         <Property name="label">缁勭粐缂栫爜</Property>
       </PropertyDef>
       <PropertyDef name="sbbh">
-        <Property/>
+        <Property></Property>
         <Property name="label">璁惧缂栧彿</Property>
       </PropertyDef>
       <PropertyDef name="kqdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">搴撳尯浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="kqmc">
-        <Property/>
+        <Property></Property>
         <Property name="label">搴撳尯鍚嶇О</Property>
       </PropertyDef>
       <PropertyDef name="dwdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">鍗曚綅浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="sbyqmc">
-        <Property/>
+        <Property></Property>
         <Property name="label">璁惧浠櫒鍚嶇О</Property>
       </PropertyDef>
       <PropertyDef name="sbyqdm">
-        <Property/>
+        <Property></Property>
         <Property name="label">璁惧浠櫒浠ｇ爜</Property>
       </PropertyDef>
       <PropertyDef name="jdsj">
@@ -41,12 +41,21 @@
         <Property name="label">妫�瀹氭椂闂�</Property>
       </PropertyDef>
       <PropertyDef name="jddw">
-        <Property/>
+        <Property></Property>
         <Property name="label">妫�瀹氬崟浣�</Property>
       </PropertyDef>
       <PropertyDef name="zhgxsj">
         <Property name="dataType">Date</Property>
         <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+        <Property name="readOnly">true</Property>
+      </PropertyDef>
+      <PropertyDef name="jdjg">
+        <Property/>
+        <Property name="label">妫�瀹氱粨鏋�</Property>
+      </PropertyDef>
+      <PropertyDef name="remark">
+        <Property/>
+        <Property name="label">澶囨敞</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtParam">
@@ -63,7 +72,7 @@
       </PropertyDef>
     </DataType>
   </Model>
-  <View>
+  <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">
@@ -157,49 +166,50 @@
         <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>
+          <Property name="readOnly">true</Property>
         </DataColumn>
         <DataColumn name="kqdm">
           <Property name="property">kqdm</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="dwdm">
           <Property name="property">dwdm</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="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="zhgxsj">
           <Property name="property">zhgxsj</Property>
           <Property name="align">center</Property>
+          <Property name="readOnly">true</Property>
         </DataColumn>
       </DataGrid>
     </Container>
@@ -243,16 +253,6 @@
           <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/>
@@ -293,6 +293,17 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
+            <Property name="name">jdjg</Property>
+            <Property name="property">jdjg</Property>
+            <Property name="trigger">listDropYN</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">remark</Property>
+            <Property name="property">remark</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
             <Property name="name">zhgxsj</Property>
             <Property name="property">zhgxsj</Property>
             <Editor/>
@@ -313,5 +324,8 @@
       <Property name="service">deptDevicePR#delCheck</Property>
       <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
     </AjaxAction>
+    <ListDropDown id="listDropYN">
+      <Property name="items">鍚堟牸,涓嶅悎鏍�</Property>
+    </ListDropDown>
   </View>
 </ViewConfig>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
index 0065fd7..26473c3 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.ld.igds.file.CoreFileService;
 import com.ld.igds.models.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,394 +21,400 @@
 
 /**
  * OA妯″潡-PR
- * 
+ *
  * @author: andy.jia
  * @description:
  * @version:
  * @data:2020骞�5鏈�29鏃�
- *
  */
 @Component("oaPR")
 public class OfficeAutoPR {
 
-	@Autowired
-	private HOfficeAutoService service;
+    @Autowired
+    private HOfficeAutoService service;
 
-	@Autowired
-	private GpsConfManager gpsConfManager;
+    @Autowired
+    private GpsConfManager gpsConfManager;
 
-	// =====================鑰冨嫟绠＄悊=====================//
+    @Autowired
+    private CoreFileService fileService;
 
-	/**
-	 * oaPR#pageAttendance
-	 * 
-	 * @param page
-	 * @param param
-	 * @throws Exception
-	 */
-	@DataProvider
-	public void pageAttendance(Page<OAAttendance> page,
-			Map<String, Object> param) throws Exception {
-		service.pageAttendance(page, param);
-	}
+    // =====================鑰冨嫟绠＄悊=====================//
 
-	/**
-	 * oaPR#saveAttendance
-	 * 
-	 * @param data
-	 */
-	@DataResolver
-	public void saveAttendance(OAAttendance data) {
-		service.saveAttendance(data);
-	}
+    /**
+     * oaPR#pageAttendance
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageAttendance(Page<OAAttendance> page,
+                               Map<String, Object> param) throws Exception {
+        service.pageAttendance(page, param);
+    }
 
-	/**
-	 * oaPR#delAttendance
-	 * 
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delAttendance(OAAttendance data) {
-		return service.delAttendance(data);
-	}
+    /**
+     * oaPR#saveAttendance
+     *
+     * @param data
+     */
+    @DataResolver
+    public void saveAttendance(OAAttendance data) {
+        service.saveAttendance(data);
+    }
 
-	// =====================缁╂晥绠＄悊=====================//
+    /**
+     * oaPR#delAttendance
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delAttendance(OAAttendance data) {
+        return service.delAttendance(data);
+    }
 
-	/**
-	 * oaPR#pageAppraisal
-	 * 
-	 * @param page
-	 * @param param
-	 * @throws Exception
-	 */
-	@DataProvider
-	public void pageAppraisal(Page<OAAppraisal> page, Map<String, Object> param)
-			throws Exception {
-		service.pageAppraisal(page, param);
-	}
+    // =====================缁╂晥绠＄悊=====================//
 
-	/**
-	 * oaPR#listAppraisalDetail
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@DataProvider
-	public List<OAAppraisalDetail> listAppraisalDetail(String id) {
-		return service.listAppraisalDetail(id);
-	}
+    /**
+     * oaPR#pageAppraisal
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageAppraisal(Page<OAAppraisal> page, Map<String, Object> param)
+            throws Exception {
+        service.pageAppraisal(page, param);
+    }
 
-	/**
-	 * oaPR#saveAppraisal
-	 * 
-	 * @param data
-	 */
-	@DataResolver
-	public void saveAppraisal(OAAppraisal data) {
-		service.saveAppraisal(data);
-	}
+    /**
+     * oaPR#listAppraisalDetail
+     *
+     * @param id
+     * @return
+     */
+    @DataProvider
+    public List<OAAppraisalDetail> listAppraisalDetail(String id) {
+        return service.listAppraisalDetail(id);
+    }
 
-	/**
-	 * oaPR#delAppraisal
-	 * 
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delAppraisal(OAAppraisal data) {
-		return service.delAppraisal(data);
-	}
+    /**
+     * oaPR#saveAppraisal
+     *
+     * @param data
+     */
+    @DataResolver
+    public void saveAppraisal(OAAppraisal data) {
+        service.saveAppraisal(data);
+    }
 
-	/**
-	 * oaPR#delAppraisalDetail
-	 * 
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delAppraisalDetail(OAAppraisalDetail data) {
-		return service.delAppraisalDetail(data);
-	}
+    /**
+     * oaPR#delAppraisal
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delAppraisal(OAAppraisal data) {
+        return service.delAppraisal(data);
+    }
 
-	// =====================宸ヨ祫绠＄悊=====================//
+    /**
+     * oaPR#delAppraisalDetail
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delAppraisalDetail(OAAppraisalDetail data) {
+        return service.delAppraisalDetail(data);
+    }
 
-	/**
-	 * oaPR#pageSalary
-	 * 
-	 * @param page
-	 * @param param
-	 * @throws Exception
-	 */
-	@DataProvider
-	public void pageSalary(Page<OASalary> page, Map<String, Object> param)
-			throws Exception {
-		service.pageSalary(page, param);
-	}
+    // =====================宸ヨ祫绠＄悊=====================//
 
-	/**
-	 * oaPR#saveSalary
-	 * 
-	 * @param data
-	 */
-	@DataResolver
-	public void saveSalary(OASalary data) {
-		service.saveSalary(data);
-	}
+    /**
+     * oaPR#pageSalary
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageSalary(Page<OASalary> page, Map<String, Object> param)
+            throws Exception {
+        service.pageSalary(page, param);
+    }
 
-	/**
-	 * oaPR#delSalary
-	 * 
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delSalary(OASalary data) {
-		return service.delSalary(data);
-	}
+    /**
+     * oaPR#saveSalary
+     *
+     * @param data
+     */
+    @DataResolver
+    public void saveSalary(OASalary data) {
+        service.saveSalary(data);
+    }
 
-	// =====================妗ｆ绠＄悊=====================//
+    /**
+     * oaPR#delSalary
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delSalary(OASalary data) {
+        return service.delSalary(data);
+    }
 
-	/**
-	 * oaPR#pageArchives
-	 * 
-	 * @param page
-	 * @param param
-	 * @throws Exception
-	 */
-	@DataProvider
-	public void pageArchives(Page<OAArchives> page, Map<String, Object> param)
-			throws Exception {
-		service.pageArchives(page, param);
-	}
+    // =====================妗ｆ绠＄悊=====================//
 
-	/**
-	 * oaPR#saveArchives
-	 * 
-	 * @param data
-	 */
-	@DataResolver
-	public void saveArchives(OAArchives data) {
-		service.saveArchives(data);
-	}
+    /**
+     * oaPR#pageArchives
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageArchives(Page<OAArchives> page, Map<String, Object> param)
+            throws Exception {
+        service.pageArchives(page, param);
+    }
 
-	/**
-	 * oaPR#delArchives
-	 * 
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delArchives(OAArchives data) {
-		return service.delArchives(data);
-	}
+    /**
+     * oaPR#saveArchives
+     *
+     * @param data
+     */
+    @DataResolver
+    public void saveArchives(OAArchives data) {
+        String orderId = service.saveArchives(data);
 
-	// =====================璧勪骇绠＄悊=====================//
+        // 闄勪欢
+        List<FileInfo> files = data.getFileData();
+        fileService.saveFiles(files, orderId, null);
+    }
 
-	/**
-	 * oaPR#pageAsset
-	 * 
-	 * @param page
-	 * @param param
-	 * @throws Exception
-	 */
-	@DataProvider
-	public void pageAsset(Page<OAAsset> page, Map<String, Object> param)
-			throws Exception {
-		service.pageAsset(page, param);
-	}
+    /**
+     * oaPR#delArchives
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delArchives(OAArchives data) {
+        return service.delArchives(data);
+    }
 
-	/**
-	 * oaPR#saveAsset
-	 * 
-	 * @param data
-	 */
-	@DataResolver
-	public void saveAsset(OAAsset data) {
-		service.saveAsset(data);
-	}
+    // =====================璧勪骇绠＄悊=====================//
 
-	/**
-	 * oaPR#delAsset
-	 * 
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delAsset(OAAsset data) {
-		return service.delAsset(data);
-	}
+    /**
+     * oaPR#pageAsset
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageAsset(Page<OAAsset> page, Map<String, Object> param)
+            throws Exception {
+        service.pageAsset(page, param);
+    }
 
-	/**
-	 * oaPR#queryLocation
-	 *
-	 * 鏌ヨ璁惧浣嶇疆
-	 *
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String  queryLocation(OAAsset data) {
-		return gpsConfManager.queryLocation(data);
-	}
+    /**
+     * oaPR#saveAsset
+     *
+     * @param data
+     */
+    @DataResolver
+    public void saveAsset(OAAsset data) {
+        service.saveAsset(data);
+    }
 
-	// =====================璧勪骇绠＄悊-GPS绠＄悊=====================//
+    /**
+     * oaPR#delAsset
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delAsset(OAAsset data) {
+        return service.delAsset(data);
+    }
 
-	/**
-	 * ${dorado.getDataProvider("oaPR#triggerGpsStatus").getResult()}
-	 *
-	 * @return
-	 */
-	@DataProvider
-	public List<DicTrigger> triggerGpsStatus() {
-		List<DicTrigger> list = new ArrayList<DicTrigger>();
-		list.add(new DicTrigger(OAUtil.RUN_STATUS_RUN, "杩愯"));
-		list.add(new DicTrigger(OAUtil.RUN_STATUS_STOP, "鍋滄"));
-		list.add(new DicTrigger(OAUtil.RUN_STATUS_NONE, "鏈煡"));
-		return list;
-	}
+    /**
+     * oaPR#queryLocation
+     * <p>
+     * 鏌ヨ璁惧浣嶇疆
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String queryLocation(OAAsset data) {
+        return gpsConfManager.queryLocation(data);
+    }
 
-	/**
-	 * oaPR#getGps
-	 *
-	 * @return
-	 * @throws Exception
-	 */
-	@DataProvider
-	public List<OAGps> getGps() throws Exception {
-		return service.getGps();
-	}
+    // =====================璧勪骇绠＄悊-GPS绠＄悊=====================//
 
-	/**
-	 * oaPR#saveGps
-	 *
-	 * @return
-	 * @throws Exception
-	 */
-	@Expose
-	public String saveGps(OAGps data) {
-		String msg = service.saveGps(data);
-		return msg;
-	}
+    /**
+     * ${dorado.getDataProvider("oaPR#triggerGpsStatus").getResult()}
+     *
+     * @return
+     */
+    @DataProvider
+    public List<DicTrigger> triggerGpsStatus() {
+        List<DicTrigger> list = new ArrayList<DicTrigger>();
+        list.add(new DicTrigger(OAUtil.RUN_STATUS_RUN, "杩愯"));
+        list.add(new DicTrigger(OAUtil.RUN_STATUS_STOP, "鍋滄"));
+        list.add(new DicTrigger(OAUtil.RUN_STATUS_NONE, "鏈煡"));
+        return list;
+    }
 
-	/**
-	 * oaPR#delGps
-	 *
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delGps(OAGps data) {
-		String msg = service.delGps(data);
-		return msg;
-	}
+    /**
+     * oaPR#getGps
+     *
+     * @return
+     * @throws Exception
+     */
+    @DataProvider
+    public List<OAGps> getGps() throws Exception {
+        return service.getGps();
+    }
 
-	/**
-	 * oaPR#flushCache
-	 *
-	 * @param
-	 * @return
-	 */
-	@Expose
-	public String flushCache() {
-		return service.flushCache(ContextUtil.getCompanyId());
-	}
+    /**
+     * oaPR#saveGps
+     *
+     * @return
+     * @throws Exception
+     */
+    @Expose
+    public String saveGps(OAGps data) {
+        String msg = service.saveGps(data);
+        return msg;
+    }
 
-	// =====================鎶ラ攢绠＄悊=====================//
+    /**
+     * oaPR#delGps
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delGps(OAGps data) {
+        String msg = service.delGps(data);
+        return msg;
+    }
 
-	/**
-	 * oaPR#pageExpClaimSubmit
-	 * 
-	 * @param page
-	 * @param param
-	 * @throws Exception
-	 */
-	@DataProvider
-	public void pageExpClaimSubmit(Page<OAExpClaim> page,
-			Map<String, Object> param) throws Exception {
-		if (null == param)
-			param = new HashMap<String, Object>();
+    /**
+     * oaPR#flushCache
+     *
+     * @param
+     * @return
+     */
+    @Expose
+    public String flushCache() {
+        return service.flushCache(ContextUtil.getCompanyId());
+    }
 
-		param.put("submitUserId", ContextUtil.getLoginUserName());
+    // =====================鎶ラ攢绠＄悊=====================//
 
-		service.pageExpClaim(page, param);
-	}
+    /**
+     * oaPR#pageExpClaimSubmit
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageExpClaimSubmit(Page<OAExpClaim> page,
+                                   Map<String, Object> param) throws Exception {
+        if (null == param)
+            param = new HashMap<String, Object>();
 
-	/**
-	 * oaPR#pageExpClaimAudit
-	 * 
-	 * @param page
-	 * @param param
-	 * @throws Exception
-	 */
-	@DataProvider
-	public void pageExpClaimAudit(Page<OAExpClaim> page,
-			Map<String, Object> param) throws Exception {
+        param.put("submitUserId", ContextUtil.getLoginUserName());
 
-		service.pageExpClaim(page, param);
-	}
+        service.pageExpClaim(page, param);
+    }
 
-	/**
-	 * oaPR#listExpClaimDetail
-	 * 
-	 * @param id
-	 * @return
-	 */
-	@DataProvider
-	public List<OAExpClaimDetail> listExpClaimDetail(String id) {
-		return service.listExpClaimDetail(id);
-	}
+    /**
+     * oaPR#pageExpClaimAudit
+     *
+     * @param page
+     * @param param
+     * @throws Exception
+     */
+    @DataProvider
+    public void pageExpClaimAudit(Page<OAExpClaim> page,
+                                  Map<String, Object> param) throws Exception {
 
-	/**
-	 * oaPR#saveExpClaim
-	 * 
-	 * @param data
-	 */
-	@DataResolver
-	public void saveExpClaim(OAExpClaim data) {
-		service.saveExpClaim(data,false);
-	}
-	
-	/**
-	 * oaPR#AuditExpClaim
-	 * 
-	 * @param data
-	 */
-	@DataResolver
-	public void AuditExpClaim(OAExpClaim data) {
-		service.saveExpClaim(data,true);
-	}
+        service.pageExpClaim(page, param);
+    }
 
-	/**
-	 * oaPR#delExpClaim
-	 * 
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delExpClaim(OAExpClaim data) {
-		return service.delExpClaim(data);
-	}
+    /**
+     * oaPR#listExpClaimDetail
+     *
+     * @param id
+     * @return
+     */
+    @DataProvider
+    public List<OAExpClaimDetail> listExpClaimDetail(String id) {
+        return service.listExpClaimDetail(id);
+    }
 
-	/**
-	 * oaPR#delExpClaimDetail
-	 * 
-	 * @param data
-	 * @return
-	 */
-	@Expose
-	public String delExpClaimDetail(OAExpClaimDetail data) {
-		return service.delExpClaimDetail(data);
-	}
+    /**
+     * oaPR#saveExpClaim
+     *
+     * @param data
+     */
+    @DataResolver
+    public void saveExpClaim(OAExpClaim data) {
+        service.saveExpClaim(data, false);
+    }
 
-	// ${dorado.getDataProvider("oaPR#triggerStatus").getResult()}
-	@DataProvider
-	public List<DicTrigger> triggerStatus() {
-		List<DicTrigger> list = new ArrayList<DicTrigger>();
-		list.add(new DicTrigger(OAUtil.AUDIT_NONE, "寰呭鏍�"));
-		list.add(new DicTrigger(OAUtil.AUDIT_PASS, "瀹℃牳閫氳繃"));
-		list.add(new DicTrigger(OAUtil.AUDIT_UNPASS, "瀹℃牳鎷掔粷"));
-		return list;
-	}
+    /**
+     * oaPR#AuditExpClaim
+     *
+     * @param data
+     */
+    @DataResolver
+    public void AuditExpClaim(OAExpClaim data) {
+        service.saveExpClaim(data, true);
+    }
+
+    /**
+     * oaPR#delExpClaim
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delExpClaim(OAExpClaim data) {
+        return service.delExpClaim(data);
+    }
+
+    /**
+     * oaPR#delExpClaimDetail
+     *
+     * @param data
+     * @return
+     */
+    @Expose
+    public String delExpClaimDetail(OAExpClaimDetail data) {
+        return service.delExpClaimDetail(data);
+    }
+
+    // ${dorado.getDataProvider("oaPR#triggerStatus").getResult()}
+    @DataProvider
+    public List<DicTrigger> triggerStatus() {
+        List<DicTrigger> list = new ArrayList<DicTrigger>();
+        list.add(new DicTrigger(OAUtil.AUDIT_NONE, "寰呭鏍�"));
+        list.add(new DicTrigger(OAUtil.AUDIT_PASS, "瀹℃牳閫氳繃"));
+        list.add(new DicTrigger(OAUtil.AUDIT_UNPASS, "瀹℃牳鎷掔粷"));
+        return list;
+    }
 
 }
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
index 50dc1d6..e0bdf8f 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugLogApplyService.java
@@ -73,7 +73,7 @@
             } else {
                 session.update(data);
             }
-            if (CollectionUtils.isEmpty(data.getDrugLogPeople())) {
+            if (!CollectionUtils.isEmpty(data.getDrugLogPeople())) {
                 for (DrugLogPeople drugLogPeople : data.getDrugLogPeople()) {
                     if (null == drugLogPeople.getId()) {
                         drugLogPeople.setId(ContextUtil.getUUID());

--
Gitblit v1.9.3