From d3d12e212470904e54affe5ec8c06c672607cab9 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 14 八月 2023 17:13:29 +0800
Subject: [PATCH] 功能优化
---
igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml | 229 ++++++++++++++++++++++++++------
igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java | 7
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 42 +++++
igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml | 18 +
igds-core/src/main/java/com/ld/igds/util/DateUtil.java | 4
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 2
igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java | 37 +++--
igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java | 37 +++++
8 files changed, 296 insertions(+), 80 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/util/DateUtil.java b/igds-core/src/main/java/com/ld/igds/util/DateUtil.java
index d8c0f6e..9835075 100644
--- a/igds-core/src/main/java/com/ld/igds/util/DateUtil.java
+++ b/igds-core/src/main/java/com/ld/igds/util/DateUtil.java
@@ -141,10 +141,6 @@
public static Date getNewByMinute(Date date, int num) {
if (null == date) date = new Date();
date = DateUtils.addMinutes(date, num);
- date = DateUtils.setHours(date, 0);
- date = DateUtils.setMinutes(date, 0);
- date = DateUtils.setSeconds(date, 0);
- date = DateUtils.setMilliseconds(date, 0);
return date;
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 7e92309..f60c2a3 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -224,6 +224,19 @@
fileData.setFileId(ContextUtil.getUUID());
fileData.setCompanyId(data.getCompanyId());
fileData.setBizId(data.getId());
+ if ("HANDLE".equals(fileData.getBizTag())) {
+ if (data.getEmptyWeightTime().before(data.getFullWeightTime())) {
+ fileData.setCreateTime(DateUtils.addMinutes(data.getFullWeightTime(), -20));
+ } else {
+ fileData.setCreateTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -20));
+ }
+ }
+ if ("WEIGHT_EMPTY".equals(fileData.getBizTag())) {
+ fileData.setCreateTime(data.getEmptyWeightTime());
+ }
+ if ("WEIGHT_FULL".equals(fileData.getBizTag())) {
+ fileData.setCreateTime(data.getFullWeightTime());
+ }
fileData.setCreateTime(new Date());
coreFileService.addRecord(fileData);
}
@@ -423,7 +436,7 @@
data.setCompleteTime(new Date());
}
// 娉ㄥ唽鏃堕棿姣斿畬鎴愭椂闂存棭涓�涓皬鏃�
- data.setRegisterTime(DateUtil.getNewByMinute(new Date(), -60));
+ data.setRegisterTime(DateUtils.addMinutes(new Date(), -80));
if (StringUtils.isEmpty(data.getUserId())) {
data.setUserId(InoutConstant.DEFAULT_ID_CARD);
@@ -438,19 +451,38 @@
if (InoutConstant.TYPE_IN.equals(data.getType())) {
if (null == data.getFullWeightTime()) {
- data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -50));
+ data.setFullWeightTime(DateUtils.addMinutes(new Date(), -50));
}
if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -10));
+ data.setEmptyWeightTime(DateUtils.addMinutes(new Date(), -10));
+ }
+
+ if (data.getCompleteTime().before(data.getEmptyWeightTime())) {
+ data.setEmptyWeightTime(DateUtils.addMinutes(data.getCompleteTime(), -10));
+ }
+ if (data.getEmptyWeightTime().before(data.getFullWeightTime())) {
+ data.setFullWeightTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -40));
+ }
+ if (data.getFullWeightTime().before(data.getRegisterTime())) {
+ data.setRegisterTime(DateUtils.addMinutes(data.getFullWeightTime(), -30));
}
data = this.updateCheckItems(data, false);
} else {
if (null == data.getEmptyWeightTime()) {
- data.setEmptyWeightTime(DateUtil.getNewByMinute(new Date(), -50));
+ data.setEmptyWeightTime(DateUtils.addMinutes(new Date(), -50));
}
if (null == data.getFullWeightTime()) {
- data.setFullWeightTime(DateUtil.getNewByMinute(new Date(), -10));
+ data.setFullWeightTime(DateUtils.addMinutes(new Date(), -10));
+ }
+ if (data.getCompleteTime().before(data.getFullWeightTime())) {
+ data.setFullWeightTime(DateUtils.addMinutes(data.getCompleteTime(), -10));
+ }
+ if (data.getFullWeightTime().before(data.getEmptyWeightTime())) {
+ data.setEmptyWeightTime(DateUtils.addMinutes(data.getEmptyWeightTime(), -40));
+ }
+ if (data.getEmptyWeightTime().before(data.getRegisterTime())) {
+ data.setRegisterTime(DateUtils.addMinutes(data.getFullWeightTime(), -30));
}
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index 7d975d0..2037a4d 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -659,7 +659,7 @@
data.setCompanyId(ContextUtil.getCompanyId());
}
if (StringUtils.isEmpty(data.getDeptId())) {
- data.setCompanyId(ContextUtil.subDeptId(null));
+ data.setDeptId(ContextUtil.subDeptId(null));
}
inoutCheckMapper.updateSampleData(data);
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 2470036..671280d 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
@@ -87,10 +87,5 @@
@PropertyDef(label = "鏇存柊鏃堕棿")
@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/oa/service/HDeptDeviceService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
index 25e52fa..16c11a5 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
@@ -1,13 +1,16 @@
package com.ld.igds.oa.service;
+import com.bstek.bdf2.core.model.DefaultDept;
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.sys.service.SysDeptService;
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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -23,6 +26,10 @@
*/
@Component
public class HDeptDeviceService extends HibernateDao {
+
+ @Autowired
+ private SysDeptService sysDeptService;
+
//=====================================搴撳尯璁惧=======================================//
public void pageData(Page<DeptDevice> page, Map<String, Object> param)
@@ -47,24 +54,19 @@
Session session = this.getSessionFactory().openSession();
try {
- data.setCompanyId(ContextUtil.getCompanyId());
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getKqdm())) {
+ data.setKqdm(ContextUtil.subDeptId(null));
+ }
+ DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
+ data.setKqmc(dept.getName());
data.setUpdateTime(new Date());
if (null == data.getId()) {
data.setId(ContextUtil.getUUID());
}
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();
@@ -122,7 +124,14 @@
Session session = this.getSessionFactory().openSession();
try {
- data.setCompanyId(ContextUtil.getCompanyId());
+ if (null == data.getCompanyId()) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getKqdm())) {
+ data.setKqdm(ContextUtil.subDeptId(null));
+ }
+ DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
+ data.setKqmc(dept.getName());
data.setZhgxsj(new Date());
if (null == data.getId()) {
data.setId(ContextUtil.getUUID());
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 4568e99..8e6f18f 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
@@ -403,13 +403,21 @@
return;
}else{
//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�
-var mainData = view.get("#dsMain.data:#");
-var fileId = arg.returnValue;
-var files = view.get("#dsMain.data:#").get("fileData");
-files.insert({fileId:fileId,fileName:arg.file.name,createTime:new Date()});
+ var mainData = view.get("#dsMain.data:#");
+ var fileId = arg.returnValue;
+ if(fileId){
+ var files = view.get("#dsMain.data:#").get("fileData");files.insert({fileId:fileId,fileName:arg.file.name,createTime:new Date()});
+ }
}
</ClientEvent>
- <Property name="fileResolver">applyOrderUploadProcessor#uploadApplyOrderFile</Property>
+ <ClientEvent name="beforeFileUploaded">var files = view.get("#dsMain.data:#").get("fileData");
+var mark = "UPLOAD";
+if(files.entityCount > 0){
+ mark = "NO_UPLOAD";
+}
+self.set("parameter",{mark: mark})
+</ClientEvent>
+ <Property name="fileResolver">oaPR#uploadFile</Property>
<Property name="maxFileSize">50MB</Property>
<Property name="successMessage">闄勪欢涓婁紶鎴愬姛锛侊紒</Property>
<Filters/>
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 71d6772..c34851b 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
@@ -128,10 +128,11 @@
<PropertyDef name="kqdm">
<Property></Property>
<Property name="label">搴撳尯浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="kqmc">
- <Property></Property>
- <Property name="label">搴撳尯鍚嶇О</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="dwdm">
<Property></Property>
@@ -153,9 +154,18 @@
<Property></Property>
<Property name="label">妫�瀹氬崟浣�</Property>
</PropertyDef>
+ <PropertyDef name="jdjg">
+ <Property></Property>
+ <Property name="label">妫�瀹氱粨鏋�</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property></Property>
+ <Property name="label">澶囨敞</Property>
+ </PropertyDef>
<PropertyDef name="zhgxsj">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
</Model>
@@ -173,6 +183,7 @@
<DataSet id="dsCheck">
<Property name="dataType">[dtCheck]</Property>
<Property name="dataProvider">deptDevicePR#pageCheck</Property>
+ <Property name="pageSize">15</Property>
</DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
@@ -212,12 +223,14 @@
</Button>
<Button layoutConstraint="right">
<ClientEvent name="onClick">//鏄剧ず璁板綍
-view.get("#iFrame").reload();
+var entity = view.get("#dsMain.data:#");
+var code = entity.get("sbbh");
+view.get("#dsCheck").set("parameter",{code:code}).flushAsync();
view.get("#dialogCheck").show();</ClientEvent>
<Property name="caption">鏌ョ湅妫�淇褰�</Property>
<Property name="exClassName">btn-flush</Property>
<Property name="iconClass">fa fa-bars</Property>
- <Property name="visible">false</Property>
+ <Property name="visible">true</Property>
</Button>
</Container>
<Container layout="regionPadding:10" layoutConstraint="center">
@@ -373,16 +386,6 @@
<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/>
@@ -441,25 +444,11 @@
</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">
+ <Dialog id="dialogCheck" layout="regionPadding:10">
<Property name="width">90%</Property>
<Property name="height">90%</Property>
+ <Property name="caption">璁惧妫�淇褰�</Property>
+ <Property name="closeable">false</Property>
<Buttons>
<Button layoutConstraint="center">
<ClientEvent name="onClick">self.get("parent").hide();</ClientEvent>
@@ -468,14 +457,30 @@
</Button>
</Buttons>
<Children>
- <Container>
- <Button>
- <ClientEvent name="onClick">view.get("#dsMain").insert();</ClientEvent>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#")
+view.get("#dsCheck").insert({
+ sbbh:data.get("sbbh"),
+ kqdm:data.get("kqdm"),
+ kqmc:data.get("kqmc"),
+ sbyqmc:data.get("sbyqmc"),
+ sbyqdm:data.get("sbyqdm")
+});
+view.get("#addCheck").show();</ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn-normal</Property>
<Property name="iconClass">fa fa-plus</Property>
</Button>
- <Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var dialog= view.get("#addCheck");
+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("#dsCheck.data:#");
if(!cur) return;
view.get("#ajaxDelCheck").set("parameter",cur).execute(function(result){
@@ -491,41 +496,175 @@
<Property name="iconClass">fa fa-trash-o</Property>
</Button>
</Container>
- <Container>
+ <Container layout="regionPadding:10" layoutConstraint="center">
+ <Property name="exClassName">bg-color</Property>
<DataGrid id="dgCheck">
+ <ClientEvent name="onDataRowDoubleClick">var dialog= view.get("#addCheck");
+dialog.show();</ClientEvent>
<Property name="dataSet">dsCheck</Property>
<Property name="readOnly">true</Property>
+ <RowNumColumn/>
<DataColumn name="sbbh">
<Property name="property">sbbh</Property>
+ <Property name="align">center</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>
+ <Property name="align">center</Property>
+ <Property name="width">260</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="jdjg">
+ <Property name="property">jdjg</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="remark">
+ <Property name="property">remark</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">dsCheck</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
</Container>
</Children>
<Tools/>
</Dialog>
+ <Dialog id="addCheck">
+ <Property name="closeable">false</Property>
+ <Property name="caption">妫�淇褰曚俊鎭�</Property>
+ <Property name="width">60%</Property>
+ <Property name="iconClass">fa fa-tasks</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">view.get("#ajaxSave").execute(function(result){
+ if(result){
+ $alert(result);
+ }else{
+ $notify("淇濆瓨鎴愬姛锛侊紒");
+ view.get("#addCheck").hide();
+ }
+});</ClientEvent>
+ <Property name="caption">纭畾</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsCheck.data:#").cancel();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsCheck</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">150</Property>
+ <AutoFormElement>
+ <Property name="name">sbbh</Property>
+ <Property name="property">sbbh</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sbyqmc</Property>
+ <Property name="property">sbyqmc</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sbyqdm</Property>
+ <Property name="property">sbyqdm</Property>
+ <Property name="readOnly">true</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>
+ <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>
+ </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>
+ <UpdateAction id="ajaxSave">
+ <Property name="dataResolver">deptDevicePR#saveCheck</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsCheck</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>
+ <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 26473c3..ebb442d 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
@@ -1,10 +1,14 @@
package com.ld.igds.oa.view;
+import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.bstek.dorado.uploader.UploadFile;
+import com.bstek.dorado.uploader.annotation.FileResolver;
import com.ld.igds.file.CoreFileService;
import com.ld.igds.models.*;
@@ -209,6 +213,39 @@
return service.delArchives(data);
}
+ /**
+ * oaPR#uploadFile
+ *
+ * @param file
+ * @param parameter
+ * @return fileId 鏂版枃浠禝D鍖呭惈鏂囦欢鍚庣紑
+ */
+ @FileResolver
+ public String uploadFile(UploadFile file, Map<String, Object> parameter) {
+ String fileId = null;
+ String mark = (String) parameter.get("mark");
+ if ("NO_UPLOAD".equals(mark)) {
+ return null;
+ }
+ try {
+
+ String basePath = fileService.getCommonFilePath(null);
+
+ fileId = ContextUtil.getTimeId(1000)
+ + file.getFileName().substring(
+ file.getFileName().lastIndexOf("."));
+
+ file.transferTo(new File(basePath + fileId));
+
+ } catch (IllegalStateException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return fileId;
+ }
+
// =====================璧勪骇绠＄悊=====================//
/**
--
Gitblit v1.9.3