From d9a1c41b0adb5ca2263348e1cc4e8b7bbdafc35d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 31 一月 2021 22:27:50 +0800
Subject: [PATCH] feat(人力资源微服务): 离职当月考勤基本增、删、改功能实现
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpBaseInfoMapper.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
index 7c86b27..93cdccf 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
@@ -74,9 +74,13 @@
@TableField("jobName")
private String jobName = "";
- @FieldInfo(name = "attendMonth", type = "tinyint", explain = "离职考勤月份")
+ @FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤月份")
@TableField("attendMonth")
- private Integer attendMonth = 0;
+ private String attendMonth = "";
+
+ @FieldInfo(name = "attendDays", type = "decimal", explain = "出勤天数")
+ @TableField("attendDays")
+ private BigDecimal attendDays = BigDecimal.ZERO;
@FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
@TableField("overtimeHour")
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 f854b29..ee67fa0 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
@@ -33,7 +33,7 @@
" modifyTime = NOW(),\n" +
" modifier = #{operatorId}, \n" +
" version = version+1 \n" +
- " WHERE badId IN \n" +
+ " WHERE empId IN \n" +
" <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
" #{delId} \n" +
" </foreach>\n" +
--
Gitblit v1.8.0