优化
This commit is contained in:
@ -1,7 +1,9 @@
|
||||
package com.ruoyi.web.controller.wgz;
|
||||
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.ruoyi.bgt.domain.BgtProjectRecruit;
|
||||
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
|
||||
import com.ruoyi.bgt.domain.dto.BgtAttendanceDetailDTO;
|
||||
@ -17,6 +19,7 @@
|
||||
import com.ruoyi.common.core.page.TableDataInfo;
|
||||
import com.ruoyi.common.domain.Annex;
|
||||
import com.ruoyi.common.domain.dto.AnnexDTO;
|
||||
import com.ruoyi.common.enums.RecruitApplyStatus;
|
||||
import com.ruoyi.common.service.IAnnexService;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.system.service.ISysDictTypeService;
|
||||
@ -324,6 +327,29 @@
|
||||
return AjaxResult.success(iWgzAttendanceService.userSubmitTheClock(req));
|
||||
}
|
||||
|
||||
@ApiOperation("【考勤打卡】【打卡】 获取打卡范围")
|
||||
//@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitTheClock')")
|
||||
@GetMapping("/WgzAppUserClockRange")
|
||||
public AjaxResult<WgzAppUserClockRangeRes> userClockRange() {
|
||||
|
||||
WgzAppUserClockRangeRes wgzAppUserClockRangeRes = new WgzAppUserClockRangeRes();
|
||||
//1、获取当前用户信息
|
||||
Long appUserId = SecurityUtils.getAppUserId();
|
||||
LambdaQueryWrapper<BgtProjectRecruitApply> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(BgtProjectRecruitApply::getUserId, appUserId).
|
||||
eq(BgtProjectRecruitApply::getStatus, RecruitApplyStatus.WORKING.getCode()); //包工头+务工者同意 or 进场 才算进场ok
|
||||
List<BgtProjectRecruitApply> bgtProjectRecruitApplies = iBgtProjectRecruitApplyService.list(lqw);
|
||||
if (CollectionUtil.isEmpty(bgtProjectRecruitApplies)) {
|
||||
return AjaxResult.success(wgzAppUserClockRangeRes);
|
||||
}
|
||||
//3、根据工地id得到完整的工地信息
|
||||
BgtProjectRecruit appById = iBgtProjectRecruitService.getById(bgtProjectRecruitApplies.get(0).getRecruitId());
|
||||
wgzAppUserClockRangeRes.setCentralLatitude(appById.getCentralLatitude());
|
||||
wgzAppUserClockRangeRes.setCentralLongitude(appById.getCentralLongitude());
|
||||
wgzAppUserClockRangeRes.setRangeRadius(appById.getRangeRadius());
|
||||
return AjaxResult.success(wgzAppUserClockRangeRes);
|
||||
}
|
||||
|
||||
/**
|
||||
* 【考勤打卡】【打卡日历】 打卡日历记录
|
||||
*/
|
||||
|
Reference in New Issue
Block a user