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
9770d1ee
Commit
9770d1ee
authored
Aug 09, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改固定班次考勤
parent
abff457e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
52 additions
and
0 deletions
+52
-0
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java
...odule/attendance/web/AttendanceRecordErrorController.java
+52
-0
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java
View file @
9770d1ee
...
@@ -10,7 +10,11 @@ import com.mortals.framework.service.IUser;
...
@@ -10,7 +10,11 @@ import com.mortals.framework.service.IUser;
import
com.mortals.framework.util.DateUtils
;
import
com.mortals.framework.util.DateUtils
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.framework.web.BaseCRUDJsonBodyMappingController
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
com.mortals.xhx.busiz.h5.req.AttendSaveReq
;
import
com.mortals.xhx.busiz.h5.web.ApiWebPerformController
;
import
com.mortals.xhx.common.code.ErrorStatusEnum
;
import
com.mortals.xhx.common.code.ErrorStatusEnum
;
import
com.mortals.xhx.common.code.ProcessStatusEnum
;
import
com.mortals.xhx.common.code.YesNoEnum
;
import
com.mortals.xhx.module.attendance.model.*
;
import
com.mortals.xhx.module.attendance.model.*
;
import
com.mortals.xhx.module.attendance.service.*
;
import
com.mortals.xhx.module.attendance.service.*
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
import
com.mortals.xhx.module.dept.model.DeptQuery
;
...
@@ -72,6 +76,8 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
...
@@ -72,6 +76,8 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
@Autowired
@Autowired
private
AttendanceRecordErrorService
errorService
;
private
AttendanceRecordErrorService
errorService
;
@Autowired
private
ApiWebPerformController
apiWebPerformController
;
public
AttendanceRecordErrorController
()
{
public
AttendanceRecordErrorController
()
{
super
.
setModuleDesc
(
"考勤打卡记录异常信息"
);
super
.
setModuleDesc
(
"考勤打卡记录异常信息"
);
...
@@ -137,6 +143,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
...
@@ -137,6 +143,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
for
(
AttendanceRecordErrorEntity
recordErrorEntity
:
entity
.
getRecordErrorEntities
())
{
for
(
AttendanceRecordErrorEntity
recordErrorEntity
:
entity
.
getRecordErrorEntities
())
{
recordErrorEntity
.
setProcessStatus
(
entity
.
getProcessStatus
());
recordErrorEntity
.
setProcessStatus
(
entity
.
getProcessStatus
());
recordErrorEntity
.
setGoOffDateTime
(
null
);
recordErrorEntity
.
setProcessResult
(
entity
.
getProcessResult
());
recordErrorEntity
.
setProcessResult
(
entity
.
getProcessResult
());
recordErrorEntity
.
setOpertor
(
context
.
getUser
().
getRealName
());
recordErrorEntity
.
setOpertor
(
context
.
getUser
().
getRealName
());
recordErrorEntity
.
setOperDateTime
(
new
Date
());
recordErrorEntity
.
setOperDateTime
(
new
Date
());
...
@@ -209,6 +216,51 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
...
@@ -209,6 +216,51 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
super
.
saveBefore
(
entity
,
model
,
context
);
super
.
saveBefore
(
entity
,
model
,
context
);
}
}
@Override
protected
int
saveAfter
(
AttendanceRecordErrorEntity
entity
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
if
(
YesNoEnum
.
YES
.
getValue
()==
entity
.
getProcessStatus
()){
//已经处理,根据错误状态提交考勤绩效
String
ruleCode
=
""
;
if
(
ErrorStatusEnum
.
早退
.
getValue
()==
entity
.
getErrorStatus
()){
//判断时间差定义
//entity.getErrorStatus()
}
/* AttendSaveReq attendSaveReq = new AttendSaveReq();
attendSaveReq.setAttendanceGroupId(entity.getAttendanceGroupId());
attendSaveReq.setAttendanceGroupName(entity.getAttendanceGroupName());
attendSaveReq.setAttendanceDate(entity.getActualAttendanceDateTime());
attendSaveReq.setErrorTime(entity.getErrorDateTime());
attendSaveReq.setGoOffTimeStr(entity.getGoOrOff());
attendSaveReq.setActualAttendTime();
attendSaveReq.setErrorResult(entity.getRemark());
attendSaveReq.setExt();
attendSaveReq.setWorkNum();
attendSaveReq.setTitle();
attendSaveReq.setHappenTime(entity.getErrorDateTime());
attendSaveReq.setRuleCode(ruleCode);
attendSaveReq.setRuleId();
attendSaveReq.setPhone();
attendSaveReq.setPerformType();
attendSaveReq.setStaffId();*/
// apiWebPerformController.attendSave(attendSaveReq);
}
return
super
.
saveAfter
(
entity
,
model
,
context
);
}
@Override
@Override
protected
int
editAfter
(
Long
id
,
Map
<
String
,
Object
>
model
,
AttendanceRecordErrorEntity
entity
,
Context
context
)
throws
AppException
{
protected
int
editAfter
(
Long
id
,
Map
<
String
,
Object
>
model
,
AttendanceRecordErrorEntity
entity
,
Context
context
)
throws
AppException
{
this
.
addDict
(
model
,
"errorStatus"
,
paramService
.
getParamBySecondOrganize
(
"AttendanceRecordDetail"
,
"goWorkResult"
));
this
.
addDict
(
model
,
"errorStatus"
,
paramService
.
getParamBySecondOrganize
(
"AttendanceRecordDetail"
,
"goWorkResult"
));
...
...
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