From 4e48571d3217113f441567b9417d81b3933b0684 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 09:37:16 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 69 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 25 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 156dbcb..51a63f9 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
@@ -22,6 +22,8 @@
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.aspectj.weaver.ast.Or;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +43,7 @@
import java.io.File;
import java.io.IOException;
import java.util.*;
+import java.util.logging.Logger;
/**
* 附件管理 Service实现
@@ -51,14 +54,13 @@
@Service
@RequiredArgsConstructor
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true)
+@Slf4j
public class EmpAccessoryServiceImpl extends ServiceImpl<EmpAccessoryMapper, EmpAccessory> implements IEmpAccessoryService {
private final ILabelService labelService;
private final EmpAccessoryMapper empAccessoryMapper;
private final FebsServerHrProperties properties;
private final IRemoteDeptService remoteDeptService;
- private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
- .map(u -> u.getUserId().toString())
- .orElse("1");
+
private final IEmpBaseInfoService empBaseInfoService;
/**
* 参数2为数据中心ID 参数1为终端ID
@@ -90,18 +92,7 @@
if (StrUtil.isNotBlank(vo.getDeptName())) {
queryWrapper.like("a.deptName", vo.getDeptName());
}
- // if (StrUtil.isNotBlank(vo.getEmpName())) {
- // queryWrapper.like("a.empName", vo.getEmpName().split(","));
- // }
- // if (StrUtil.isNotBlank(vo.getEmpNumb())) {
- // queryWrapper.like("a.empNumb", vo.getEmpNumb().split(","));
- // }
- // if (StrUtil.isNotBlank(vo.getCertificateNumb())) {
- // queryWrapper.like("a.certificateNumb", vo.getCertificateNumb().split(","));
- // }
- // if (StrUtil.isNotBlank(vo.getDeptName())) {
- // queryWrapper.like("a.deptName", vo.getDeptName().split(","));
- // }
+
if (StrUtil.isNotBlank(vo.getEntryDate())) {
queryWrapper.between("a.entryDate", vo.getEntryDate().split(",")[0], vo.getEntryDate().split(",")[1]);
}
@@ -150,12 +141,29 @@
if (StrUtil.isNotBlank(vo.getPolitics())) {
queryWrapper.in("a.politics", vo.getPolitics().split(","));
}
+ if (StringUtils.isNotBlank(vo.getHandbookStatus())) {
+ queryWrapper.in("a.HandbookStatus", vo.getHandbookStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(vo.getEmpCardStatus())) {
+ queryWrapper.in("a.EmpCardStatus", vo.getEmpCardStatus().split(","));
+ }
+ if (StringUtils.isNotBlank(vo.getEmpType())) {
+ queryWrapper.in("a.empType", vo.getEmpType().split(","));
+ }
+ if (StringUtils.isNotBlank(vo.getEntryType())) {
+ queryWrapper.in("a.entryType", vo.getEntryType().split(","));
+ }
queryWrapper.in("c.dept_Id", remoteDeptService.userRightDepts().split(StringConstant.COMMA));
queryWrapper.orderByAsc("a.deptName,a.empName,a.certificateNumb");
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
- String querySql = empAccessoryMapper.getQuerySql();
- IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper, querySql);
+ // String querySql = empAccessoryMapper.getQuerySql();
+ //List<Label> labelList = labelService.findLabels(new Label());
+ IPage<Map<String, Object>> mapIPage = empAccessoryMapper.selectPageVo(page, queryWrapper);
+ mapIPage.getRecords().parallelStream().forEach(i->{
+ List<Map<String, Object>> mapList = this.baseMapper.getEmpAccessoryNumber((Long) i.get("empId"));
+ mapList.parallelStream().forEach(j->i.put(j.get("labelCode").toString(),Integer.parseInt(j.get("number").toString())));
+ });
return mapIPage;
}
@@ -183,7 +191,7 @@
Dict dict = MyUtil.filesUpload(file, properties.getUploadSinglePath() + nameAndCertificateNumb, snowflake.nextIdStr());
EmpAccessory accessory = new EmpAccessory();
accessory.setCreatetime(new Date());
- accessory.setCreator(operatorId);
+ accessory.setCreator(FebsUtil.getUserId());
accessory.setDelFlag(0);
accessory.setEmpid(empId);
accessory.setFilesaddress(dict.getStr("newName"));
@@ -191,7 +199,7 @@
accessory.setAccessoryid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
accessory.setFilesname(dict.getStr("fileName"));
accessory.setLabelid(labelid);
- accessory.setModifier(operatorId);
+ accessory.setModifier(FebsUtil.getUserId());
accessory.setModifytime(new Date());
accessory.setVersion(0);
this.save(accessory);
@@ -199,8 +207,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateEmpAccessory(EmpAccessory empAccessory) {
- this.saveOrUpdate(empAccessory);
+ public void updateEmpAccessory(EmpAccessory empAccessory) throws FebsException {
+ if ( empAccessory.getFilesname().indexOf(".")<=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));
+ this.update(wrapper);
}
@Override
@@ -210,7 +224,7 @@
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
wapper.set(EmpAccessory::getDelFlag, 1);
- wapper.set(EmpAccessory::getModifier, operatorId);
+ wapper.set(EmpAccessory::getModifier, FebsUtil.getUserId());
wapper.set(EmpAccessory::getModifytime, new Date());
this.update(wapper);
@@ -250,7 +264,7 @@
String[] arr = accessoryids.split(",");
LambdaUpdateWrapper<EmpAccessory> wapper = new LambdaUpdateWrapper<>();
wapper.in(EmpAccessory::getAccessoryid, arr);
- wapper.set(EmpAccessory::getModifier, operatorId);
+ wapper.set(EmpAccessory::getModifier, FebsUtil.getUserId());
wapper.set(EmpAccessory::getModifytime, new Date());
wapper.set(EmpAccessory::getLabelid, labelid);
this.update(wapper);
@@ -304,10 +318,13 @@
public void autoInstall(String fileids) {
File[] list = FileUtil.ls(fileids);
for (File file : list) {
-
String[] fileName = file.getName().split("_");
+ if (fileName.length<2){
+ log.error(file.getName());
+ continue;
+ }
List<EmpBaseInfo> empBaseInfo = empBaseInfoService.list(new LambdaQueryWrapper<EmpBaseInfo>().eq(EmpBaseInfo::getCertificateNumb, fileName[1]).ne(EmpBaseInfo::getDelFlag, 1));
- if (0 == empBaseInfo.size()) {
+ if (null == empBaseInfo ||0 == empBaseInfo.size()) {
continue;
}
File[] childlist = FileUtil.ls(fileids+"/"+file.getName());
@@ -323,6 +340,8 @@
accessory.setLabelid(143007818991617L);
}else if (file1.getName().indexOf("银行卡")>=0){
accessory.setLabelid(143073768130561L);
+ }else if (file1.getName().indexOf("回执")>=0){
+ accessory.setLabelid(143073617135617L);
}else if (file1.getName().indexOf("证")>=0){
accessory.setLabelid(143073812170753L);
}else{
--
Gitblit v1.8.0