Commit 1b86f533 authored by 赵啸非's avatar 赵啸非

修改考勤绩效记录汇总

parent 2b127e5e
......@@ -92,8 +92,6 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
@Autowired
private AttendanceGroupService groupService;
@Autowired
private AttendanceClassService classService;
@Autowired
private AttendanceClassDetailService classDetailService;
@Autowired
private AttendanceGroupFixedworkService fixedworkService;
......
......@@ -54,8 +54,6 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
@Slf4j
@RequestMapping("/api/v1/perform")
public class PerformApiController extends AbstractBaseController<PerformReq> {
@Autowired
private CheckAttendRecordService checkAttendRecordService;
@Autowired
......@@ -70,10 +68,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
private CheckOtherRecordService checkOtherRecordService;
@Autowired
private CheckAllRecordService checkAllRecordService;
@Autowired
private PerformAttendAppealService appealService;
@Autowired
private CheckAllRecordDao checkAllRecordDao;
@Autowired
......@@ -81,7 +77,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
@Autowired
private PerformRulesService rulesService;
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
......@@ -405,28 +400,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
}
}
private void updateAppealResult(PerformInfo performInfo, List<PerformAttendAppealEntity> list) {
if (!ObjectUtils.isEmpty(list)) {
for (PerformAttendAppealEntity entity : list) {
if (ObjectUtils.isEmpty(entity.getAppealResult())) {
performInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
} else {
if (AppealResultEnum.通过.getValue() == entity.getAppealResult()) {
performInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
} else if (AppealResultEnum.不通过.getValue() == entity.getAppealResult()) {
performInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
} else {
performInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
}
}
}
} else {
performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
}
}
/**
* 详细
*/
......
......@@ -45,7 +45,7 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
Thread sendThread = new Thread(new Runnable() {
@Override
public void run() {
int waitTime = 1000;
int waitTime = 50;
while (!stopped) {
try {
StaffCheckSummaryQuery query = cacheService.brpop(KEY_CHECK_SUMMARY_CACHE,60, StaffCheckSummaryQuery.class);
......
......@@ -38,7 +38,7 @@ Content-Type: application/json
{
"attendanceDateStart":"2024-02-01",
"attendanceDateEnd":"2024-02-02"
"attendanceDateEnd":"2024-02-29"
}
###海康考勤打卡记录计算1
......@@ -81,6 +81,13 @@ Content-Type: application/json
{"summaryTimeStart":"2024-03-15","summaryTimeEnd":"2024-03-15"}
###绩效汇总计算
POST {{baseUrl}}/staff/perform/summary/summary
Content-Type: application/json
{"checkTimeStart":"2024-02-01","checkTimeEnd":"2024-02-29"}
###考勤打卡记录异常信息列表
POST {{baseUrl}}/attendance/record/error/doReprocess
Content-Type: application/json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment