From 52cf7583cff6a6871d54d5a2cae1aa2a3b6b5bbc Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 16 三月 2021 01:32:40 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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 db24bae..fd79767 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
@@ -2,7 +2,6 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
-import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.MyUtil;
@@ -150,9 +149,43 @@
if (StringUtils.isNotBlank(vo.getEntryType())) {
queryWrapper.in("a.entryType", vo.getEntryType().split(","));
}
+ queryWrapper.inSql("c.dept_Id", remoteDeptService.userRightDepts());
+ if (StrUtil.isNotBlank(vo.getFileName())){
+ queryWrapper.like("acc.filesName", vo.getFileName());
+ }
+ if (StrUtil.equals(vo.getField(),"empName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.empName");
+ }else{
+ queryWrapper.orderByAsc("a.empName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"empNumb")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.empNumb");
+ }else{
+ queryWrapper.orderByAsc("a.empNumb");
+ }
+ }else if(StrUtil.equals(vo.getField(),"deptName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("deptName");
+ }else{
+ queryWrapper.orderByAsc("deptName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"jobName")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.jobName");
+ }else{
+ queryWrapper.orderByAsc("a.jobName");
+ }
+ }else if(StrUtil.equals(vo.getField(),"certificateNumb")){
+ if (StrUtil.equals(vo.getOrder(),"descending")){
+ queryWrapper.orderByDesc("a.certificateNumb");
+ }else{
+ queryWrapper.orderByAsc("a.certificateNumb");
+ }
+ }
- queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
- queryWrapper.orderByAsc("a.deptName,a.empName");
+ queryWrapper.groupBy(" a.delFlag,a.empName,a.empStatus,a.empId,a.certificateNumb,a.empNumb,deptName,a.jobName");
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
// String querySql = empAccessoryMapper.getQuerySql();
//List<Label> labelList = labelService.findLabels(new Label());
@@ -249,7 +282,7 @@
if (fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() == 0) {
fileName.add(accessory.getFilesname());
} else {
- fileName.add(accessory.getFilesname() + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count() + 1);
+ fileName.add(accessory.getFilesname().substring(0,accessory.getFilesname().indexOf(".")) + fileName.parallelStream().filter(filter -> StrUtil.equals(accessory.getFilesname(), filter)).count()+"."+accessory.getFilesformat());
}
});
MyUtil.download(request, response, files, fileName);
@@ -346,7 +379,7 @@
}else if (file1.getName().indexOf("证")>=0){
accessory.setLabelid(143073812170753L);
}else{
- accessory.setLabelid(142445180372993L);
+ accessory.setLabelid(143073866696705L);
}
accessory.setCreatetime(new Date());
--
Gitblit v1.8.0