ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud into frx

Browse Source
This commit is contained in:
furongxin 2024-12-19 14:26:26 +08:00
commit 482d4b7668
17 changed files with 438 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
View File

@ -209,6 +209,7 @@ public interface ErrorCodeConstants {
ErrorCode INSUFFICIENT_NUMBER_OF_CARD_REFILLS = new ErrorCode(1_003_016_000, "补卡次数不足");
ErrorCode ABNORMAL_CARD_REPLENISHMENT = new ErrorCode(1_003_017_000, "补卡异常");
ErrorCode CANNOT_FIND_THE_RECORD_THAT_NEEDS_TO_BE_REPLACED = new ErrorCode(1_003_018_000, "查询不到需要补卡的记录");
ErrorCode THERE_ARE_DUPLICATE_SPECIAL_DATES = new ErrorCode(1_003_019_000, "存在重复的特殊日期,请检查!");
ErrorCode LOG_FORM_NOT_USE = new ErrorCode(1_009_010_004, "你不能使用该日志模板");

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/auth/AdminOauthUserOtherInfoApiImpl.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.api.auth;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
import cn.iocoder.yudao.module.system.api.auth.dto.AdminOauthUserOtherInfoApiDTO;
import cn.iocoder.yudao.module.system.api.auth.vo.AdminOauthUserOtherInfoApiVO;
import cn.iocoder.yudao.module.system.dal.dataobject.auth.AdminOauthUserOtherInfoDO;
@ -23,6 +24,7 @@ public class AdminOauthUserOtherInfoApiImpl implements AdminOauthUserOtherInfoAp
@Override
@DataPermission(enable = false)
public CommonResult<List<AdminOauthUserOtherInfoApiVO>> getOpenIdByCondition(AdminOauthUserOtherInfoApiDTO dto) {
AdminOauthUserOtherInfoDTO adminOauthUserOtherInfoDTO = BeanUtil.copyProperties(dto, AdminOauthUserOtherInfoDTO.class);
List<AdminOauthUserOtherInfoDO> list = adminOauthUserOtherInfoService.getOpenIdByCondition(adminOauthUserOtherInfoDTO);
@ -30,6 +32,7 @@ public class AdminOauthUserOtherInfoApiImpl implements AdminOauthUserOtherInfoAp
}
@Override
@DataPermission(enable = false)
public CommonResult<AdminOauthUserOtherInfoApiVO> getByCondition(AdminOauthUserOtherInfoApiDTO dto) {
AdminOauthUserOtherInfoDTO adminOauthUserOtherInfoDTO = BeanUtil.copyProperties(dto, AdminOauthUserOtherInfoDTO.class);
List<AdminOauthUserOtherInfoDO> list = adminOauthUserOtherInfoService.getOpenIdByCondition(adminOauthUserOtherInfoDTO);

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/attendance/AttendanceController.java
View File

@ -10,6 +10,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
@ -110,4 +111,12 @@ public class AttendanceController {
attendanceService.exportAttendanceExcel(response, dto);
}
@GetMapping("/generateHolidayToRedis")
@Operation(summary = "生成假期信息到redis(调用一次即可不需要重复调 需要开发人员手动调)")
@PermitAll
public CommonResult<?> generateHolidayToRedis(Integer year) {
attendanceService.generateHolidayToRedis(year);
return success("ok");
}
}

21
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/fixed/AttendanceFixedController.java
View File

@ -6,10 +6,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.system.controller.admin.fixed.dto.AttendanceFixedDTO;
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedRespVO;
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.attendancespecial.AttendanceSpecialDO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.fixed.AttendanceFixedDO;
import cn.iocoder.yudao.module.system.service.attendance.attendancespecial.AttendanceSpecialService;
import cn.iocoder.yudao.module.system.service.attendance.fixed.AttendanceFixedService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@ -35,13 +37,14 @@ public class AttendanceFixedController {
@Resource
private AttendanceFixedService fixedService;
@Resource
private AttendanceSpecialService attendanceSpecialService;
@PostMapping("/batchCreateOrUpdate")
@Operation(summary = "批量新增修改固定班制考勤设置")
@PreAuthorize("@ss.hasPermission('attendance:fixed:create')")
public CommonResult<Long> batchCreateOrUpdate(@RequestParam Long attendanceGroupId,
@Valid @RequestBody List<AttendanceFixedSaveReqVO> vos) {
Long groupId = fixedService.batchCreateOrUpdate(attendanceGroupId, vos);
public CommonResult<Long> batchCreateOrUpdate(@RequestBody AttendanceFixedDTO dto) {
Long groupId = fixedService.batchCreateOrUpdate(dto.getAttendanceGroupId(), dto.getVos(), dto.getSpecialDOS());
return success(groupId);
}
@ -58,6 +61,14 @@ public class AttendanceFixedController {
return success(BeanUtils.toBean(fixed, AttendanceFixedRespVO.class));
}
@GetMapping("/getAttendanceSpecialByGroupId")
@Operation(summary = "获取特殊日期列表")
public CommonResult<List<AttendanceSpecialDO>> getAttendanceSpecialByGroupId(@RequestParam("id") Long id) {
List<AttendanceSpecialDO> list = attendanceSpecialService.getByGroupId(id);
return success(list);
}
@GetMapping("/getListByGroupId")
@Operation(summary = "根据考勤组ID获得固定班制考勤设置列表")
public CommonResult<List<AttendanceFixedRespVO>> getListByGroupId(@RequestParam Long attendanceGroupId) {
@ -86,4 +97,4 @@ public class AttendanceFixedController {
BeanUtils.toBean(list, AttendanceFixedRespVO.class));
}
}
}

18
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/fixed/dto/AttendanceFixedDTO.java Normal file
View File

@ -0,0 +1,18 @@
package cn.iocoder.yudao.module.system.controller.admin.fixed.dto;
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedSaveReqVO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.attendancespecial.AttendanceSpecialDO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@Data
public class AttendanceFixedDTO {
@Schema(description = "考勤组id", example = "19908")
private Long attendanceGroupId;
@Schema(description = "固定班制考勤设置", example = "19908")
private List<AttendanceFixedSaveReqVO> vos;
@Schema(description = "考勤特殊日期设置", example = "19908")
private List<AttendanceSpecialDO> specialDOS;
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/fixed/vo/AttendanceFixedRespVO.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.system.controller.admin.fixed.vo;
import cn.iocoder.yudao.module.system.controller.admin.groupshift.vo.AttendanceGroupShiftRespVO;
import cn.iocoder.yudao.module.system.controller.admin.groupshift.vo.AttendanceGroupShiftVO;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
@ -38,4 +37,4 @@ public class AttendanceFixedRespVO {
@ExcelProperty("班次对象")
private AttendanceGroupShiftVO shiftVO;
}
}

50
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/attendance/attendancespecial/AttendanceSpecialDO.java Normal file
View File

@ -0,0 +1,50 @@
package cn.iocoder.yudao.module.system.dal.dataobject.attendance.attendancespecial;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
/**
* 考勤特殊日期 DO
*
* @author 艾楷
*/
@TableName("kq_attendance_special")
@KeySequence("kq_attendance_special_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AttendanceSpecialDO extends BaseDO {
/**
* 编号
*/
@TableId
private Long id;
/**
* 考勤组id
*/
private Long attendanceGroupId;
/**
* 类型 0无需打卡日期 1必须打卡日期
*/
private Integer type;
/**
* 班次id（为空表示休息 - 必须打卡日期必须要有时间）
*/
private Long attendanceGroupShiftId;
/**
* 时间 - 格式 yyyy-mm-dd
*/
private String dateTime;
/**
* 提示
*/
private String tips;
}

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/attendance/fixed/AttendanceFixedDO.java
View File

@ -1,11 +1,8 @@
package cn.iocoder.yudao.module.system.dal.dataobject.attendance.fixed;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
import com.baomidou.mybatisplus.annotation.*;
import lombok.*;
/**
* 固定班制考勤设置 DO
@ -41,4 +38,4 @@ public class AttendanceFixedDO extends BaseDO {
@TableField(updateStrategy = FieldStrategy.IGNORED)
private Long attendanceGroupShiftId;
}
}

16
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/attendancespecial/AttendanceSpecialMapper.java Normal file
View File

@ -0,0 +1,16 @@
package cn.iocoder.yudao.module.system.dal.mysql.attendance.attendancespecial;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.attendancespecial.AttendanceSpecialDO;
import org.apache.ibatis.annotations.Mapper;
/**
* 考勤特殊日期 Mapper
*
* @author 艾楷
*/
@Mapper
public interface AttendanceSpecialMapper extends BaseMapperX<AttendanceSpecialDO> {
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceService.java
View File

@ -181,4 +181,9 @@ public interface AttendanceService {
* @return
*/
Map<String, AttendanceTimeRangeInfoVO> getAttendanceInfoByTimeRange(AttendanceTimeRangeInfoDTO attendanceTimeRangeInfoDTO);
/**
* 更新假期信息到redis
*/
void generateHolidayToRedis(Integer year);
}

25
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
View File

@ -294,8 +294,8 @@ public class AttendanceServiceImpl implements AttendanceService {
map.put(item.get("date").toString(), item.get("holiday").toString());
});
stringRedisTemplate.opsForHash().putAll(key, map);
// -- 删除去年的
String lastKey = "holiday_" + (Integer.parseInt(year) - 1);
// -- 删除前年的
String lastKey = "holiday_" + (Integer.parseInt(year) - 2);
stringRedisTemplate.delete(lastKey);
}
Object o = stringRedisTemplate.opsForHash().get(key, dateStr);
@ -1184,6 +1184,27 @@ public class AttendanceServiceImpl implements AttendanceService {
.setAutoHolidaysFlag(activationGroup.getAutoHolidaysFlag()).setTimes(list));
}
@Override
public void generateHolidayToRedis(Integer year) {
String key = "holiday_" + year;
Boolean flag = stringRedisTemplate.hasKey(key);
// 缓存不存在
if (Boolean.FALSE.equals(flag)) {
String url = "https://timor.tech/api/holiday/year/" + year;
String json = HttpUtil.get(url, 3000);
Map<String, String> map = new HashMap<>();
JSONObject jsonObject = JSONUtil.parseObj(json);
Object o = jsonObject.get("holiday");
//将o转为json对象并且循环获取对象中所有的属性
JSONObject data = JSONUtil.parseObj(o);
data.forEach((k, v) -> {
JSONObject item = JSONUtil.parseObj(v);
map.put(item.get("date").toString(), item.get("holiday").toString());
});
stringRedisTemplate.opsForHash().putAll(key, map);
}
}
@Override
public void useReplacementCardNum(Long userId) {
userId = userId == null ? getLoginUserId() : userId;

59
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/attendancespecial/AttendanceSpecialService.java Normal file
View File

@ -0,0 +1,59 @@
package cn.iocoder.yudao.module.system.service.attendance.attendancespecial;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.attendancespecial.AttendanceSpecialDO;
import java.util.List;
/**
* 考勤特殊日期 Service 接口
*
* @author 艾楷
*/
public interface AttendanceSpecialService {
/**
* 根据条件搜索
*
* @param groupId
* @param time
* @param type
* @return
*/
AttendanceSpecialDO getByGroupIdAndTimeAndType(Long groupId, String time, int type);
/**
* 根据条件搜索
*
* @param groupId
* @param time
* @return
*/
List<AttendanceSpecialDO> getByGroupIdAndTime(Long groupId, String time);
/**
* @param groupIds
* @param time
* @return
*/
List<AttendanceSpecialDO> getByGroupIdsAndTime(List<Long> groupIds, String time);
/**
* @param groupId
* @param times
* @return
*/
List<AttendanceSpecialDO> getByGroupIdAndTimes(Long groupId, List<String> times);
/**
* @param attendanceGroupId
* @return
*/
List<AttendanceSpecialDO> getByGroupId(Long attendanceGroupId);
/**
* 批处理
*
* @param attendanceGroupId
* @param attendanceSpecialList
*/
void insertUpdateDeleteBatch(Long attendanceGroupId, List<List<AttendanceSpecialDO>> attendanceSpecialList);
}

85
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/attendancespecial/AttendanceSpecialServiceImpl.java Normal file
View File

@ -0,0 +1,85 @@
package cn.iocoder.yudao.module.system.service.attendance.attendancespecial;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.attendancespecial.AttendanceSpecialDO;
import cn.iocoder.yudao.module.system.dal.mysql.attendance.attendancespecial.AttendanceSpecialMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
/**
* 考勤特殊日期 Service 实现类
*
* @author 艾楷
*/
@Service
@Validated
public class AttendanceSpecialServiceImpl implements AttendanceSpecialService {
@Resource
private AttendanceSpecialMapper attendanceSpecialMapper;
@Override
public AttendanceSpecialDO getByGroupIdAndTimeAndType(Long groupId, String time, int type) {
List<AttendanceSpecialDO> attendanceSpecialDOS = attendanceSpecialMapper.selectList(new LambdaQueryWrapper<AttendanceSpecialDO>()
.eq(AttendanceSpecialDO::getAttendanceGroupId, groupId)
.eq(AttendanceSpecialDO::getDateTime, time)
.eq(AttendanceSpecialDO::getType, type));
if (CollUtil.isNotEmpty(attendanceSpecialDOS)) {
return attendanceSpecialDOS.get(0);
}
return null;
}
@Override
public List<AttendanceSpecialDO> getByGroupIdAndTime(Long groupId, String time) {
return attendanceSpecialMapper.selectList(new LambdaQueryWrapper<AttendanceSpecialDO>()
.eq(AttendanceSpecialDO::getAttendanceGroupId, groupId)
.eq(AttendanceSpecialDO::getDateTime, time));
}
@Override
public List<AttendanceSpecialDO> getByGroupIdsAndTime(List<Long> groupIds, String time) {
if (CollUtil.isEmpty(groupIds)) {
return Collections.emptyList();
}
return attendanceSpecialMapper.selectList(new LambdaQueryWrapper<AttendanceSpecialDO>()
.in(AttendanceSpecialDO::getAttendanceGroupId, groupIds)
.eq(AttendanceSpecialDO::getDateTime, time));
}
@Override
public List<AttendanceSpecialDO> getByGroupIdAndTimes(Long groupId, List<String> times) {
if (CollUtil.isEmpty(times)) {
return Collections.emptyList();
}
return attendanceSpecialMapper.selectList(new LambdaQueryWrapper<AttendanceSpecialDO>()
.eq(AttendanceSpecialDO::getAttendanceGroupId, groupId)
.in(AttendanceSpecialDO::getDateTime, times));
}
@Override
public List<AttendanceSpecialDO> getByGroupId(Long attendanceGroupId) {
return attendanceSpecialMapper.selectList(new LambdaQueryWrapper<AttendanceSpecialDO>()
.eq(AttendanceSpecialDO::getAttendanceGroupId, attendanceGroupId));
}
@Override
public void insertUpdateDeleteBatch(Long attendanceGroupId, List<List<AttendanceSpecialDO>> attendanceSpecialList) {
if (CollUtil.isNotEmpty(attendanceSpecialList.get(0))) {
attendanceSpecialList.get(0).forEach(a -> a.setAttendanceGroupId(attendanceGroupId));
attendanceSpecialMapper.insertBatch(attendanceSpecialList.get(0));
}
if (CollUtil.isNotEmpty(attendanceSpecialList.get(1))) {
attendanceSpecialMapper.updateBatch(attendanceSpecialList.get(1));
}
if (CollUtil.isNotEmpty(attendanceSpecialList.get(2))) {
attendanceSpecialMapper.deleteBatchIds(convertList(attendanceSpecialList.get(2), AttendanceSpecialDO::getId));
}
}
}

11
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/fixed/AttendanceFixedService.java
View File

@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedRespVO;
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedSaveReqVO;
import cn.iocoder.yudao.module.system.controller.admin.groupuser.vo.AttendanceGroupUserCreateOrDelVO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.attendancespecial.AttendanceSpecialDO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.fixed.AttendanceFixedDO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.group.AttendanceGroupDO;
@ -23,10 +23,11 @@ public interface AttendanceFixedService {
/**
* 创建固定班制考勤设置
*
* @param vos 创建信息
* @param vos 创建信息
* @param specialDOS
* @return 编号
*/
Long batchCreateOrUpdate(Long attendanceGroupId, @Valid List<AttendanceFixedSaveReqVO> vos);
Long batchCreateOrUpdate(Long attendanceGroupId, List<AttendanceFixedSaveReqVO> vos, List<AttendanceSpecialDO> specialDOS);
/**
* 更新固定班制考勤设置
@ -67,6 +68,8 @@ public interface AttendanceFixedService {
*/
AttendanceFixedDO getByGroupIdAndWeek(Long attendanceGroupId, Integer week);
List<AttendanceFixedDO> getByGroupIdAndWeeks(Long attendanceGroupId, List<Integer> weeks);
List<AttendanceFixedDO> getByGroupId(Long attendanceGroupId);
List<AttendanceFixedDO> getByGroupIdAndWeek(List<Long> attendanceGroupIds, Integer week);
@ -95,4 +98,4 @@ public interface AttendanceFixedService {
* @return
*/
List<Long> getUseGroupIds(Long shiftId);
}
}

159
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/fixed/AttendanceFixedServiceImpl.java
View File

@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.Constants;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.api.attendance.dto.AttendanceTimeRangeInfoDTO;
@ -18,11 +20,13 @@ import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedP
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedRespVO;
import cn.iocoder.yudao.module.system.controller.admin.fixed.vo.AttendanceFixedSaveReqVO;
import cn.iocoder.yudao.module.system.controller.admin.groupshift.vo.AttendanceGroupShiftVO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.attendancespecial.AttendanceSpecialDO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.fixed.AttendanceFixedDO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.group.AttendanceGroupDO;
import cn.iocoder.yudao.module.system.dal.dataobject.attendance.groupshiftitem.AttendanceGroupShiftItemDO;
import cn.iocoder.yudao.module.system.dal.mysql.attendance.fixed.AttendanceFixedMapper;
import cn.iocoder.yudao.module.system.service.attendance.AttendanceService;
import cn.iocoder.yudao.module.system.service.attendance.attendancespecial.AttendanceSpecialService;
import cn.iocoder.yudao.module.system.service.attendance.groupshift.AttendanceGroupShiftService;
import cn.iocoder.yudao.module.system.service.attendance.groupshiftitem.AttendanceGroupShiftItemService;
import cn.iocoder.yudao.module.system.service.attendance.punch.PunchService;
@ -40,6 +44,7 @@ import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.FIXED_NOT_EXISTS;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.THERE_ARE_DUPLICATE_SPECIAL_DATES;
/**
* 固定班制考勤设置 Service 实现类
@ -59,10 +64,12 @@ public class AttendanceFixedServiceImpl implements AttendanceFixedService, Punch
private AttendanceGroupShiftService attendanceGroupShiftService;
@Resource
private AttendanceGroupShiftItemService attendanceGroupShiftItemService;
@Resource
private AttendanceSpecialService attendanceSpecialService;
@Override
@Transactional(rollbackFor = Exception.class)
public Long batchCreateOrUpdate(Long attendanceGroupId, List<AttendanceFixedSaveReqVO> vos) {
public Long batchCreateOrUpdate(Long attendanceGroupId, List<AttendanceFixedSaveReqVO> vos, List<AttendanceSpecialDO> specialDOS) {
Long groupId = null;
// 插入
List<AttendanceFixedDO> oldList = attendanceFixedMapper.selectList(new LambdaQueryWrapper<AttendanceFixedDO>()
@ -105,6 +112,22 @@ public class AttendanceFixedServiceImpl implements AttendanceFixedService, Punch
attendanceFixedMapper.deleteBatchIds(delIds);
}
}
// - - - - - - - - - 特殊考勤日期 - - - - - - - -
if (CollUtil.isEmpty(specialDOS)) {
specialDOS = Collections.emptyList();
}
// -- 验证是否有同一天的数据 如果有则返回提醒
Map<String, List<AttendanceSpecialDO>> map = specialDOS.stream().collect(Collectors.groupingBy(AttendanceSpecialDO::getDateTime));
for (Map.Entry<String, List<AttendanceSpecialDO>> entry : map.entrySet()) {
if (entry.getValue().size() > 1) {
throw exception(THERE_ARE_DUPLICATE_SPECIAL_DATES);
}
}
//查询旧的
List<AttendanceSpecialDO> oldAttendanceSpecialDOS = attendanceSpecialService.getByGroupId(attendanceGroupId);
List<List<AttendanceSpecialDO>> attendanceSpecialList = CollectionUtils.diffList(oldAttendanceSpecialDOS, specialDOS,
(saveVal, newVal) -> ObjectUtil.equal(saveVal.getId(), newVal.getId()));
attendanceSpecialService.insertUpdateDeleteBatch(attendanceGroupId, attendanceSpecialList);
return groupId;
}
@ -152,6 +175,13 @@ public class AttendanceFixedServiceImpl implements AttendanceFixedService, Punch
return null;
}
@Override
public List<AttendanceFixedDO> getByGroupIdAndWeeks(Long attendanceGroupId, List<Integer> weeks) {
return attendanceFixedMapper.selectList(new LambdaQueryWrapper<AttendanceFixedDO>()
.eq(attendanceGroupId != null, AttendanceFixedDO::getAttendanceGroupId, attendanceGroupId)
.in(CollUtil.isNotEmpty(weeks), AttendanceFixedDO::getWeekTime, weeks));
}
@Override
public List<AttendanceFixedDO> getByGroupId(Long attendanceGroupId) {
return attendanceFixedMapper.selectList(new LambdaQueryWrapper<AttendanceFixedDO>()
@ -176,7 +206,23 @@ public class AttendanceFixedServiceImpl implements AttendanceFixedService, Punch
List<AttendanceFixedDO> makeUpClassList = this.getByGroupIdAndWeek(groupIds, 8);
Map<Long, List<AttendanceFixedDO>> makeUpClassListMap = makeUpClassList.stream().collect(Collectors.groupingBy(AttendanceFixedDO::getAttendanceGroupId));
Map<Long, List<AttendanceFixedDO>> attendanceFixedMap = attendanceFixedDOS.stream().collect(Collectors.groupingBy(AttendanceFixedDO::getAttendanceGroupId));
// -- 这里是考勤预设 - 不需要把加班的考勤规则考虑在内 - 需要考虑 必须打卡时间 - 和非必须打卡时间即可
List<AttendanceSpecialDO> specialDOS = attendanceSpecialService.getByGroupIdsAndTime(groupIds, localDateTime.format(Constants.REPO_DATE_FORMAT));
Map<String, AttendanceSpecialDO> specialMap = specialDOS.stream().collect(Collectors.toMap(a -> a.getAttendanceGroupId() + "_" + a.getType(), a -> a));
for (AttendanceGroupDO activationGroup : fixedList) {
AttendanceSpecialDO mustClockInTime = specialMap.get(activationGroup.getId() + "_" + 1);
// -- 判断是否有必须打卡时间 - 如果有的话直接摄入进去即可
if (mustClockInTime != null && mustClockInTime.getAttendanceGroupShiftId() != null) {
map.put(activationGroup.getId(), mustClockInTime.getAttendanceGroupShiftId());
continue;
}
// -- 判断是否有无需打卡时间 - 如果有的话直接返回 --- 无需打卡 直接返回结果
AttendanceSpecialDO noNeedToClockIn = specialMap.get(activationGroup.getId() + "_" + 0);
if (noNeedToClockIn != null) {
continue;
}
// -- 判断是否根据节假日自动排班 - 如果是的话 - 根据排班的来
Boolean isHolidayFlag = Constants.TRUE.equals(activationGroup.getAutoHolidaysFlag()) ?
attendanceService.isHoliday(localDateTime) : null;
@ -233,29 +279,47 @@ public class AttendanceFixedServiceImpl implements AttendanceFixedService, Punch
AttendancePunchPageVO vo = new AttendancePunchPageVO();
vo.setActivationGroup(dto.getActivationGroup());
AttendanceGroupDO activationGroup = dto.getActivationGroup();
// -- 判断是否根据节假日自动排班 - 如果是的话 - 根据排班的来
Boolean isHolidayFlag = Constants.TRUE.equals(activationGroup.getAutoHolidaysFlag()) ?
attendanceService.isHoliday(dto.getLocalDateTime()) : null;
// -- 先判断当前是否是节假日放假的日子 - 如果是的话 设为 -1 查询加班加班班次 如果不是的话 判断当前是否是补班 如果是的话设为8 为补班日 - 最后获取当前是周几（后续判断这个周几是否是有班次 - 没有的话再查询下 -1 是否有加班班次）
int week = isHolidayFlag != null && isHolidayFlag ? -1 : (isHolidayFlag != null ? 8 : dto.getLocalDateTime().getDayOfWeek().getValue());
AttendanceFixedDO attendanceFixedDO = this.getByGroupIdAndWeek(activationGroup.getId(), week);
// -- 当前没有班次 - 不需要考勤
if (attendanceFixedDO == null || attendanceFixedDO.getAttendanceGroupShiftId() == null) {
// -- 再获取一次加班班次 - 判断下是否有加班日 没有的话直接返回
if (week != -1) {
attendanceFixedDO = this.getByGroupIdAndWeek(activationGroup.getId(), -1);
if (attendanceFixedDO == null || attendanceFixedDO.getAttendanceGroupShiftId() == null) {
return vo.setTodayNeedAttendance(Constants.FALSE);
} else {
vo.setWorkOvertimeFlag(Constants.ONE);
}
} else {
Long attendanceGroupShiftId = null;
// todo aiKai 获取特殊打卡日期 - 判断是否有存在 - 如果有的话 - 则按照必打卡日期所设置的班次返回 - 如果没有的话再 去 判断其他
List<AttendanceSpecialDO> specialDOS = attendanceSpecialService.getByGroupIdAndTime(activationGroup.getId(), dto.getLocalDateTime().format(Constants.REPO_DATE_FORMAT));
Map<Integer, AttendanceSpecialDO> map = specialDOS.stream().collect(Collectors.toMap(AttendanceSpecialDO::getType, a -> a));
if (map.get(1) != null && map.get(1).getAttendanceGroupShiftId() != null) {
attendanceGroupShiftId = map.get(1).getAttendanceGroupShiftId();
} else if (map.get(0) != null) {
// 当前为 不需要打卡时间 - 判断是否有加班班次 - 如果没有的话 直接跳过
AttendanceFixedDO attendanceFixedDO = this.getByGroupIdAndWeek(activationGroup.getId(), -1);
if (attendanceFixedDO == null || attendanceFixedDO.getAttendanceGroupShiftId() == null) {
return vo.setTodayNeedAttendance(Constants.FALSE);
} else {
vo.setWorkOvertimeFlag(Constants.ONE);
attendanceGroupShiftId = attendanceFixedDO.getAttendanceGroupShiftId();
}
} else if (week == -1) {
vo.setWorkOvertimeFlag(Constants.ONE);
} else {
// -- 判断是否根据节假日自动排班 - 如果是的话 - 根据排班的来
Boolean isHolidayFlag = Constants.TRUE.equals(activationGroup.getAutoHolidaysFlag()) ?
attendanceService.isHoliday(dto.getLocalDateTime()) : null;
// -- 先判断当前是否是节假日放假的日子 - 如果是的话 设为 -1 查询加班加班班次 如果不是的话 判断当前是否是补班 如果是的话设为8 为补班日 - 最后获取当前是周几（后续判断这个周几是否是有班次 - 没有的话再查询下 -1 是否有加班班次）
int week = isHolidayFlag != null && isHolidayFlag ? -1 : (isHolidayFlag != null ? 8 : dto.getLocalDateTime().getDayOfWeek().getValue());
AttendanceFixedDO attendanceFixedDO = this.getByGroupIdAndWeek(activationGroup.getId(), week);
// -- 当前没有班次 - 不需要考勤
if (attendanceFixedDO == null || attendanceFixedDO.getAttendanceGroupShiftId() == null) {
// -- 再获取一次加班班次 - 判断下是否有加班日 没有的话直接返回
if (week != -1) {
attendanceFixedDO = this.getByGroupIdAndWeek(activationGroup.getId(), -1);
if (attendanceFixedDO == null || attendanceFixedDO.getAttendanceGroupShiftId() == null) {
return vo.setTodayNeedAttendance(Constants.FALSE);
} else {
vo.setWorkOvertimeFlag(Constants.ONE);
}
} else {
return vo.setTodayNeedAttendance(Constants.FALSE);
}
} else if (week == -1) {
vo.setWorkOvertimeFlag(Constants.ONE);
}
attendanceGroupShiftId = attendanceFixedDO.getAttendanceGroupShiftId();
}
vo.setAttendanceGroupShiftId(attendanceFixedDO.getAttendanceGroupShiftId());
vo.setAttendanceGroupShiftId(attendanceGroupShiftId);
attendanceService.calculatePunch(dto, vo);
vo.setAttendanceGroupId(activationGroup.getId());
vo.setUser(dto.getUser());
@ -300,30 +364,47 @@ public class AttendanceFixedServiceImpl implements AttendanceFixedService, Punch
@Override
public Map<String, AttendanceTimeRangeInfoVO> getAttendanceInfoByTimeRange(AttendanceTimeRangeInfoDTO dto) {
Map<String, AttendanceTimeRangeInfoVO> map = new HashMap<>();
List<AttendanceSpecialDO> attendanceSpecials = attendanceSpecialService.getByGroupIdAndTimes(dto.getGroupId(), dto.getTimes());
Map<String, AttendanceSpecialDO> specialDOMap = attendanceSpecials.stream().collect(Collectors.toMap(a -> a.getDateTime() + "_" + a.getType(), a -> a));
//不在考勤组
for (String time : dto.getTimes()) {
AttendanceTimeRangeInfoVO attendanceTimeRangeInfoVO = new AttendanceTimeRangeInfoVO();
// -- 判断是否根据节假日自动排班 - 如果是的话 - 根据排班的来
LocalDateTime localDateTime = LocalDateTimeUtil.parseDate(time, Constants.REPO_DATE_FORMAT).atStartOfDay();
Boolean holiday = attendanceService.isHoliday(localDateTime);
// -- 如果是节假日的话先插入下是节假日 - 不管上不上班
Boolean isHolidayFlag = Constants.TRUE.equals(dto.getAutoHolidaysFlag()) ?
holiday : null;
attendanceTimeRangeInfoVO.setDatType(isHolidayFlag != null && isHolidayFlag ? Constants.THREE : Constants.ONE);
// -- 当前是节假日 并且是放假
if (isHolidayFlag != null && isHolidayFlag) {
map.put(time, attendanceTimeRangeInfoVO);
continue;
}
//获取到当天是周几 - 如果是节假日补班的话 - 班次日期就是8
int week = isHolidayFlag != null ? 8 : localDateTime.getDayOfWeek().getValue();
AttendanceFixedDO attendanceFixedDO = this.getByGroupIdAndWeek(dto.getGroupId(), week);
// -- 当前没有班次 - 不需要考勤
if (attendanceFixedDO == null || attendanceFixedDO.getAttendanceGroupShiftId() == null) {
Long attendanceGroupShiftId = null;
// -- 判断是否有必须打卡时间 - 如果有的话直接摄入进去即可
AttendanceSpecialDO mustClockInTime = specialDOMap.get(time + "_" + 1);
// -- 判断是否有无需打卡时间 - 如果有的话直接返回 --- 无需打卡 直接返回结果
AttendanceSpecialDO noNeedToClockIn = specialDOMap.get(time + "_" + 0);
if (mustClockInTime != null && mustClockInTime.getAttendanceGroupShiftId() != null) {
attendanceGroupShiftId = mustClockInTime.getAttendanceGroupShiftId();
map.put(time, attendanceTimeRangeInfoVO.setDatType(Constants.ONE));
} else if (noNeedToClockIn != null) {
map.put(time, attendanceTimeRangeInfoVO.setDatType(Constants.TWO));
continue;
} else {
// -- 判断是否根据节假日自动排班 - 如果是的话 - 根据排班的来
LocalDateTime localDateTime = LocalDateTimeUtil.parseDate(time, Constants.REPO_DATE_FORMAT).atStartOfDay();
Boolean holiday = attendanceService.isHoliday(localDateTime);
// -- 如果是节假日的话先插入下是节假日 - 不管上不上班
Boolean isHolidayFlag = Constants.TRUE.equals(dto.getAutoHolidaysFlag()) ?
holiday : null;
attendanceTimeRangeInfoVO.setDatType(isHolidayFlag != null && isHolidayFlag ? Constants.THREE : Constants.ONE);
// -- 当前是节假日 并且是放假
if (isHolidayFlag != null && isHolidayFlag) {
map.put(time, attendanceTimeRangeInfoVO);
continue;
}
//获取到当天是周几 - 如果是节假日补班的话 - 班次日期就是8
int week = isHolidayFlag != null ? 8 : localDateTime.getDayOfWeek().getValue();
AttendanceFixedDO attendanceFixedDO = this.getByGroupIdAndWeek(dto.getGroupId(), week);
// -- 当前没有班次 - 不需要考勤
if (attendanceFixedDO == null || attendanceFixedDO.getAttendanceGroupShiftId() == null) {
map.put(time, attendanceTimeRangeInfoVO.setDatType(Constants.TWO));
continue;
}
attendanceGroupShiftId = attendanceFixedDO.getAttendanceGroupShiftId();
}
List<AttendanceGroupShiftItemDO> attendanceGroupShiftItemDOList = attendanceGroupShiftItemService.getGroupShiftItemListByShiftId(attendanceFixedDO.getAttendanceGroupShiftId());
// - 如果当前有班次 - 但是又不是需要打卡的时间 - 那么看有没有加班班次 - 有的话按照加班班次来 - 没有的话设为不需要打卡 - 解决单双休场景
List<AttendanceGroupShiftItemDO> attendanceGroupShiftItemDOList = attendanceGroupShiftItemService.getGroupShiftItemListByShiftId(attendanceGroupShiftId);
if (CollectionUtil.isNotEmpty(attendanceGroupShiftItemDOList)) {
List<AttendanceGroupShiftItemVO> items = BeanUtil.copyToList(attendanceGroupShiftItemDOList, AttendanceGroupShiftItemVO.class);
map.put(time, attendanceTimeRangeInfoVO.setNeedAttendance(1).setItems(items));

23
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java
View File

@ -371,12 +371,10 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
return users;
}
private void calculateUserAllHolidays(Map<Long, Map<LocalDateTime, BigDecimal>> userQuotaMap, Long
userId, Map<Long, HolidayUserDO> holidayUserDOMap,
HolidaySettingDO holidaySetting, HolidayBalanceSettingDO
holidayBalanceSettingDO, List<HolidayUserRecordDO> newHolidayUserRecordDOList,
List<HolidayUserDO> newHolidayUserDOList, LocalDateTime now, String remark, Integer direction, String
reason) {
private void calculateUserAllHolidays(Map<Long, Map<LocalDateTime, BigDecimal>> userQuotaMap, Long userId, Map<Long, HolidayUserDO> holidayUserDOMap,
HolidaySettingDO holidaySetting, HolidayBalanceSettingDO holidayBalanceSettingDO,
List<HolidayUserRecordDO> newHolidayUserRecordDOList, List<HolidayUserDO> newHolidayUserDOList,
LocalDateTime now, String remark, Integer direction, String reason) {
Map<LocalDateTime, BigDecimal> stringBigDecimalMap = userQuotaMap.get(userId);
if (MapUtil.isNotEmpty(stringBigDecimalMap)) {
HolidayUserDO holidayUserDO = holidayUserDOMap.get(userId);
@ -395,6 +393,7 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
holidayUserRecordDO.setExpiredTime(expiredTime);
LocalDateTime expirationReminderTime = expiredTime == null ? null : expiredTime.minusDays(holidayBalanceSettingDO.getReminderTimeNum());
holidayUserRecordDO.setExpirationReminderTime(expirationReminderTime);
holidayUserRecordDO.setExpirationReminderFlag(holidayBalanceSettingDO.getExpirationReminderFlag() == 0 ? 1 : 0);
holidayUserRecordDO.setRemainingBalance(localDateTimeBigDecimalEntry.getValue());
holidayUserRecordDO.setRemark(remark + localDateTimeBigDecimalEntry.getValue() + (holidaySetting.getMinUnit() == 3 ? "小时" : "天") + holidaySetting.getName());
holidayUserRecordDO.setReason(reason);
@ -425,12 +424,10 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
}
private void calculateUserHolidays(Map<Long, BigDecimal> userQuotaMap, Long
userId, Map<Long, HolidayUserDO> holidayUserDOMap,
HolidaySettingDO holidaySetting, HolidayBalanceSettingDO
holidayBalanceSettingDO, List<HolidayUserRecordDO> newHolidayUserRecordDOList,
List<HolidayUserDO> newHolidayUserDOList, LocalDateTime now, String remark, Integer direction, String
reason) {
private void calculateUserHolidays(Map<Long, BigDecimal> userQuotaMap, Long userId, Map<Long, HolidayUserDO> holidayUserDOMap,
HolidaySettingDO holidaySetting, HolidayBalanceSettingDO holidayBalanceSettingDO,
List<HolidayUserRecordDO> newHolidayUserRecordDOList, List<HolidayUserDO> newHolidayUserDOList,
LocalDateTime now, String remark, Integer direction, String reason) {
BigDecimal quota = userQuotaMap.get(userId);
// -- 如果是0的话就不记录了
if (quota == null || BigDecimal.ZERO.compareTo(quota) == 0) {
@ -451,7 +448,7 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
holidayUserRecordDO.setExpiredTime(expiredTime);
LocalDateTime expirationReminderTime = expiredTime == null ? null : expiredTime.minusDays(holidayBalanceSettingDO.getReminderTimeNum());
holidayUserRecordDO.setExpirationReminderTime(expirationReminderTime);
holidayUserRecordDO.setExpirationReminderFlag(expirationReminderTime == null ? 1 : 0);
holidayUserRecordDO.setExpirationReminderFlag(holidayBalanceSettingDO.getExpirationReminderFlag() == 0 ? 1 : (expirationReminderTime == null ? 1 : 0));
holidayUserRecordDO.setRemainingBalance(quota);
} else {
// -- 如果是扣除or提醒的话 这里直接是1 避免计算过期的时候再把他查出来

12
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/attendancespecial/AttendanceSpecialMapper.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.system.dal.mysql.attendance.attendancespecial.AttendanceSpecialMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>