Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
e6aa3b6b
Commit
e6aa3b6b
authored
Apr 16, 2023
by
daijunxiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
定时任务考勤汇总新增关联
parent
3f78af01
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
57 additions
and
19 deletions
+57
-19
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceRecordDao.java
...ortals/xhx/module/attendance/dao/AttendanceRecordDao.java
+5
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceRecordDetailDao.java
.../xhx/module/attendance/dao/AttendanceRecordDetailDao.java
+7
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceRecordErrorDao.java
...s/xhx/module/attendance/dao/AttendanceRecordErrorDao.java
+6
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceRecordDaoImpl.java
...module/attendance/dao/ibatis/AttendanceRecordDaoImpl.java
+6
-5
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceRecordDetailDaoImpl.java
.../attendance/dao/ibatis/AttendanceRecordDetailDaoImpl.java
+6
-5
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceRecordErrorDaoImpl.java
...e/attendance/dao/ibatis/AttendanceRecordErrorDaoImpl.java
+6
-5
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordDetailMapper.xml
...sqlmap/module/attendance/AttendanceRecordDetailMapper.xml
+3
-0
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordErrorMapper.xml
.../sqlmap/module/attendance/AttendanceRecordErrorMapper.xml
+3
-0
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordMapper.xml
...urces/sqlmap/module/attendance/AttendanceRecordMapper.xml
+3
-0
db/menu.sql
db/menu.sql
+12
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceRecordDao.java
View file @
e6aa3b6b
...
@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
...
@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
import
com.mortals.framework.dao.ICRUDDao
;
import
com.mortals.framework.dao.ICRUDDao
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordEntity
;
import
java.util.List
;
/**
/**
* 考勤打卡记录信息Dao
* 考勤打卡记录信息Dao
* 考勤打卡记录信息 DAO接口
* 考勤打卡记录信息 DAO接口
...
@@ -14,4 +13,9 @@ import java.util.List;
...
@@ -14,4 +13,9 @@ import java.util.List;
public
interface
AttendanceRecordDao
extends
ICRUDDao
<
AttendanceRecordEntity
,
Long
>{
public
interface
AttendanceRecordDao
extends
ICRUDDao
<
AttendanceRecordEntity
,
Long
>{
/**
* 获取打卡记录id
* */
AttendanceRecordEntity
getRecordId
(
Long
id
);
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceRecordDetailDao.java
View file @
e6aa3b6b
...
@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
...
@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
import
com.mortals.framework.dao.ICRUDDao
;
import
com.mortals.framework.dao.ICRUDDao
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity
;
import
java.util.List
;
/**
/**
* 考勤打卡记录详细信息Dao
* 考勤打卡记录详细信息Dao
* 考勤打卡记录详细信息 DAO接口
* 考勤打卡记录详细信息 DAO接口
...
@@ -14,4 +13,11 @@ import java.util.List;
...
@@ -14,4 +13,11 @@ import java.util.List;
public
interface
AttendanceRecordDetailDao
extends
ICRUDDao
<
AttendanceRecordDetailEntity
,
Long
>{
public
interface
AttendanceRecordDetailDao
extends
ICRUDDao
<
AttendanceRecordDetailEntity
,
Long
>{
/**
* 统计上班迟到
* */
int
goWorkCount
(
Long
id
);
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/AttendanceRecordErrorDao.java
View file @
e6aa3b6b
...
@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
...
@@ -2,7 +2,6 @@ package com.mortals.xhx.module.attendance.dao;
import
com.mortals.framework.dao.ICRUDDao
;
import
com.mortals.framework.dao.ICRUDDao
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity
;
import
java.util.List
;
/**
/**
* 考勤打卡记录异常信息Dao
* 考勤打卡记录异常信息Dao
* 考勤打卡记录异常信息 DAO接口
* 考勤打卡记录异常信息 DAO接口
...
@@ -14,4 +13,10 @@ import java.util.List;
...
@@ -14,4 +13,10 @@ import java.util.List;
public
interface
AttendanceRecordErrorDao
extends
ICRUDDao
<
AttendanceRecordErrorEntity
,
Long
>{
public
interface
AttendanceRecordErrorDao
extends
ICRUDDao
<
AttendanceRecordErrorEntity
,
Long
>{
/**
* 统计异常打卡
* */
int
errorAttendance
(
Long
id
);
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceRecordDaoImpl.java
View file @
e6aa3b6b
package
com.mortals.xhx.module.attendance.dao.ibatis
;
package
com.mortals.xhx.module.attendance.dao.ibatis
;
import
org.springframework.stereotype.Repository
;
import
com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis
;
import
com.mortals.xhx.module.attendance.dao.AttendanceRecordDao
;
import
com.mortals.xhx.module.attendance.dao.AttendanceRecordDao
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordEntity
;
import
java.util.Date
;
import
org.springframework.stereotype.Repository
;
import
com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis
;
import
java.util.List
;
/**
/**
* 考勤打卡记录信息DaoImpl DAO接口
* 考勤打卡记录信息DaoImpl DAO接口
*
*
...
@@ -17,5 +15,8 @@ import java.util.List;
...
@@ -17,5 +15,8 @@ import java.util.List;
public
class
AttendanceRecordDaoImpl
extends
BaseCRUDDaoMybatis
<
AttendanceRecordEntity
,
Long
>
implements
AttendanceRecordDao
{
public
class
AttendanceRecordDaoImpl
extends
BaseCRUDDaoMybatis
<
AttendanceRecordEntity
,
Long
>
implements
AttendanceRecordDao
{
@Override
public
AttendanceRecordEntity
getRecordId
(
Long
id
)
{
return
getSqlSession
().
selectOne
(
getSqlId
(
"getRecordId"
),
id
);
}
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceRecordDetailDaoImpl.java
View file @
e6aa3b6b
package
com.mortals.xhx.module.attendance.dao.ibatis
;
package
com.mortals.xhx.module.attendance.dao.ibatis
;
import
org.springframework.stereotype.Repository
;
import
com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis
;
import
com.mortals.xhx.module.attendance.dao.AttendanceRecordDetailDao
;
import
com.mortals.xhx.module.attendance.dao.AttendanceRecordDetailDao
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity
;
import
java.util.Date
;
import
org.springframework.stereotype.Repository
;
import
com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis
;
import
java.util.List
;
/**
/**
* 考勤打卡记录详细信息DaoImpl DAO接口
* 考勤打卡记录详细信息DaoImpl DAO接口
*
*
...
@@ -17,5 +15,8 @@ import java.util.List;
...
@@ -17,5 +15,8 @@ import java.util.List;
public
class
AttendanceRecordDetailDaoImpl
extends
BaseCRUDDaoMybatis
<
AttendanceRecordDetailEntity
,
Long
>
implements
AttendanceRecordDetailDao
{
public
class
AttendanceRecordDetailDaoImpl
extends
BaseCRUDDaoMybatis
<
AttendanceRecordDetailEntity
,
Long
>
implements
AttendanceRecordDetailDao
{
@Override
public
int
goWorkCount
(
Long
id
)
{
return
getSqlSession
().
selectOne
(
getSqlId
(
"goWorkCount"
),
id
);
}
}
}
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dao/ibatis/AttendanceRecordErrorDaoImpl.java
View file @
e6aa3b6b
package
com.mortals.xhx.module.attendance.dao.ibatis
;
package
com.mortals.xhx.module.attendance.dao.ibatis
;
import
org.springframework.stereotype.Repository
;
import
com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis
;
import
com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao
;
import
com.mortals.xhx.module.attendance.dao.AttendanceRecordErrorDao
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordErrorEntity
;
import
java.util.Date
;
import
org.springframework.stereotype.Repository
;
import
com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis
;
import
java.util.List
;
/**
/**
* 考勤打卡记录异常信息DaoImpl DAO接口
* 考勤打卡记录异常信息DaoImpl DAO接口
*
*
...
@@ -17,5 +15,8 @@ import java.util.List;
...
@@ -17,5 +15,8 @@ import java.util.List;
public
class
AttendanceRecordErrorDaoImpl
extends
BaseCRUDDaoMybatis
<
AttendanceRecordErrorEntity
,
Long
>
implements
AttendanceRecordErrorDao
{
public
class
AttendanceRecordErrorDaoImpl
extends
BaseCRUDDaoMybatis
<
AttendanceRecordErrorEntity
,
Long
>
implements
AttendanceRecordErrorDao
{
@Override
public
int
errorAttendance
(
Long
id
)
{
return
getSqlSession
().
selectOne
(
getSqlId
(
"errorAttendance"
),
id
);
}
}
}
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordDetailMapper.xml
View file @
e6aa3b6b
...
@@ -822,4 +822,7 @@
...
@@ -822,4 +822,7 @@
</trim>
</trim>
</if>
</if>
</sql>
</sql>
<select
id=
"goWorkCount"
resultType=
"integer"
>
select count(1) count from mortals_xhx_attendance_record_detail where staffid =# {id} and goWorkResult = 4
</select>
</mapper>
</mapper>
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordErrorMapper.xml
View file @
e6aa3b6b
...
@@ -1278,4 +1278,7 @@
...
@@ -1278,4 +1278,7 @@
</trim>
</trim>
</if>
</if>
</sql>
</sql>
<select
id=
"errorAttendance"
resultType=
"integer"
>
select count(1) count from mortals_xhx_attendance_record_error where staffId =#{id} group by errorStatus
</select>
</mapper>
</mapper>
\ No newline at end of file
attendance-performance-manager/src/main/resources/sqlmap/module/attendance/AttendanceRecordMapper.xml
View file @
e6aa3b6b
...
@@ -1018,4 +1018,7 @@
...
@@ -1018,4 +1018,7 @@
</trim>
</trim>
</if>
</if>
</sql>
</sql>
<select
id=
"getRecordId"
resultType=
"com.mortals.xhx.module.attendance.model.AttendanceRecordEntity"
>
select id from mortals_xhx_attendance_record where staffId =#{id}
</select>
</mapper>
</mapper>
db/menu.sql
View file @
e6aa3b6b
...
@@ -283,6 +283,17 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRe
...
@@ -283,6 +283,17 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceLeaveRe
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'8'
,
'例假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'8'
,
'例假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'9'
,
'哺乳假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'9'
,
'哺乳假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'10'
,
'丧假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'10'
,
'丧假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'11'
,
'回单位'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'12'
,
'因公请假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'13'
,
'外出勘验'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'14'
,
'值班补班'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'15'
,
'体检'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'16'
,
'隔离'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'17'
,
'因公外出'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'18'
,
'公休'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'19'
,
'育儿假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'20'
,
'调回单位'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceLeaveRecord'
,
'leaveType'
,
'21'
,
'探亲假'
,
1
,
4
,
0
,
'leaveType'
,
NULL
,
NULL
,
NULL
);
-- ----------------------------
-- ----------------------------
-- 员工假期余额信息菜单 SQL
-- 员工假期余额信息菜单 SQL
-- ----------------------------
-- ----------------------------
...
@@ -558,4 +569,4 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio
...
@@ -558,4 +569,4 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '请假类型', 'AttendanceVacatio
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceVacationRecord'
,
'type'
,
'20'
,
'调回单位'
,
1
,
4
,
0
,
'type'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceVacationRecord'
,
'type'
,
'20'
,
'调回单位'
,
1
,
4
,
0
,
'type'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceVacationRecord'
,
'type'
,
'21'
,
'探亲假'
,
1
,
4
,
0
,
'type'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'请假类型'
,
'AttendanceVacationRecord'
,
'type'
,
'21'
,
'探亲假'
,
1
,
4
,
0
,
'type'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'增减类型'
,
'AttendanceVacationRecord'
,
'subAddType'
,
'1'
,
'增加'
,
1
,
4
,
0
,
'subAddType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'增减类型'
,
'AttendanceVacationRecord'
,
'subAddType'
,
'1'
,
'增加'
,
1
,
4
,
0
,
'subAddType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'增减类型'
,
'AttendanceVacationRecord'
,
'subAddType'
,
'2'
,
'扣除'
,
1
,
4
,
0
,
'subAddType'
,
NULL
,
NULL
,
NULL
);
INSERT
INTO
`mortals_xhx_param`
VALUES
(
null
,
'增减类型'
,
'AttendanceVacationRecord'
,
'subAddType'
,
'2'
,
'扣除'
,
1
,
4
,
0
,
'subAddType'
,
NULL
,
NULL
,
NULL
);
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment