DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

缺少上传文件组件的完整代码，期待获取，完成签到页的全面优化

Browse Source
This commit is contained in:
86156
2024-12-15 21:41:23 +08:00
parent 9fd16697d5
commit ba0d565424
27 changed files with 1102 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaAttendanceService.java
View File

@@ -51,10 +51,11 @@ public interface ISysOaAttendanceService {
/**
* 工人列表
*
* @param bo
* @return
*/
List<SysUserVo> workerList(SysOaAttendanceBo bo);
TableDataInfo<SysUserVo> workerList(SysOaAttendanceBo bo);
/**
* 批量插入

49
ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaFileService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.ruoyi.oa.service;
import com.ruoyi.oa.domain.SysOaFile;
import com.ruoyi.oa.domain.vo.SysOaFileVo;
import com.ruoyi.oa.domain.bo.SysOaFileBo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 文件存储Service接口
*
* @author hdka
* @date 2024-12-15
*/
public interface ISysOaFileService {
/**
* 查询文件存储
*/
SysOaFileVo queryById(Long fileId);
/**
* 查询文件存储列表
*/
TableDataInfo<SysOaFileVo> queryPageList(SysOaFileBo bo, PageQuery pageQuery);
/**
* 查询文件存储列表
*/
List<SysOaFileVo> queryList(SysOaFileBo bo);
/**
* 新增文件存储
*/
Boolean insertByBo(SysOaFileBo bo);
/**
* 修改文件存储
*/
Boolean updateByBo(SysOaFileBo bo);
/**
* 校验并批量删除文件存储信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

73
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaAttendanceServiceImpl.java
View File

@@ -23,7 +23,6 @@ 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.*;
import java.util.stream.Collectors;
@@ -146,38 +145,52 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
}
@Override
public List<SysUserVo> workerList(SysOaAttendanceBo bo) {
public TableDataInfo<SysUserVo> workerList(SysOaAttendanceBo bo) {
List<Long> userIds = sysUserRoleMapper.selectUserIdsByRoleId(1852970465740505090L);
LocalDate localDate = LocalDate.now();
int year = localDate.getYear();
int month = localDate.getMonthValue();
List<SysUserVo> 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<SysOaAttendance> lqw = Wrappers.lambdaQuery();
// 如果这个时间为空，则默认查询当月记录
Date firstDay;
Date lastDay;
if (Objects.isNull(bo.getSelectTime())){
firstDay = getFirstDay(new Date());
// 查询当月记录
lqw.eq(SysOaAttendance::getUserId, userId)
.ge(SysOaAttendance::getCreateTime,LocalDate.of(year,month,1))
.le(SysOaAttendance::getCreateTime,LocalDate.of(year,month,localDate.lengthOfMonth()));
List<SysOaAttendanceVo> sysOaAttendanceVos = baseMapper.selectVoList(lqw);
List<SysOaProjectVo> projectVos = new ArrayList<>();
for (SysOaAttendanceVo oaAttendanceVo : sysOaAttendanceVos) {
// 当projectId等于0时代表 当前为出差状态
if(oaAttendanceVo.getProjectId()!=0){
SysOaProjectVo sysOaProjectVo = projectService.queryById(oaAttendanceVo.getProjectId());
oaAttendanceVo.setColor(sysOaProjectVo.getColor());
projectVos.add(sysOaProjectVo);
}
}
sysUser.setProjects(projectVos);
sysUser.setAttendances(sysOaAttendanceVos);
sysUserVos.add(sysUser);
}else{
firstDay = getFirstDay(bo.getSelectTime());
}
return sysUserVos;
lastDay = getLastDay(firstDay);
Page<SysUserVo> result = new Page<>();
result.setRecords(baseMapper.selectUserListAndAttendanceListAndProjectListByUserIds(userIds,firstDay,lastDay));
// 这个total写当月有多长时间
Calendar calendar = Calendar.getInstance();
calendar.setTime(firstDay);
result.setTotal(calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
// for (Long userId : userIds) {
// SysUserVo sysUser = BeanUtil.toBean(sysUserService.selectUserById(userId), SysUserVo.class);
// SysOaAttendanceVo sysOaAttendanceVo = new SysOaAttendanceVo();
// sysOaAttendanceVo.setUserId(sysUser.getUserId());
// LambdaQueryWrapper<SysOaAttendance> lqw = Wrappers.lambdaQuery();
//
// // 查询当月记录
// lqw.eq(SysOaAttendance::getUserId, userId)
// .ge(SysOaAttendance::getCreateTime,)
// .le(SysOaAttendance::getCreateTime,LocalDate.of(year,month,localDate.lengthOfMonth()));
// List<SysOaAttendanceVo> sysOaAttendanceVos = baseMapper.selectVoList(lqw);
//
// List<SysOaProjectVo> projectVos = new ArrayList<>();
// for (SysOaAttendanceVo oaAttendanceVo : sysOaAttendanceVos) {
// // 当projectId等于0时代表 当前为出差状态
// if(oaAttendanceVo.getProjectId()!=0){
// SysOaProjectVo sysOaProjectVo = projectService.queryById(oaAttendanceVo.getProjectId());
// oaAttendanceVo.setColor(sysOaProjectVo.getColor());
// projectVos.add(sysOaProjectVo);
// }
// }
// sysUser.setProjects(projectVos);
// sysUser.setAttendances(sysOaAttendanceVos);
// sysUserVos.add(sysUser);
// }
// 优化查询
return TableDataInfo.build(result);
}
@Override

110
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaFileServiceImpl.java Normal file
View File

@@ -0,0 +1,110 @@
package com.ruoyi.oa.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.utils.StringUtils;
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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.ruoyi.oa.domain.bo.SysOaFileBo;
import com.ruoyi.oa.domain.vo.SysOaFileVo;
import com.ruoyi.oa.domain.SysOaFile;
import com.ruoyi.oa.mapper.SysOaFileMapper;
import com.ruoyi.oa.service.ISysOaFileService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 文件存储Service业务层处理
*
* @author hdka
* @date 2024-12-15
*/
@RequiredArgsConstructor
@Service
public class SysOaFileServiceImpl implements ISysOaFileService {
private final SysOaFileMapper baseMapper;
/**
* 查询文件存储
*/
@Override
public SysOaFileVo queryById(Long fileId){
return baseMapper.selectVoById(fileId);
}
/**
* 查询文件存储列表
*/
@Override
public TableDataInfo<SysOaFileVo> queryPageList(SysOaFileBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SysOaFile> lqw = buildQueryWrapper(bo);
Page<SysOaFileVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询文件存储列表
*/
@Override
public List<SysOaFileVo> queryList(SysOaFileBo bo) {
LambdaQueryWrapper<SysOaFile> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SysOaFile> buildQueryWrapper(SysOaFileBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOaFile> lqw = Wrappers.lambdaQuery();
lqw.eq(StringUtils.isNotBlank(bo.getFileUrl()), SysOaFile::getFileUrl, bo.getFileUrl());
lqw.eq(bo.getStatus() != null, SysOaFile::getStatus, bo.getStatus());
return lqw;
}
/**
* 新增文件存储
*/
@Override
public Boolean insertByBo(SysOaFileBo bo) {
SysOaFile add = BeanUtil.toBean(bo, SysOaFile.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setFileId(add.getFileId());
}
return flag;
}
/**
* 修改文件存储
*/
@Override
public Boolean updateByBo(SysOaFileBo bo) {
SysOaFile update = BeanUtil.toBean(bo, SysOaFile.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SysOaFile entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除文件存储
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}