年假管理更新
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
This commit is contained in:
parent
ab6a9e19db
commit
e1e37657f0
@ -27,6 +27,9 @@ public class NjglPageReqVO extends PageParam {
|
||||
@Schema(description = "部门名字", example = "张三")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "数据年份", example = "张三")
|
||||
private String year;
|
||||
|
||||
@Schema(description = "部门id", example = "14416")
|
||||
private Long deptId;
|
||||
|
||||
|
@ -30,6 +30,10 @@ public class NjglRespVO {
|
||||
@ExcelProperty("部门名字")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "数据年份", example = "张三")
|
||||
@ExcelProperty("数据年份")
|
||||
private String year;
|
||||
|
||||
@Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14416")
|
||||
@ExcelProperty("部门id")
|
||||
private Long deptId;
|
||||
|
@ -29,6 +29,9 @@ public class NjglSaveReqVO {
|
||||
@Schema(description = "部门名字", example = "张三")
|
||||
private String deptName;
|
||||
|
||||
@Schema(description = "数据年份", example = "张三")
|
||||
private String year;
|
||||
|
||||
@Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "14416")
|
||||
@NotNull(message = "部门id不能为空")
|
||||
private Long deptId;
|
||||
|
@ -34,6 +34,10 @@ public class NjglDO extends BaseDO {
|
||||
* 员工名字
|
||||
*/
|
||||
private String userName;
|
||||
/**
|
||||
* 数据年份
|
||||
*/
|
||||
private String year;
|
||||
/**
|
||||
* 员工id
|
||||
*/
|
||||
|
@ -23,6 +23,7 @@ public interface NjglMapper extends BaseMapperX<NjglDO> {
|
||||
.likeIfPresent(NjglDO::getUserName, reqVO.getUserName())
|
||||
.eqIfPresent(NjglDO::getUserId, reqVO.getUserId())
|
||||
.likeIfPresent(NjglDO::getDeptName, reqVO.getDeptName())
|
||||
.likeIfPresent(NjglDO::getYear, reqVO.getYear())
|
||||
.eqIfPresent(NjglDO::getDeptId, reqVO.getDeptId())
|
||||
.eqIfPresent(NjglDO::getAnnualDays, reqVO.getAnnualDays())
|
||||
.eqIfPresent(NjglDO::getUsedDays, reqVO.getUsedDays())
|
||||
|
@ -0,0 +1,169 @@
|
||||
package cn.iocoder.yudao.module.home.service.njgl;
|
||||
|
||||
import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserPageReqVO;
|
||||
import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
|
||||
import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
|
||||
import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper;
|
||||
import cn.iocoder.yudao.module.system.service.dept.DeptService;
|
||||
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
|
||||
import io.reactivex.rxjava3.core.Single;
|
||||
import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import cn.iocoder.yudao.module.home.controller.admin.njgl.vo.*;
|
||||
import cn.iocoder.yudao.module.home.dal.dataobject.njgl.NjglDO;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
||||
|
||||
import cn.iocoder.yudao.module.home.dal.mysql.njgl.NjglMapper;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
|
||||
import static cn.iocoder.yudao.module.home.enums.ErrorCodeConstants.*;
|
||||
|
||||
/**
|
||||
* 年假管理 Service 实现类
|
||||
*
|
||||
* @author 君风
|
||||
*/
|
||||
@Service
|
||||
@Validated
|
||||
public class NjglServiceImpl implements NjglService {
|
||||
|
||||
@Resource
|
||||
private NjglMapper njglMapper;
|
||||
@Resource
|
||||
private DeptService deptService;
|
||||
@Resource
|
||||
private AdminUserMapper userMapper;
|
||||
|
||||
/**
|
||||
* 获得用户列表后生成所有员工年假数据
|
||||
*/
|
||||
public void getUserList() {
|
||||
|
||||
//创建pageVo设置size-1
|
||||
UserPageReqVO userPageReqVO = new UserPageReqVO();
|
||||
userPageReqVO.setPageSize(-1);
|
||||
//获取全部成员列表
|
||||
List<AdminUserDO> userList = getUserPage(userPageReqVO).getList();
|
||||
createdNjData(userList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建年假数据
|
||||
* @param userList
|
||||
*/
|
||||
private void createdNjData(List<AdminUserDO> userList) {
|
||||
//创建saveVo对象,固定资源固定创建
|
||||
NjglSaveReqVO createReqVO = new NjglSaveReqVO();
|
||||
int date = LocalDateTime.now().getYear()-1;
|
||||
|
||||
createReqVO.setAnnualDays(10);
|
||||
createReqVO.setUsedDays(0);
|
||||
createReqVO.setRemainingDays(10);
|
||||
createReqVO.setYear(String.valueOf(date));
|
||||
createReqVO.setDataStatus(1);
|
||||
createReqVO.setStatus(1);
|
||||
createReqVO.setStartDate(LocalDateTime.now());
|
||||
createReqVO.setEndDate(LocalDateTime.now());
|
||||
createReqVO.setRemark("备注");
|
||||
|
||||
//创建NjglDo对象列表储存所有创建的年假对象
|
||||
List<NjglDO> njglList = new ArrayList<>();
|
||||
|
||||
//循环创建对象储存在njglList
|
||||
for (AdminUserDO adminUserDO : userList) {
|
||||
|
||||
DeptDO deptDO = deptService.getDept(adminUserDO.getDeptId());
|
||||
|
||||
if (deptDO != null) {
|
||||
createReqVO.setUserName(adminUserDO.getNickname());
|
||||
createReqVO.setUserId(adminUserDO.getId());
|
||||
createReqVO.setDeptId(adminUserDO.getDeptId());
|
||||
createReqVO.setDeptName(deptDO.getName());
|
||||
|
||||
// 转换为 NjglDO 对象并加入到批量列表
|
||||
NjglDO njgl = BeanUtils.toBean(createReqVO, NjglDO.class);
|
||||
njglList.add(njgl);
|
||||
}
|
||||
|
||||
}
|
||||
// 批量插入数据更快
|
||||
if (!njglList.isEmpty()) {
|
||||
njglMapper.insertBatch(njglList); // 假设有批量插入方法
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户列表
|
||||
* @param reqVO
|
||||
* @return
|
||||
*/
|
||||
public PageResult<AdminUserDO> getUserPage(UserPageReqVO reqVO) {
|
||||
return userMapper.selectPage(reqVO, getDeptCondition(reqVO.getDeptId()));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获得部门条件:查询指定部门的子部门编号们,包括自身
|
||||
* @param deptId 部门编号
|
||||
* @return 部门编号集合
|
||||
*/
|
||||
private Set<Long> getDeptCondition(Long deptId) {
|
||||
if (deptId == null) {
|
||||
return Collections.emptySet();
|
||||
}
|
||||
Set<Long> deptIds = convertSet(deptService.getChildDeptList(deptId), DeptDO::getId);
|
||||
deptIds.add(deptId); // 包括自身
|
||||
return deptIds;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long createNjgl(NjglSaveReqVO createReqVO) {
|
||||
// 插入
|
||||
NjglDO njgl = BeanUtils.toBean(createReqVO, NjglDO.class);
|
||||
njglMapper.insert(njgl);
|
||||
// 返回
|
||||
return njgl.getId();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateNjgl(NjglSaveReqVO updateReqVO) {
|
||||
// 校验存在
|
||||
validateNjglExists(updateReqVO.getId());
|
||||
// 更新
|
||||
NjglDO updateObj = BeanUtils.toBean(updateReqVO, NjglDO.class);
|
||||
njglMapper.updateById(updateObj);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteNjgl(Long id) {
|
||||
// 校验存在
|
||||
validateNjglExists(id);
|
||||
// 删除
|
||||
njglMapper.deleteById(id);
|
||||
}
|
||||
|
||||
private void validateNjglExists(Long id) {
|
||||
if (njglMapper.selectById(id) == null) {
|
||||
throw exception(NJGL_NOT_EXISTS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public NjglDO getNjgl(Long id) {
|
||||
return njglMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<NjglDO> getNjglPage(NjglPageReqVO pageReqVO) {
|
||||
// getUserList();
|
||||
return njglMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user