From 36d06eeb536e1d1cf7806fa1b5a4166b801032e0 Mon Sep 17 00:00:00 2001 From: 86156 <823267011@qq.com> Date: Tue, 5 Nov 2024 18:55:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/entity/SysUser.java | 1 + .../controller/SysOaAttendanceController.java | 132 +++++++++ .../com/ruoyi/oa/domain/SysOaAttendance.java | 57 ++++ .../com/ruoyi/oa/domain/SysOaProject.java | 5 + .../ruoyi/oa/domain/bo/SysOaAttendanceBo.java | 60 +++++ .../ruoyi/oa/domain/bo/SysOaProjectBo.java | 6 + .../ruoyi/oa/domain/vo/SysOaAttendanceVo.java | 75 ++++++ .../ruoyi/oa/domain/vo/SysOaProjectVo.java | 6 + .../com/ruoyi/oa/domain/vo/SysUserVo.java | 15 ++ .../oa/mapper/SysOaAttendanceMapper.java | 15 ++ .../oa/service/ISysOaAttendanceService.java | 53 ++++ .../impl/SysOaAttendanceServiceImpl.java | 185 +++++++++++++ .../mapper/oa/SysOaAttendanceMapper.xml | 23 ++ ruoyi-ui/src/api/oa/oaAttendance.js | 53 ++++ ruoyi-ui/src/views/index.vue | 4 +- ruoyi-ui/src/views/oa/attendance/index.vue | 253 ++++++++++++++++++ 16 files changed, 942 insertions(+), 1 deletion(-) create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAttendanceController.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaAttendance.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaAttendanceBo.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaAttendanceVo.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysUserVo.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaAttendanceMapper.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaAttendanceService.java create mode 100644 ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java create mode 100644 ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml create mode 100644 ruoyi-ui/src/api/oa/oaAttendance.js create mode 100644 ruoyi-ui/src/views/oa/attendance/index.vue diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 5c79bfc..a37f810 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -157,6 +157,7 @@ public class SysUser extends BaseEntity { private Long laborCost; + /** * 数据权限 当前角色ID */ diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAttendanceController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAttendanceController.java new file mode 100644 index 0000000..739f178 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAttendanceController.java @@ -0,0 +1,132 @@ +package com.ruoyi.oa.controller; + +import java.util.List; +import java.util.Arrays; + +import com.ruoyi.oa.domain.vo.SysUserVo; +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.oa.domain.vo.SysOaAttendanceVo; +import com.ruoyi.oa.domain.bo.SysOaAttendanceBo; +import com.ruoyi.oa.service.ISysOaAttendanceService; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 人员考勤 + * + * @author hdka + * @date 2024-11-05 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/oa/oaAttendance") +public class SysOaAttendanceController extends BaseController { + + private final ISysOaAttendanceService iSysOaAttendanceService; + + /** + * 查询人员考勤列表 + */ + @SaCheckPermission("system:oaAttendance:list") + @GetMapping("/list") + public TableDataInfo list(SysOaAttendanceBo bo, PageQuery pageQuery) { + return iSysOaAttendanceService.queryPageList(bo, pageQuery); + } + + + + /** + * 查询人员考勤列表 + */ + @SaCheckPermission("system:oaAttendance:list") + @GetMapping("/worker/list") + public R> workerList(SysOaAttendanceBo bo) { + + return R.ok(iSysOaAttendanceService.workerList(bo)); + } + + + /** + * 导出人员考勤列表 + */ + @SaCheckPermission("system:oaAttendance:export") + @Log(title = "人员考勤", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SysOaAttendanceBo bo, HttpServletResponse response) { + List list = iSysOaAttendanceService.queryList(bo); + ExcelUtil.exportExcel(list, "人员考勤", SysOaAttendanceVo.class, response); + } + + /** + * 获取人员考勤详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:oaAttendance:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(iSysOaAttendanceService.queryById(id)); + } + + /** + * 新增人员考勤 + */ + @SaCheckPermission("system:oaAttendance:add") + @Log(title = "人员考勤", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SysOaAttendanceBo bo) { + return toAjax(iSysOaAttendanceService.insertByBo(bo)); + } + + /** + * 修改人员考勤 + */ + @SaCheckPermission("system:oaAttendance:edit") + @Log(title = "人员考勤", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SysOaAttendanceBo bo) { + return toAjax(iSysOaAttendanceService.updateByBo(bo)); + } + + /** + * 删除人员考勤 + * + * @param ids 主键串 + */ + @SaCheckPermission("system:oaAttendance:remove") + @Log(title = "人员考勤", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(iSysOaAttendanceService.deleteWithValidByIds(Arrays.asList(ids), true)); + } + + + /** + * 新增人员考勤 + */ + @SaCheckPermission("system:oaAttendance:add") + @Log(title = "人员考勤", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping("/insertBatch") + public R insertBatch(@Validated(AddGroup.class) @RequestBody SysOaAttendanceBo bo) { + return toAjax( iSysOaAttendanceService.insertBatch(bo)); + } +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaAttendance.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaAttendance.java new file mode 100644 index 0000000..62e2988 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaAttendance.java @@ -0,0 +1,57 @@ +package com.ruoyi.oa.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 人员考勤对象 sys_oa_attendance + * + * @author hdka + * @date 2024-11-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_oa_attendance") +public class SysOaAttendance extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键id + */ + @TableId(value = "id") + private Long id; + /** + * 员工id + */ + private Long userId; + /** + * 签到日 + */ + private Long attendanceDay; + /** + * 项目id + */ + private Long projectId; + /** + * 时长（天）1|0.5 + */ + private Long dayLength; + /** + * 时长（小时） + */ + private Long hour; + /** + * 备注 + */ + private String remark; + /** + * 删除标志 + */ + @TableLogic + private Long delFlag; + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java index 5dacfe0..b4daf6c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java @@ -129,4 +129,9 @@ public class SysOaProject extends BaseEntity { * 延期至 */ private Date postponeTime; + + /** + * 项目代表色 + */ + private String color; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaAttendanceBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaAttendanceBo.java new file mode 100644 index 0000000..e9e5a8f --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaAttendanceBo.java @@ -0,0 +1,60 @@ +package com.ruoyi.oa.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 人员考勤业务对象 sys_oa_attendance + * + * @author hdka + * @date 2024-11-05 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class SysOaAttendanceBo extends BaseEntity { + + /** + * 主键id + */ + private Long id; + + /** + * 员工id + */ + private Long userId; + + /** + * 签到日 + */ + @NotNull(message = "签到日不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long attendanceDay; + + /** + * 项目id + */ + @NotNull(message = "项目id不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long projectId; + + /** + * 时长（天）1|0.5 + */ + private Double dayLength; + + /** + * 时长（小时） + */ + private Double hour; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java index ad79cb2..5f5908d 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java @@ -156,4 +156,10 @@ public class SysOaProjectBo extends BaseEntity { */ private Date postponeTime; + + /** + * 项目代表色 + */ + private String color; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaAttendanceVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaAttendanceVo.java new file mode 100644 index 0000000..a58daf9 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaAttendanceVo.java @@ -0,0 +1,75 @@ +package com.ruoyi.oa.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.annotation.ExcelDictFormat; +import com.ruoyi.common.convert.ExcelDictConvert; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.oa.domain.SysOaProject; +import lombok.Data; + + +/** + * 人员考勤视图对象 sys_oa_attendance + * + * @author hdka + * @date 2024-11-05 + */ +@Data +@ExcelIgnoreUnannotated +public class SysOaAttendanceVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @ExcelProperty(value = "主键id") + private Long id; + + /** + * 员工id + */ + @ExcelProperty(value = "员工id") + private Long userId; + + /** + * 签到日 + */ + @ExcelProperty(value = "签到日") + private Long attendanceDay; + + /** + * 项目id + */ + @ExcelProperty(value = "项目id") + private Long projectId; + + /** + * 时长（天）1|0.5 + */ + @ExcelProperty(value = "时长", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "天=") + private Long dayLength; + + /** + * 时长（小时） + */ + @ExcelProperty(value = "时长", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "小=时") + private Long hour; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + private SysUser sysUser; + + private SysOaProjectVo sysOaProjectVo; + + private String color; + + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java index 8fd90c5..ce128f2 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java @@ -180,4 +180,10 @@ public class SysOaProjectVo { */ private Date postponeTime; + + /** + * 项目代表色 + */ + private String color; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysUserVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysUserVo.java new file mode 100644 index 0000000..6af9b17 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysUserVo.java @@ -0,0 +1,15 @@ +package com.ruoyi.oa.domain.vo; + +import com.ruoyi.common.core.domain.entity.SysUser; +import lombok.Data; + +import java.util.List; + + +@Data +public class SysUserVo extends SysUser { + + private List attendances; + + private List projects; +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaAttendanceMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaAttendanceMapper.java new file mode 100644 index 0000000..c1cf5f4 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaAttendanceMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.oa.mapper; + +import com.ruoyi.oa.domain.SysOaAttendance; +import com.ruoyi.oa.domain.vo.SysOaAttendanceVo; +import com.ruoyi.common.core.mapper.BaseMapperPlus; + +/** + * 人员考勤Mapper接口 + * + * @author hdka + * @date 2024-11-05 + */ +public interface SysOaAttendanceMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaAttendanceService.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaAttendanceService.java new file mode 100644 index 0000000..9cacbef --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaAttendanceService.java @@ -0,0 +1,53 @@ +package com.ruoyi.oa.service; + +import com.ruoyi.oa.domain.vo.SysOaAttendanceVo; +import com.ruoyi.oa.domain.bo.SysOaAttendanceBo; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.oa.domain.vo.SysUserVo; + +import java.util.Collection; +import java.util.List; + +/** + * 人员考勤Service接口 + * + * @author hdka + * @date 2024-11-05 + */ +public interface ISysOaAttendanceService { + + /** + * 查询人员考勤 + */ + SysOaAttendanceVo queryById(Long id); + + /** + * 查询人员考勤列表 + */ + TableDataInfo queryPageList(SysOaAttendanceBo bo, PageQuery pageQuery); + + /** + * 查询人员考勤列表 + */ + List queryList(SysOaAttendanceBo bo); + + /** + * 新增人员考勤 + */ + Boolean insertByBo(SysOaAttendanceBo bo); + + /** + * 修改人员考勤 + */ + Boolean updateByBo(SysOaAttendanceBo bo); + + /** + * 校验并批量删除人员考勤信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + List workerList(SysOaAttendanceBo bo); + + int insertBatch(SysOaAttendanceBo bo); +} diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java new file mode 100644 index 0000000..9307733 --- /dev/null +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java @@ -0,0 +1,185 @@ +package com.ruoyi.oa.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.oa.domain.vo.SysOaProjectVo; +import com.ruoyi.oa.domain.vo.SysUserVo; +import com.ruoyi.oa.service.ISysOaProjectService; +import com.ruoyi.system.mapper.SysUserRoleMapper; +import com.ruoyi.system.service.ISysUserService; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.oa.domain.bo.SysOaAttendanceBo; +import com.ruoyi.oa.domain.vo.SysOaAttendanceVo; +import com.ruoyi.oa.domain.SysOaAttendance; +import com.ruoyi.oa.mapper.SysOaAttendanceMapper; +import com.ruoyi.oa.service.ISysOaAttendanceService; + +import java.time.LocalDate; +import java.util.*; + +/** + * 人员考勤Service业务层处理 + * + * @author hdka + * @date 2024-11-05 + */ +@RequiredArgsConstructor +@Service +public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService { + + private final SysOaAttendanceMapper baseMapper; + + @Autowired + private ISysUserService sysUserService; + + @Autowired + private SysUserRoleMapper sysUserRoleMapper; + + @Autowired + private ISysOaProjectService projectService; + + /** + * 查询人员考勤 + */ + @Override + public SysOaAttendanceVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 查询人员考勤列表 + */ + @Override + public TableDataInfo queryPageList(SysOaAttendanceBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询人员考勤列表 + */ + @Override + public List queryList(SysOaAttendanceBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysOaAttendanceBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getUserId() != null, SysOaAttendance::getUserId, bo.getUserId()); + lqw.eq(bo.getAttendanceDay() != null, SysOaAttendance::getAttendanceDay, bo.getAttendanceDay()); + lqw.eq(bo.getProjectId() != null, SysOaAttendance::getProjectId, bo.getProjectId()); + lqw.eq(bo.getDayLength() != null, SysOaAttendance::getDayLength, bo.getDayLength()); + lqw.eq(bo.getHour() != null, SysOaAttendance::getHour, bo.getHour()); + return lqw; + } + + /** + * 新增人员考勤 + */ + @Override + public Boolean insertByBo(SysOaAttendanceBo bo) { + SysOaAttendanceBo sysOaAttendanceBo = new SysOaAttendanceBo(); + + BeanUtil.copyProperties(bo, sysOaAttendanceBo); + sysOaAttendanceBo.setProjectId(null); + List sysOaAttendanceVos = this.queryList(sysOaAttendanceBo); + SysOaAttendance add = BeanUtil.toBean(bo, SysOaAttendance.class); + validEntityBeforeSave(add); + if (sysOaAttendanceVos.size()<=0){ + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + }else{ + SysOaAttendanceVo sysOaAttendanceVo = sysOaAttendanceVos.get(0); + sysOaAttendanceVo.setProjectId(bo.getProjectId()); + boolean flag = baseMapper.updateById(BeanUtil.toBean(sysOaAttendanceVo, SysOaAttendance.class))>0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + } + + /** + * 修改人员考勤 + */ + @Override + public Boolean updateByBo(SysOaAttendanceBo bo) { + SysOaAttendance update = BeanUtil.toBean(bo, SysOaAttendance.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysOaAttendance entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除人员考勤 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } + + @Override + public List workerList(SysOaAttendanceBo bo) { + List userIds = sysUserRoleMapper.selectUserIdsByRoleId(1852970465740505090L); + LocalDate localDate = LocalDate.now(); + int year = localDate.getYear(); + int month = localDate.getMonthValue(); + List sysUserVos = new ArrayList<>(); + for (Long userId : userIds) { + SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserById(userId), SysUserVo.class); + SysOaAttendanceVo sysOaAttendanceVo = new SysOaAttendanceVo(); + sysOaAttendanceVo.setUserId(sysUser.getUserId()); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + + // 查询当月记录 + lqw.eq(SysOaAttendance::getUserId, userId) + .ge(SysOaAttendance::getCreateTime,LocalDate.of(year,month,1)) + .le(SysOaAttendance::getCreateTime,LocalDate.of(year,month,localDate.lengthOfMonth())); + List sysOaAttendanceVos = baseMapper.selectVoList(lqw); + + List projectVos = new ArrayList<>(); + for (SysOaAttendanceVo oaAttendanceVo : sysOaAttendanceVos) { + SysOaProjectVo sysOaProjectVo = projectService.queryById(oaAttendanceVo.getProjectId()); + oaAttendanceVo.setColor(sysOaProjectVo.getColor()); + projectVos.add(sysOaProjectVo); + } + sysUser.setProjects(projectVos); + sysUser.setAttendances(sysOaAttendanceVos); + sysUserVos.add(sysUser); + } + return sysUserVos; + } + + @Override + public int insertBatch(SysOaAttendanceBo bo) { + List userIds = sysUserRoleMapper.selectUserIdsByRoleId(1852970465740505090L); + for (Long userId : userIds) { + SysOaAttendanceBo sysOaAttendanceBo = BeanUtil.toBean(bo,SysOaAttendanceBo.class); + sysOaAttendanceBo.setUserId(userId); + this.insertByBo(sysOaAttendanceBo); + } + return 1; + } +} diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml new file mode 100644 index 0000000..8e1468d --- /dev/null +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaAttendanceMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/api/oa/oaAttendance.js b/ruoyi-ui/src/api/oa/oaAttendance.js new file mode 100644 index 0000000..04d3b08 --- /dev/null +++ b/ruoyi-ui/src/api/oa/oaAttendance.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询人员考勤列表 +export function listOaAttendance(query) { + return request({ + url: '/oa/oaAttendance/worker/list', + method: 'get', + params: query + }) +} + +// 查询人员考勤详细 +export function getOaAttendance(id) { + return request({ + url: '/oa/oaAttendance/' + id, + method: 'get' + }) +} + +// 新增人员考勤 +export function addOaAttendance(data) { + return request({ + url: '/oa/oaAttendance', + method: 'post', + data: data + }) +} + +// 新增人员考勤 +export function addBatchOaAttendance(data) { + return request({ + url: '/oa/oaAttendance/insertBatch', + method: 'post', + data: data + }) +} + +// 修改人员考勤 +export function updateOaAttendance(data) { + return request({ + url: '/oa/oaAttendance', + method: 'put', + data: data + }) +} + +// 删除人员考勤 +export function delOaAttendance(id) { + return request({ + url: '/oa/oaAttendance/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 99066f6..c205f68 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -101,7 +101,9 @@
- {{ parseTime(v.createTime, '{y}-{m}-{d}') }} {{v.noticeTitle}} + {{ parseTime(v.createTime, '{y}-{m}-{d}') }} + + {{v.noticeTitle}}
diff --git a/ruoyi-ui/src/views/oa/attendance/index.vue b/ruoyi-ui/src/views/oa/attendance/index.vue new file mode 100644 index 0000000..ea61281 --- /dev/null +++ b/ruoyi-ui/src/views/oa/attendance/index.vue @@ -0,0 +1,253 @@ + + + +