From ea1a4b7994b0d9710c47cbb54b7824a9f4bd72c9 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期五, 27 三月 2026 17:02:33 +0800
Subject: [PATCH] fix(EmpContractInfo): 修正导入合同信息的循环缩进并添加结束日期差值计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
index c9dc9e8..c159ef0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java
@@ -103,6 +103,7 @@
" UPDATE t_emp_baseinfo SET \n" +
" deptId = #{mapParams.deptId},\n" +
" deptName = #{mapParams.deptName},\n" +
+ " allDeptName = #{mapParams.allDeptName},\n" +
" jobId = #{mapParams.jobId},\n" +
" jobName = #{mapParams.jobName},\n" +
" modifyTime = NOW(),\n" +
@@ -206,7 +207,32 @@
@SqlParser(filter=true)
IPage<EmpBaseInfo> clbaseInfoList(@Param("page")Page<EmpBaseInfo> page,@Param("index") String index,@Param("btime") String btime,@Param("etime") String etime,@Param("name") String name,@Param("manOld") String manOld,@Param("womanOld") String womanOld,@Param("list") List<String> lists);
+ @Update("<script> " +
+ " UPDATE t_emp_baseinfo SET seniority = CONCAT(FLOOR(TimeStampDiff(MONTH, entryDate, NOW()) / 12), '年',MOD(TimeStampDiff(MONTH, entryDate, NOW()),12),'月'),\n" +
+ " modifyTime = NOW() \n" +
+ " WHERE empStatus =0; \n" +
+ "</script>")
+ int updateSeniority();
+ @Update("<script> " +
+ " update t_emp_baseinfo set deptName=(select DEPT_NAME from t_dept where DEPT_ID=deptId), \n" +
+ " allDeptName=(select allDeptName from t_dept where DEPT_ID=deptId), \n" +
+ " modifyTime=now(); \n" +
+ "</script>")
+ int updateDeptName();
+
+ @Update("<script> " +
+ " update t_emp_baseinfo set retirementReminded=#{retirementReminded}, \n" +
+ " modifier=#{operatorId}, \n" +
+ " modifyTime=now() where empId=#{empId}; \n" +
+ "</script>")
+ int updateRetirementReminded(@Param("empId") String empId,@Param("retirementReminded") String retirementReminded,@Param("operatorId") String operatorId);
-
+ /**
+ * 通用提醒统计方法
+ *
+ * @param queryWrapper 查询条件封装对象
+ * @return 符合查询条件的提醒记录总数
+ */
+ Long selectAlertCount(@Param(Constants.WRAPPER) QueryWrapper<EmpBaseInfo> queryWrapper);
}
\ No newline at end of file
--
Gitblit v1.8.0