From 63c7e9d7051ed6742eb7334346a53376b0247c29 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 01 四月 2021 09:46:03 +0800
Subject: [PATCH] 删除
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
index fd79767..5588058 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java
@@ -238,12 +238,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updateEmpAccessory(EmpAccessory empAccessory) throws FebsException {
- if ( empAccessory.getFilesname().indexOf(".")<=0){
+ if ( empAccessory.getFilesname().lastIndexOf(".")<=0){
throw new FebsException("文件名格式错误");
}
LambdaUpdateWrapper<EmpAccessory> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(EmpAccessory::getAccessoryid,empAccessory.getAccessoryid())
- .set(EmpAccessory::getFilesname,empAccessory.getFilesname()).set(EmpAccessory::getFilesformat, empAccessory.getFilesname().substring( empAccessory.getFilesname().indexOf(".")+1));
+ .set(EmpAccessory::getFilesname,empAccessory.getFilesname()).set(EmpAccessory::getFilesformat, empAccessory.getFilesname().substring( empAccessory.getFilesname().lastIndexOf(".")+1));
this.update(wrapper);
}
@@ -282,7 +282,7 @@
if (fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() == 0) {
fileName.add(accessory.getFilesname());
} else {
- fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().indexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
+ fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().lastIndexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
}
});
MyUtil.download(request, response, files, fileName);
@@ -360,7 +360,7 @@
File[] childlist = FileUtil.ls(fileids+"/"+file.getName());
for (File file1 : childlist) {
EmpAccessory accessory = new EmpAccessory();
- if (file1.getName().indexOf("外皮")>=0){
+ if (file1.getName().indexOf("外皮")>=0||file1.getName().indexOf("外批")>=0){
accessory.setLabelid(142445285230593L);
}else if (file1.getName().indexOf("心电图")>=0){
accessory.setLabelid(142445218121729L);
@@ -387,8 +387,8 @@
accessory.setDelFlag(0);
accessory.setEmpid(empBaseInfo.get(0).getEmpId());
accessory.setFilesaddress(file1.getName());
- if (file1.getName().indexOf(".") > 0) {
- accessory.setFilesformat( file1.getName().substring(file1.getName().indexOf(".")+1));
+ if (file1.getName().lastIndexOf(".") > 0) {
+ accessory.setFilesformat( file1.getName().substring(file1.getName().lastIndexOf(".")+1));
}
accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
accessory.setFilesname(file1.getName());
--
Gitblit v1.8.0