From 78378b0b89cd550489e4187931055001dd0e745d Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 24 二月 2021 19:00:11 +0800
Subject: [PATCH] 新增附件管理
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/FebsConstant.java | 4 ++++
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml | 9 ++++++---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/MyUtil.java | 4 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java | 2 ++
febs-auth/src/main/java/cc/mrbird/febs/auth/configure/FebsAuthorizationServerConfigure.java | 1 -
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpAccessoryServiceImpl.java | 9 ++++++++-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/runner/StartedUpRunner.java | 7 ++++++-
8 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/febs-auth/src/main/java/cc/mrbird/febs/auth/configure/FebsAuthorizationServerConfigure.java b/febs-auth/src/main/java/cc/mrbird/febs/auth/configure/FebsAuthorizationServerConfigure.java
index ed116d8..90d618f 100644
--- a/febs-auth/src/main/java/cc/mrbird/febs/auth/configure/FebsAuthorizationServerConfigure.java
+++ b/febs-auth/src/main/java/cc/mrbird/febs/auth/configure/FebsAuthorizationServerConfigure.java
@@ -82,7 +82,6 @@
@Primary
public DefaultTokenServices defaultTokenServices() {
DefaultTokenServices tokenServices = new DefaultTokenServices();
-
tokenServices.setTokenStore(tokenStore());
tokenServices.setSupportRefreshToken(true);
tokenServices.setClientDetailsService(redisClientDetailsService);
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/FebsConstant.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/FebsConstant.java
index f43c65f..b2a3c0d 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/FebsConstant.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/constant/FebsConstant.java
@@ -7,6 +7,10 @@
*/
public interface FebsConstant {
+ Integer REDIS_PAST_DUE_DAY = 60 * 60 * 24;
+
+ Integer REDIS_PAST_DUE_HOUR = 60 * 24;
+
/**
* 排序规则：降序
*/
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/MyUtil.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/MyUtil.java
index 944c378..8e02eb9 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/MyUtil.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/utils/MyUtil.java
@@ -108,8 +108,8 @@
if (file.getSize() <= 0) {
throw new FebsException("上传的文件大小需要大于0kb");
}
- if (file.getSize() > 50 * 1024* 1024) {
- throw new FebsException("上传的文件大于50M");
+ if (file.getSize() > 200 * 1024* 1024) {
+ throw new FebsException("上传的文件大于200M");
}
if (!FileUtil.exist(uploadPpath)) {
FileUtil.mkdir(uploadPpath);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java
index 9504f77..a10d9f2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.java
@@ -21,7 +21,7 @@
public interface EmpAccessoryMapper extends BaseMapper<EmpAccessory> {
- @Select("${sql} ${ew.customSqlSegment}")
+
IPage<Map<String,Object>> selectPageVo(Page<?> page, @Param(Constants.WRAPPER) Wrapper wrapper, @Param("sql") String sql);
String getQuerySql();
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
index af49ff7..8885a7f 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpAccessoryMapper.xml
@@ -3,14 +3,17 @@
<mapper namespace="cc.mrbird.febs.server.hr.mapper.EmpAccessoryMapper">
<select id="getQuerySql" resultType="java.lang.String">
- select CONCAT('select a.delFlag,a.empName,a.empId,a.empNumb,a.age,a.archivesStatus,a.sex,a.insuranceType,a.politics,a.education,a.entryDate,a.certificateNumb,
- (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName,',(SELECT
+ select CONCAT(',',(SELECT
GROUP_CONCAT(DISTINCT
CONCAT(
'(SELECT COUNT(1) FROM t_emp_accessory accessory inner join t_label label where label.labelId=accessory.labelId and accessory.delFlag = 0 and label.delFlag = 0 and a.empId = accessory.empId and label.labelCode = ''',label.labelCode,''') AS ''',
label.labelCode, ''''
)
)
-FROM t_label label where label.delFlag = 0 order by label.sort),' from t_emp_baseinfo a') as querySql
+FROM t_label label where label.delFlag = 0 order by label.sort)) as querySql
+ </select>
+ <select id="selectPageVo" resultType="java.util.Map">
+ select a.delFlag,a.empName,a.empStatus,a.empId,a.empNumb,a.age,a.archivesStatus,a.sex,a.insuranceType,a.politics,a.education,a.entryDate,a.certificateNumb,
+ (select dept_Name from t_dept as dept where dept.dept_Id= a.deptId) as deptName,a.jobName ${sql} from t_emp_baseinfo a ${ew.customSqlSegment}
</select>
</mapper>
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/runner/StartedUpRunner.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/runner/StartedUpRunner.java
index 0fe3676..ced826c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/runner/StartedUpRunner.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/runner/StartedUpRunner.java
@@ -1,6 +1,8 @@
package cc.mrbird.febs.server.hr.runner;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cc.mrbird.febs.server.hr.properties.FebsServerHrProperties;
+import cn.hutool.core.io.FileUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -17,11 +19,14 @@
private final ConfigurableApplicationContext context;
private final Environment environment;
-
+ private final FebsServerHrProperties properties;
@Override
public void run(ApplicationArguments args) {
if (context.isActive()) {
FebsUtil.printSystemUpBanner(environment);
}
+ if (! FileUtil.exist( properties.getEmpBaseInfoPath())){
+ FileUtil.mkdir( properties.getEmpBaseInfoPath());
+ }
}
}
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 5a8ebe4..2a4d082 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
@@ -21,6 +21,7 @@
import cn.hutool.core.util.ZipUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.aspectj.weaver.ast.Or;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.annotation.Propagation;
@@ -62,7 +63,10 @@
@Override
public IPage<Map<String, Object>> findEmpAccessorys(QueryRequest request, EmpAccessoryVO vo) {
- QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<EmpAccessoryVO> queryWrapper = new QueryWrapper<>();
+ if (StrUtil.isNotBlank(vo.getBasic())) {
+ queryWrapper.like("a.empNumb", vo.getBasic()).or().like("a.deptName", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.certificateNumb", vo.getBasic()).or().like("a.jobName", vo.getBasic());
+ }
if (StrUtil.isNotBlank(vo.getEmpName())) {
queryWrapper.like("a.empName", vo.getEmpName());
}
@@ -111,6 +115,9 @@
if (StrUtil.isNotBlank(vo.getPolitics())) {
queryWrapper.in("a.politics", vo.getPolitics());
}
+ if (StrUtil.isNotBlank(vo.getEmpStatus())) {
+ queryWrapper.in("a.empStatus", vo.getEmpStatus());
+ }
queryWrapper.eq("a.delFlag", 0);
Page<EmpAccessory> page = new Page<>(request.getPageNum(), request.getPageSize());
String querySql = empAccessoryMapper.getQuerySql();
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java
index 517d502..30b1aad 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/vo/EmpAccessoryVO.java
@@ -15,4 +15,6 @@
private String age;
private String archivesStatus;
private String insuranceType;
+ private String basic;
+ private String empStatus;
}
--
Gitblit v1.8.0