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-30 18:11:39 +08:00
parent 28e379aa2a
commit 4a77a525bc
2 changed files with 349 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,7 +98,7 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
List<SysOaAttendanceVo> sysOaAttendanceVos = this.queryList(sysOaAttendanceBo);
SysOaAttendance add = BeanUtil.toBean(bo, SysOaAttendance.class);
validEntityBeforeSave(add);
if (sysOaAttendanceVos.size()<=0){
if (sysOaAttendanceVos.isEmpty()){
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
@@ -164,31 +164,6 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
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);
}
@@ -232,7 +207,7 @@ public class SysOaAttendanceServiceImpl implements ISysOaAttendanceService {
for (SysOaAttendanceVo oaAttendanceVo : sysOaAttendanceVos) {
// 出差问题解决
if (oaAttendanceVo.getProjectId()!=0){
if (oaAttendanceVo.getProjectId()!=0 && oaAttendanceVo.getProjectId()!=1){
SysOaProjectVo sysOaProjectVo = projectService.queryById(oaAttendanceVo.getProjectId());
oaAttendanceVo.setColor(sysOaProjectVo.getColor());
oaAttendanceVo.setSysOaProjectVo(sysOaProjectVo);