hbyt/evo-Financial-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整session过期时间, 处理生成考勤时, 离职员工不在生成问题, 优化请假管理

Browse Source
This commit is contained in:
andy 2025-08-11 08:30:16 +08:00
parent e9bae2626e
commit 8983c699ea
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evo-admin/src/main/java/com/evo/personnelMatters/service/impl/RzLeaveDetailServiceImpl.java
View File

@ -174,7 +174,7 @@ public class RzLeaveDetailServiceImpl extends ServiceImpl<RzLeaveDetailMapper, R
Long dayNum = DateUtils.getBetweenDays(firsDay,endDay)+1; Long dayNum = DateUtils.getBetweenDays(firsDay,endDay)+1;
List<String> dayList = Collections.emptyList(); List<String> dayList = Collections.emptyList();
for (int j = 0; j < dayNum; j++) { for (int j = 0; j < dayNum; j++) {
dayList.add(ymd.format(DateUtils.addDays(firsDay, j>0 ? 1 : 0))); dayList.add(ymd.format(DateUtils.addDays(firsDay, j)));
} }
List<String> holidays = Collections.emptyList(); List<String> holidays = Collections.emptyList();
if(ParamUtils.getLeaveTypeNotIncludedFaXiuAndPublicHoliday().contains(flag)){ if(ParamUtils.getLeaveTypeNotIncludedFaXiuAndPublicHoliday().contains(flag)){

2
evo-admin/src/main/resources/application.yml
View File

@ -68,7 +68,7 @@ token:
# 令牌密钥 # 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟） # 令牌有效期（默认30分钟）
expireTime: 480 expireTime: 540
# MyBatis配置 # MyBatis配置
mybatis-plus: mybatis-plus:

4
evo-admin/src/main/resources/mapper/system/SysStaffMapper.xml
View File

@ -257,9 +257,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 查询需要发放工资的员工信息 在职员工且入职时间在统计月或以前的或着在统计月离职的员工--> <!-- 查询需要发放工资的员工信息 在职员工且入职时间在统计月或以前的或着在统计月离职的员工-->
<select id="querySysStaffListOfMonth" resultMap="SysStaffResult"> <select id="querySysStaffListOfMonth" resultMap="SysStaffResult">
<include refid="selectSysStaffVo"/> <include refid="selectSysStaffVo"/>
where del_flag = '0' and DATE_FORMAT(employment_date, '%Y%m%d') &lt; DATE_FORMAT(#{emplDate} , '%Y%m%d') where del_flag = '0' and DATE_FORMAT(employment_date, '%Y%m%d') &lt; DATE_FORMAT(#{emplDate} , '%Y%m%d') and status != '-1'
and (status != '-1' or DATE_FORMAT(quit_date, '%Y%m%d') &gt; DATE_FORMAT(#{quitDate} , '%Y%m%d'))
</select> </select>
<!-- and (status != '-1' or DATE_FORMAT(quit_date, '%Y%m%d') &gt; DATE_FORMAT(#{quitDate} , '%Y%m%d')) -->
<!-- 根据部门查询在职且存在的员工 --> <!-- 根据部门查询在职且存在的员工 -->
<select id="queryysStaffByDeptId" parameterType="java.util.List" resultMap="SysStaffResult"> <select id="queryysStaffByDeptId" parameterType="java.util.List" resultMap="SysStaffResult">
<include refid="selectSysStaffVo"/> <include refid="selectSysStaffVo"/>