From bb3139e62038f3c165253cf5724325092966be78 Mon Sep 17 00:00:00 2001
From: 孔 <1124498879@qq.com>
Date: 星期三, 23 六月 2021 14:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 90648eb..3ec7dd9 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
@@ -207,7 +207,17 @@
@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();
}
\ No newline at end of file
--
Gitblit v1.8.0