yudao-team/oa-master
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

请假管理
Some checks are pending
Java CI with Maven / build (11) (push) Waiting to run
Details
Java CI with Maven / build (17) (push) Waiting to run
Details
Java CI with Maven / build (8) (push) Waiting to run
Details
yudao-ui-admin CI / build (14.x) (push) Waiting to run
Details
yudao-ui-admin CI / build (16.x) (push) Waiting to run
Details

Browse Source
This commit is contained in:
XaoLi717 2024-12-19 08:39:59 +08:00
parent 280d448a0f
commit 9af85471e3
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/qjgl/QjglServiceImpl.java
View File

@ -154,16 +154,9 @@ public class QjglServiceImpl implements QjglService {
if (njglDO == null) {
return false;
}
NjglRespVO njglRespVO = BeanUtils.toBean(njglDO, NjglRespVO.class);
upDataRespVo(njglRespVO,qjgl);
//这里在是不用判断是不是剩余天数不够 而是在前端实现
// if ((njglRespVO.getUsedDays().compareTo(BigDecimal.valueOf(10)) > 0)&&(njglRespVO.getRemainingDays().compareTo(BigDecimal.ZERO) < 0)) {
// return false;
// }
upDataNjglDao(njglDO,qjgl);
// 更新
NjglDO updateObj = BeanUtils.toBean(njglRespVO, NjglDO.class);
njglMapper.updateById(updateObj);
njglMapper.updateById(njglDO);
return true;
}
@ -186,10 +179,10 @@ public class QjglServiceImpl implements QjglService {
return pageResult.getList().get(0);
}
private void upDataRespVo(NjglRespVO njglRespVO, QjglDO qjgl) {
njglRespVO.setStatus(1);
njglRespVO.setRemainingDays(njglRespVO.getRemainingDays().subtract(qjgl.getDay()));
njglRespVO.setUsedDays(njglRespVO.getUsedDays().add(qjgl.getDay()));
private void upDataNjglDao(NjglDO njglDO, QjglDO qjgl) {
njglDO.setStatus(1);
njglDO.setRemainingDays(njglDO.getRemainingDays().subtract(qjgl.getDay()));
njglDO.setUsedDays(njglDO.getUsedDays().add(qjgl.getDay()));
}
@Override

14
yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/service/xjgl/XjglServiceImpl.java
View File

@ -130,20 +130,16 @@ public class XjglServiceImpl implements XjglService {
if (njglDO == null) {
return false;
}
// 把年假do转换为 njglRespVo类型
NjglRespVO njglRespVO = BeanUtils.toBean(njglDO, NjglRespVO.class);
//这里后面判断一下是不是年假类型,是年假类型才更改数据
// 这里是和请假逻辑最不一样的地方 主要是对数据的处理 ,
// 这里是销假所以 减少使用天数 增加 剩余天数
// 请假相反 并且还要处理数据状态
upDataRespVo2(njglRespVO,xjglDO);
upDataNjglDo(njglDO,xjglDO);
// if ((njglRespVO.getUsedDays().compareTo(BigDecimal.ZERO) < 0)&&(njglRespVO.getRemainingDays().compareTo(BigDecimal.valueOf(10)) > 0)) {
// return false;
// }
// 更新数据 返回true
NjglDO updateObj = BeanUtils.toBean(njglRespVO, NjglDO.class);
njglMapper.updateById(updateObj);
njglMapper.updateById(njglDO);
return true;
}
@ -169,9 +165,9 @@ public class XjglServiceImpl implements XjglService {
}
// 和请假管理主要是这里不同 不同的处理数据的逻辑
private void upDataRespVo2(NjglRespVO njglRespVO, XjglDO xjglDO) {
njglRespVO.setRemainingDays(njglRespVO.getRemainingDays().add(xjglDO.getDay()));
njglRespVO.setUsedDays(njglRespVO.getUsedDays().subtract(xjglDO.getDay()));
private void upDataNjglDo(NjglDO njglDO, XjglDO xjglDO) {
njglDO.setRemainingDays(njglDO.getRemainingDays().add(xjglDO.getDay()));
njglDO.setUsedDays(njglDO.getUsedDays().subtract(xjglDO.getDay()));
}
@Override