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
4a00eed6
Commit
4a00eed6
authored
Dec 28, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加统计异常详细信息
parent
494272f1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
5 deletions
+35
-5
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceStaffStatVo.java
...xhx/module/attendance/model/vo/AttendanceStaffStatVo.java
+9
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStaffStatServiceImpl.java
...tendance/service/impl/AttendanceStaffStatServiceImpl.java
+7
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
...le/attendance/service/impl/AttendanceStatServiceImpl.java
+19
-4
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceStaffStatVo.java
View file @
4a00eed6
package
com.mortals.xhx.module.attendance.model.vo
;
import
com.mortals.framework.model.BaseEntityLong
;
import
com.mortals.xhx.module.attendance.model.AttendanceRecordDetailEntity
;
import
com.mortals.xhx.module.attendance.model.AttendanceStaffStatEntity
;
import
lombok.Data
;
import
java.util.ArrayList
;
import
java.util.List
;
/**
...
...
@@ -9,6 +12,12 @@ import java.util.List;
* @author zxfei
* @date 2023-04-08
*/
@Data
public
class
AttendanceStaffStatVo
extends
BaseEntityLong
{
/**
* 考勤打卡记录详细信息信息
*/
private
List
<
AttendanceRecordDetailEntity
>
attendanceRecordDetailList
=
new
ArrayList
<>();;
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStaffStatServiceImpl.java
View file @
4a00eed6
...
...
@@ -32,6 +32,12 @@ public class AttendanceStaffStatServiceImpl extends AbstractCRUDServiceImpl<Atte
if
(
StringUtils
.
isEmpty
(
params
.
getSummaryTimeStart
())||
StringUtils
.
isEmpty
(
params
.
getSummaryTimeEnd
())){
throw
new
AppException
(
"查询日期范围不能为空"
);
}
return
dao
.
getListExt
(
params
);
List
<
AttendanceStaffStatEntity
>
listExt
=
dao
.
getListExt
(
params
);
//构建异常信息 分日期 分人
return
listExt
;
}
}
\ No newline at end of file
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceStatServiceImpl.java
View file @
4a00eed6
package
com.mortals.xhx.module.attendance.service.impl
;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.Result
;
...
...
@@ -20,9 +21,7 @@ import com.mortals.xhx.module.attendance.model.vo.AttendanceSummaryQuery;
import
com.mortals.xhx.module.attendance.model.vo.ErrorSummaryVo
;
import
com.mortals.xhx.module.attendance.model.vo.LeaveSummaryVo
;
import
com.mortals.xhx.module.attendance.model.vo.VacationBalanceSummaryVo
;
import
com.mortals.xhx.module.attendance.service.AttendanceLeaveRecordService
;
import
com.mortals.xhx.module.attendance.service.AttendanceRecordService
;
import
com.mortals.xhx.module.attendance.service.AttendanceStaffStatService
;
import
com.mortals.xhx.module.attendance.service.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.service.DeptService
;
import
com.mortals.xhx.module.holiday.model.HolidayEntity
;
...
...
@@ -39,7 +38,7 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.Context
;
import
com.mortals.xhx.module.attendance.dao.AttendanceStatDao
;
import
com.mortals.xhx.module.attendance.service.AttendanceStatService
;
import
org.springframework.util.ObjectUtils
;
import
java.math.BigDecimal
;
import
java.math.RoundingMode
;
...
...
@@ -71,6 +70,8 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
@Autowired
private
AttendanceRecordService
recordService
;
@Autowired
private
AttendanceRecordDetailService
attendanceRecordDetailService
;
@Autowired
private
AttendanceLeaveRecordService
leaveRecordService
;
...
...
@@ -275,6 +276,20 @@ public class AttendanceStatServiceImpl extends AbstractCRUDServiceImpl<Attendanc
staffStat
.
initAttrValue
();
BeanUtils
.
copyProperties
(
item
,
staffStat
,
BeanUtil
.
getNullPropertyNames
(
item
));
staffStat
.
setAttendanceSummary
(
attendanceSummary
);
if
(!
ObjectUtils
.
isEmpty
(
attendanceSummary
))
{
//todo 保存详细json信息到remark
AttendanceRecordDetailQuery
detailQuery
=
new
AttendanceRecordDetailQuery
();
detailQuery
.
setStaffId
(
staffStat
.
getStaffId
());
//格式化年月日
String
date
=
staffStat
.
getYear
()
+
"-"
+
StrUtil
.
padPre
(
staffStat
.
getMonth
()
+
""
,
2
,
"0"
)
+
StrUtil
.
padPre
(
staffStat
.
getDay
()
+
""
,
2
,
"0"
);
detailQuery
.
setCreateTimeStart
(
date
);
detailQuery
.
setCreateTimeEnd
(
date
);
List
<
AttendanceRecordDetailEntity
>
detailEntities
=
attendanceRecordDetailService
.
find
(
detailQuery
);
if
(!
ObjectUtils
.
isEmpty
(
detailEntities
))
{
staffStat
.
setRemark
(
JSON
.
toJSONString
(
detailEntities
));
}
}
AttendanceStaffStatEntity
staffStatTemp
=
attendanceStaffStatService
.
selectOne
(
new
AttendanceStaffStatQuery
().
staffId
(
item
.
getStaffId
()).
year
(
item
.
getYear
()).
month
(
item
.
getMonth
()).
day
(
item
.
getDay
()));
if
(
staffStatTemp
!=
null
)
{
staffStat
.
setId
(
staffStatTemp
.
getId
());
...
...
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