From d98028cf783d59a3999be4c1290c2424717e483b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=88=90?= <2847920761@qq.com> Date: Thu, 20 Feb 2025 10:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=A5=E6=8A=A5=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wgz/controller/WgzAppController.java | 63 ++++++++++++++++++- .../src/main/resources/generator.yml | 6 +- .../ruoyi/bgt/domain/BgtProjectRecruit.java | 5 +- ...s.java => WgzAppUserDailyCalendarReq.java} | 2 +- .../wgz/bo/req/WgzAppUserDailyRecordReq.java | 20 ++++++ .../wgz/bo/res/WgzAppUserDailyRecordRes.java | 43 +++++++++++++ .../com/ruoyi/wgz/domain/WgzDailyClock.java | 9 +-- .../java/com/ruoyi/wgz/domain/WgzLeave.java | 5 ++ .../ruoyi/wgz/mapper/WgzDailyClockMapper.java | 10 ++- .../wgz/service/IWgzDailyClockService.java | 16 ++++- .../ruoyi/wgz/service/IWgzLeaveService.java | 7 +++ .../impl/WgzDailyClockServiceImpl.java | 37 ++++++++--- .../wgz/service/impl/WgzLeaveServiceImpl.java | 38 ++++++++--- .../mapper/wgz/WgzDailyClockMapper.xml | 20 +++++- .../resources/mapper/wgz/WgzLeaveMapper.xml | 2 +- ruoyi-ui/.env.development | 2 +- 16 files changed, 247 insertions(+), 38 deletions(-) rename ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/{WgzAppUserDailyCalendarRes.java => WgzAppUserDailyCalendarReq.java} (88%) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyRecordReq.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserDailyRecordRes.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java index 1867f1a..dd4b89d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wgz/controller/WgzAppController.java @@ -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 userDailyCalendar(@Validated WgzAppUserDailyCalendarRes req) { + public AjaxResult userDailyCalendar(@Validated WgzAppUserDailyCalendarReq req) { WgzUserDailyCalendarRes wfzUserDailyCalendarRes = iWgzDailyClockService.userDailyCalendar(req); return AjaxResult.success(wfzUserDailyCalendarRes); } + /** + * 【日报】日报日历·日报记录 + */ + @ApiOperation("日报-日报日历·日报记录") + @PreAuthorize("@ss.hasPermi('wgzApp:user:userDailyRecord')") + @GetMapping("/WgzUserDailyRecord") + public TableDataInfo userDailyRecord(@Validated WgzAppUserDailyRecordReq req) { + return iWgzDailyClockService.userDailyRecord(req); + } + + /** + * 【日报】日报日历·日报记录 + */ + @ApiOperation("日报-日报日历·查看日报") + @PreAuthorize("@ss.hasPermi('wgzApp:user:userCheckDailyNewspaper')") + @GetMapping("/WgzUserCheckDailyNewspaper/{id}") + public AjaxResult userCheckDailyNewspaper(@NotNull(message = "主键不能为空") @PathVariable("id") Long id) { + return AjaxResult.success(iWgzDailyClockService.userCheckDailyNewspaper(id)); + } + + /** + * 【考勤打卡】【打卡】 提交上下班打卡 + */ + @ApiOperation("【考勤打卡】【打卡】 提交上下班打卡）") + @PreAuthorize("@ss.hasPermi('wgzApp:user:userSubmitTheClock')") + @PostMapping("/WgzAppUserSubmitTheClock") + public AjaxResult 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> userGetCommutingTime() { + //1、获取当前人、当前工的上下班时间范围 + Long appUserId = SecurityUtils.getAppUserId(); + //2、根据唯一标识获取到当前用户的招工 + BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId); + //3、根据招工id获取到具体招工信息 + BgtProjectRecruit appById = iBgtProjectRecruitService.getAppById(by.getId()); + Map mp = new HashMap<>(); + mp.put("beginWorkTime", appById.getBeginWorkTime()); + mp.put("endWorkTime", appById.getEndWorkTime()); + return AjaxResult.success(mp); + } + /** diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml index aa336d2..647052b 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/ruoyi-generator/src/main/resources/generator.yml @@ -3,8 +3,8 @@ gen: # 作者 author: ruoyi # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.common + packageName: com.ruoyi.wgz # 自动去除表前缀，默认是false - autoRemovePre: true + autoRemovePre: false # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: common_ + tablePrefix: wgz_ diff --git a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java index c8c1c5f..5010cef 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectRecruit.java @@ -10,6 +10,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.time.LocalDateTime; +import java.time.LocalTime; /** * 包工头招工对象 bgt_project_recruit @@ -125,10 +126,10 @@ public class BgtProjectRecruit implements Serializable { private String recruitRequirement; @ApiModelProperty("上班时间") - private String beginWorkTime; + private LocalTime beginWorkTime; @ApiModelProperty("下班时间") - private String endWorkTime; + private LocalTime endWorkTime; @ApiModelProperty("创建者ID") private Long userId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarReq.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarRes.java rename to ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarReq.java index 5ce0a23..6158e37 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarRes.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyCalendarReq.java @@ -13,7 +13,7 @@ import java.io.Serializable; @NoArgsConstructor @Accessors(chain = true) @ApiModel("务工者APP-日报日历请求对象") -public class WgzAppUserDailyCalendarRes implements Serializable { +public class WgzAppUserDailyCalendarReq implements Serializable { @ApiModelProperty("年月日期：2025-02") @NotBlank(message = "年月不能为空") private String yearMonth; diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyRecordReq.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyRecordReq.java new file mode 100644 index 0000000..8f8aaa3 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/req/WgzAppUserDailyRecordReq.java @@ -0,0 +1,20 @@ +package com.ruoyi.wgz.bo.req; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.bo.PageReq; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("日报打卡·日报记录请求对象") +public class WgzAppUserDailyRecordReq extends PageReq { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserDailyRecordRes.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserDailyRecordRes.java new file mode 100644 index 0000000..6b9038b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserDailyRecordRes.java @@ -0,0 +1,43 @@ +package com.ruoyi.wgz.bo.res; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@NoArgsConstructor +@Accessors(chain = true) +@ApiModel("日报打卡·日报记录返回对象") +public class WgzAppUserDailyRecordRes implements Serializable { + + @ApiModelProperty("自增ID") + private Long id; + + @ApiModelProperty("项目ID") + private Long recruitId; + + @ApiModelProperty("人员ID") + private Long userId; + + @ApiModelProperty("人员姓名") + private String username; + + @ApiModelProperty("人员头像") + private String avatarName; + + @ApiModelProperty("日报时间") + private LocalDateTime dilyTime; + + @ApiModelProperty("今日完成工作") + private String finishToday; + + @ApiModelProperty("审核状态（0未读 1未审核 2已审核）") + private String auditorType; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzDailyClock.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzDailyClock.java index 5ca2dc5..27f2cf5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzDailyClock.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzDailyClock.java @@ -102,15 +102,10 @@ public class WgzDailyClock implements Serializable { private String auditorOpinion; /** 已读|审核时间 */ - @Excel(name = "已读|审核时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("已读|审核时间") + @Excel(name = "未审核|审核时间" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("未审核|审核时间") private LocalDateTime auditorTime; - /** 类型（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5补卡 6请假） */ - @Excel(name = "类型" , readConverterExp = "0=正常,1=迟到,2=早退,3=上班缺卡,4=下班缺卡,5=补卡,6=请假") - @ApiModelProperty("类型（0正常 1迟到 2早退 3上班缺卡 4下班缺卡 5补卡 6请假）") - private String exceptionType; - /** 删除标志（0代表存在 2代表删除） */ @Excel(name = "删除标志" , readConverterExp = "0=代表存在,2=代表删除") @ApiModelProperty("删除标志（0代表存在 2代表删除）") diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzLeave.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzLeave.java index 8e5035b..8a4b474 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzLeave.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/domain/WgzLeave.java @@ -41,6 +41,11 @@ public class WgzLeave implements Serializable { @ApiModelProperty("项目ID") private Long recruitId; + /** 项目ID */ + @Excel(name = "请假人") + @ApiModelProperty("请假人") + private Long userId; + /** 招工主题 */ @Excel(name = "招工主题") @ApiModelProperty("招工主题") diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java index dc189f2..c795496 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/mapper/WgzDailyClockMapper.java @@ -1,5 +1,8 @@ package com.ruoyi.wgz.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.wgz.bo.res.WgzAppLeaveHistoryListPageRes; +import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.domain.WgzDailyClock; import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; import com.ruoyi.common.core.mybatisplus.cache.MybatisPlusRedisCache; @@ -14,5 +17,10 @@ import org.apache.ibatis.annotations.CacheNamespace; // 如使需切换数据源 请勿使用缓存 会造成数据不一致现象 @CacheNamespace(implementation = MybatisPlusRedisCache.class, eviction = MybatisPlusRedisCache.class) public interface WgzDailyClockMapper extends BaseMapperPlus { - + /** + * 查询关联数据并支持分页 + * @param page 分页对象 + * @return 分页查询结果 + */ + Page userDailyRecordListPage(Page page); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java index 5d352b3..10ff7b7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzDailyClockService.java @@ -1,6 +1,8 @@ package com.ruoyi.wgz.service; -import com.ruoyi.wgz.bo.req.WgzAppUserDailyCalendarRes; +import com.ruoyi.wgz.bo.req.WgzAppUserDailyCalendarReq; +import com.ruoyi.wgz.bo.req.WgzAppUserDailyRecordReq; +import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes; import com.ruoyi.wgz.domain.WgzDailyClock; import com.ruoyi.wgz.bo.WgzDailyClockQueryBo; @@ -66,5 +68,15 @@ public interface IWgzDailyClockService extends IServicePlus { /** * 日报日历 */ - WgzUserDailyCalendarRes userDailyCalendar(@Validated WgzAppUserDailyCalendarRes req); + WgzUserDailyCalendarRes userDailyCalendar(@Validated WgzAppUserDailyCalendarReq req); + + /** + * 日报日历·日报记录（历史记录分页查询） + */ + TableDataInfo userDailyRecord(@Validated WgzAppUserDailyRecordReq req); + + /** + * 日报日历·日报记录（历史记录分页查询） + */ + WgzDailyClock userCheckDailyNewspaper(Long id); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java index 09b4110..6d0ba3e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/IWgzLeaveService.java @@ -11,8 +11,10 @@ import com.ruoyi.common.core.page.TableDataInfo; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; +import java.time.LocalDate; import java.util.Collection; import java.util.List; +import java.util.Map; /** * 请假Service接口 @@ -81,4 +83,9 @@ public interface IWgzLeaveService extends IServicePlus { * 取消请假申请 */ Boolean userCancelLeave(@Validated @RequestBody WgzAppCancelLeaveReq req); + + /* + * 查看指定人、指定项目、指定月是否请假 + */ + Map selectByUserCancelLeave(String yearMonth); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java index 0ee2f20..9efa370 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzDailyClockServiceImpl.java @@ -6,9 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.wgz.bo.req.WgzAppUserDailyCalendarRes; +import com.ruoyi.wgz.bo.req.WgzAppUserDailyCalendarReq; +import com.ruoyi.wgz.bo.req.WgzAppUserDailyRecordReq; +import com.ruoyi.wgz.bo.res.WgzAppLeaveHistoryListPageRes; +import com.ruoyi.wgz.bo.res.WgzAppUserDailyRecordRes; import com.ruoyi.wgz.bo.res.WgzUserDailyCalendarRes; import com.ruoyi.wgz.bo.rests.WgzAppAttachmentAcquisitionTwo; +import com.ruoyi.wgz.service.IWgzLeaveService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -30,6 +35,8 @@ import java.util.*; */ @Service public class WgzDailyClockServiceImpl extends ServicePlusImpl implements IWgzDailyClockService { + @Autowired + private IWgzLeaveService iWgzLeaveService; @Override public WgzDailyClock queryById(Long id){ @@ -64,7 +71,6 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl queryWrapper = new QueryWrapper<>(); queryWrapper.apply("DATE_FORMAT(dily_time, '%Y-%m') = {0}", req.getYearMonth()); // 使用 apply 方法添加自定义 SQL 条件 List wgzDailyClocks = baseMapper.selectList(queryWrapper); - //3、查看当前人，当前月是否有请假 - - //4、将获取的年月与数据库中的日期进行比对，然后填充数据 + //3、查看当前人、当前项目、当前月是否有请假 + Map ll = iWgzLeaveService.selectByUserCancelLeave(req.getYearMonth()); + //4、将获取的年月与数据库中的日期进行比对，然后填充数据 Map fh = new HashMap<>(); dates.forEach(date -> { wgzDailyClocks.forEach(wgzDailyClock -> { @@ -136,13 +142,26 @@ public class WgzDailyClockServiceImpl extends ServicePlusImpl userDailyRecord(WgzAppUserDailyRecordReq req) { + Page pe = new Page<>(); + pe.setCurrent(req.getPageNum()); + pe.setSize(req.getPageSize()); + return PageUtils.buildDataInfo(baseMapper.userDailyRecordListPage(pe)); + } + + @Override + public WgzDailyClock userCheckDailyNewspaper(Long id) { + return getById(id); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java index c80a6f7..6e9153e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzLeaveServiceImpl.java @@ -30,11 +30,11 @@ import com.ruoyi.wgz.mapper.WgzLeaveMapper; import com.ruoyi.wgz.service.IWgzLeaveService; import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.time.format.DateTimeFormatter; +import java.util.*; /** * 请假Service业务层处理 @@ -131,20 +131,18 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl0; } @@ -164,4 +162,26 @@ public class WgzLeaveServiceImpl extends ServicePlusImpl0; } + + @Override + public Map selectByUserCancelLeave(String yearMonth) { + Map ld = new HashMap<>(); + //1、现获取用户的唯一标识 + Long appUserId = SecurityUtils.getAppUserId(); + //2、根据唯一标识获取到当前用户的招工 + BgtProjectRecruitApply by = iBgtProjectRecruitApplyService.selectByUserIdProjectRecruitApplyId(appUserId); + //2、查询请假表 + LambdaQueryWrapper apply = new LambdaQueryWrapper(). + eq(WgzLeave::getUserId, appUserId). + eq(WgzLeave::getRecruitId, by.getId()). + eq(WgzLeave::getAuditorType, "2") + .apply("date_format(start_time,'%Y%m') = {0}", yearMonth); + List wgzLeaves = baseMapper.selectList(apply); + wgzLeaves.forEach( leave -> { + LocalDateTime startTime = leave.getStartTime(); + LocalDate localDate = startTime.toLocalDate(); + ld.put(localDate,localDate); + }); + return ld; + } } diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml index 6d4461e..5ececce 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzDailyClockMapper.xml @@ -20,7 +20,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -29,5 +28,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml b/ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml index a795e80..9f9158f 100644 --- a/ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wgz/WgzLeaveMapper.xml @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT a.*, b.username, - b.avatar_name as avatarName + b.avatar_name FROM wgz_leave a LEFT JOIN bgt_user b ON (a.auditor_user_id = b.user_id and b.del_flag = 0) diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index af0322b..d458b86 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -5,7 +5,7 @@ VUE_APP_TITLE = RuoYi-Vue-Plus后台管理系统 ENV = 'development' # 若依管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.110.3:9099/ruoyi' +VUE_APP_BASE_API = 'http://127.0.0.1:9099/ruoyi' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true