完成日报模块

This commit is contained in:
2025-02-20 10:41:00 +08:00
parent 2228f914db
commit d98028cf78
16 changed files with 247 additions and 38 deletions

View File

@ -1,8 +1,11 @@
package com.ruoyi.web.controller.wgz.controller;
import com.ruoyi.bgt.domain.BgtProjectRecruit;
import com.ruoyi.bgt.domain.BgtProjectRecruitApply;
import com.ruoyi.bgt.domain.dto.BgtProjectRecruitQueryDTO;
import com.ruoyi.bgt.domain.vo.BgtProjectRecruitVO;
import com.ruoyi.bgt.service.IBgtProjectRecruitApplyService;
import com.ruoyi.bgt.service.IBgtProjectRecruitService;
import com.ruoyi.common.bo.AnnexQueryBo;
import com.ruoyi.common.core.domain.AjaxResult;
@ -10,6 +13,7 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.domain.Annex;
import com.ruoyi.common.service.IAnnexService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.wgz.bo.res.*;
import com.ruoyi.wgz.bo.rests.WgzAppGetTestPaperThree;
@ -28,8 +32,12 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotNull;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* APP务工者Controller
@ -70,6 +78,9 @@ public class WgzAppController {
@Autowired
private IWgzLeaveService iWgzLeaveService;
@Autowired
private IBgtProjectRecruitApplyService iBgtProjectRecruitApplyService;
/**
* 【注册】务工者注册
@ -204,11 +215,41 @@ public class WgzAppController {
@ApiOperation("日报-日报日历")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyCalendar')")
@GetMapping("/WgzUserDailyCalendar")
public AjaxResult<WgzUserDailyCalendarRes> userDailyCalendar(@Validated WgzAppUserDailyCalendarRes req) {
public AjaxResult<WgzUserDailyCalendarRes> userDailyCalendar(@Validated WgzAppUserDailyCalendarReq req) {
WgzUserDailyCalendarRes wfzUserDailyCalendarRes = iWgzDailyClockService.userDailyCalendar(req);
return AjaxResult.success(wfzUserDailyCalendarRes);
}
/**
* 【日报】日报日历·日报记录
*/
@ApiOperation("日报-日报日历·日报记录")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyRecord')")
@GetMapping("/WgzUserDailyRecord")
public TableDataInfo<WgzAppUserDailyRecordRes> userDailyRecord(@Validated WgzAppUserDailyRecordReq req) {
return iWgzDailyClockService.userDailyRecord(req);
}
/**
* 【日报】日报日历·日报记录
*/
@ApiOperation("日报-日报日历·查看日报")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userCheckDailyNewspaper')")
@GetMapping("/WgzUserCheckDailyNewspaper/{id}")
public AjaxResult<WgzDailyClock> userCheckDailyNewspaper(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) {
return AjaxResult.success(iWgzDailyClockService.userCheckDailyNewspaper(id));
}
/**
* 【考勤打卡】【打卡】 提交上下班打卡
*/
@ApiOperation("【考勤打卡】【打卡】 提交上下班打卡)")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitTheClock')")
@PostMapping("/WgzAppUserSubmitTheClock")
public AjaxResult<Boolean> userSubmitTheClock() {
return AjaxResult.success(true);
}
/**
* 通用接口
@ -260,6 +301,26 @@ public class WgzAppController {
return AjaxResult.success(wgzAppAttachmentAcquisitionRes.setWgzAutonymAnnex(resData));
}
/**
* 【我的】【请假】 获取上下班时间
* 【考勤打卡】【打卡】 获取上下班时间
*/
@ApiOperation("通用·获取上下班时间")
@PreAuthorize("@ss.hasPermi('wgzApp:user:userGetCommutingTime')")
@GetMapping("/WgzAppUserGetCommutingTime")//PageReq
public AjaxResult<Map<String, LocalTime>> userGetCommutingTime() {
//1、获取当前人、当前工的上下班时间范围
Long appUserId = SecurityUtils.getAppUserId();
//2、根据唯一标识获取到当前用户的招工
BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId);
//3、根据招工id获取到具体招工信息
BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId());
Map<String, LocalTime> mp = new HashMap<>();
mp.put("beginWorkTime", appById.getBeginWorkTime());
mp.put("endWorkTime", appById.getEndWorkTime());
return AjaxResult.success(mp);
}
/**