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

7
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaAttendanceController.java
View File

@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import java.util.Arrays;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.oa.domain.LaborCostData;
import com.ruoyi.oa.domain.vo.SysUserVo;
@@ -82,9 +83,9 @@ public class SysOaAttendanceController extends BaseController {
* 查询人员考勤列表
*/
@GetMapping("/worker/list")
public R<List<SysUserVo>> workerList(SysOaAttendanceBo bo) {
public TableDataInfo<SysUserVo> workerList(SysOaAttendanceBo bo, PageQuery pageQuery) {
return R.ok(iSysOaAttendanceService.workerList(bo));
return iSysOaAttendanceService.workerList(bo);
}
@@ -144,7 +145,7 @@ public class SysOaAttendanceController extends BaseController {
/**
* 删除人员考勤
*
* @param ids 主键串
* @param day 主键串
*/
@Log(title = "人员考勤", businessType = BusinessType.DELETE)
@DeleteMapping("/all/{day}")

108
ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaFileController.java Normal file
View File

@@ -0,0 +1,108 @@
package com.ruoyi.oa.controller;
import java.util.List;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
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.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.oa.domain.vo.SysOaFileVo;
import com.ruoyi.oa.domain.bo.SysOaFileBo;
import com.ruoyi.oa.service.ISysOaFileService;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 文件存储
*
* @author hdka
* @date 2024-12-15
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oaFile")
public class SysOaFileController extends BaseController {
private final ISysOaFileService iSysOaFileService;
/**
* 查询文件存储列表
*/
@SaCheckPermission("system:oaFile:list")
@GetMapping("/list")
public TableDataInfo<SysOaFileVo> list(SysOaFileBo bo, PageQuery pageQuery) {
return iSysOaFileService.queryPageList(bo, pageQuery);
}
/**
* 导出文件存储列表
*/
@SaCheckPermission("system:oaFile:export")
@Log(title = "文件存储", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysOaFileBo bo, HttpServletResponse response) {
List<SysOaFileVo> list = iSysOaFileService.queryList(bo);
ExcelUtil.exportExcel(list, "文件存储", SysOaFileVo.class, response);
}
/**
* 获取文件存储详细信息
*
* @param fileId 主键
*/
@SaCheckPermission("system:oaFile:query")
@GetMapping("/{fileId}")
public R<SysOaFileVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long fileId) {
return R.ok(iSysOaFileService.queryById(fileId));
}
/**
* 新增文件存储
*/
@SaCheckPermission("system:oaFile:add")
@Log(title = "文件存储", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaFileBo bo) {
return toAjax(iSysOaFileService.insertByBo(bo));
}
/**
* 修改文件存储
*/
@SaCheckPermission("system:oaFile:edit")
@Log(title = "文件存储", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaFileBo bo) {
return toAjax(iSysOaFileService.updateByBo(bo));
}
/**
* 删除文件存储
*
* @param fileIds 主键串
*/
@SaCheckPermission("system:oaFile:remove")
@Log(title = "文件存储", businessType = BusinessType.DELETE)
@DeleteMapping("/{fileIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] fileIds) {
return toAjax(iSysOaFileService.deleteWithValidByIds(Arrays.asList(fileIds), true));
}
}

48
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaFile.java Normal file
View File

@@ -0,0 +1,48 @@
package com.ruoyi.oa.domain;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 文件存储对象 sys_oa_file
*
* @author hdka
* @date 2024-12-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_oa_file")
public class SysOaFile extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 主键id
*/
@TableId(value = "file_id")
private Long fileId;
/**
* 文件存储路径
*/
private String fileUrl;
/**
* 文件类型0打卡1出入库
*/
private Long status;
/**
* 删除标志
*/
@TableLogic
private Long delFlag;
/**
* 备注
*/
private String remark;
}

7
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaWarehouse.java
View File

@@ -35,6 +35,13 @@ public class SysOaWarehouse extends BaseEntity {
* 型号
*/
private String model;
/**
* 单价
*/
private Double price;
/**
* 单位
*/

11
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaAttendanceBo.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.oa.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import lombok.Data;
@@ -7,6 +8,9 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
import com.ruoyi.common.core.domain.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 人员考勤业务对象 sys_oa_attendance
@@ -56,5 +60,12 @@ public class SysOaAttendanceBo extends BaseEntity {
*/
private String remark;
/**
* 查询月份
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date selectTime;
}

49
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaFileBo.java Normal file
View File

@@ -0,0 +1,49 @@
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 java.util.Date;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 文件存储业务对象 sys_oa_file
*
* @author hdka
* @date 2024-12-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SysOaFileBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long fileId;
/**
* 文件存储路径
*/
@NotBlank(message = "文件存储路径不能为空", groups = { AddGroup.class, EditGroup.class })
private String fileUrl;
/**
* 文件类型0打卡1出入库
*/
@NotNull(message = "文件类型0打卡1出入库不能为空", groups = { AddGroup.class, EditGroup.class })
private Long status;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
private String remark;
}

5
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseBo.java
View File

@@ -40,6 +40,11 @@ public class SysOaWarehouseBo extends BaseEntity {
*/
private String model;
/**
* 单价
*/
private Double price;
/**
* 单位
*/

50
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaFileVo.java Normal file
View File

@@ -0,0 +1,50 @@
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 lombok.Data;
import java.util.Date;
/**
* 文件存储视图对象 sys_oa_file
*
* @author hdka
* @date 2024-12-15
*/
@Data
@ExcelIgnoreUnannotated
public class SysOaFileVo {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long fileId;
/**
* 文件存储路径
*/
@ExcelProperty(value = "文件存储路径")
private String fileUrl;
/**
* 文件类型0打卡1出入库
*/
@ExcelProperty(value = "文件类型0打卡1出入库", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "file_status")
private Long status;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

6
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java
View File

@@ -47,6 +47,12 @@ public class SysOaWarehouseVo extends SysOaWarehouse {
@ExcelProperty(value = "型号")
private String model;
/**
* 单价
*/
@ExcelProperty(value = "单价")
private Double price;
/**
* 库存数量

3
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaAttendanceMapper.java
View File

@@ -3,6 +3,7 @@ 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;
import com.ruoyi.oa.domain.vo.SysUserVo;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
@@ -19,4 +20,6 @@ public interface SysOaAttendanceMapper extends BaseMapperPlus<SysOaAttendanceMap
List<SysOaAttendanceVo> selectVoListAndTime(@Param("userId") Long userId, @Param("firstDay") Date firstDay, @Param("lastDay") Date lastDay);
int delOaAttendanceAll(@Param("firstDay") Date firstDay, @Param("lastDay")Date lastDay,@Param("day")Long day);
List<SysUserVo> selectUserListAndAttendanceListAndProjectListByUserIds(@Param("userIds") List<Long> userIds, @Param("firstDay") Date firstDay,@Param("lastDay") Date lastDay);
}

15
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaFileMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.ruoyi.oa.mapper;
import com.ruoyi.oa.domain.SysOaFile;
import com.ruoyi.oa.domain.vo.SysOaFileVo;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**
* 文件存储Mapper接口
*
* @author hdka
* @date 2024-12-15
*/
public interface SysOaFileMapper extends BaseMapperPlus<SysOaFileMapper, SysOaFile, SysOaFileVo> {
}

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;
}
}