From d9b592fab960a01dededf3f0db49dbd455c35219 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 14 Feb 2023 08:42:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=A6=BB?= =?UTF-8?q?=E8=81=8C=E8=B0=83=E6=95=B4=EF=BC=9B=E6=8F=90=E4=BA=A4=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/entity/dto/SysUserVo.java | 2 +- .../service/impl/SysUserLeaveServiceImpl.java | 1 + .../sys/service/impl/SysUserServiceImpl.java | 19 ++++++++++++------- .../modules/vtb/entity/VtbVerification.java | 3 +++ .../vtb/entity/VtbVerificationSubject.java | 3 +++ .../impl/VtbVerificationServiceImpl.java | 2 ++ 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java index e497cf95..8900b609 100644 --- a/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java +++ b/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserVo.java @@ -32,7 +32,7 @@ public class SysUserVo { /** 性别【0->女；1->男】 */ private Integer gender; - /** 在职状态【0->离职；1->在职】 */ + /** 在职状态【0->离职；1->在职 ;2->将离职】 */ private Integer servingState; /** 权限编码 */ diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLeaveServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLeaveServiceImpl.java index aae85d2e..d289dc74 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLeaveServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLeaveServiceImpl.java @@ -23,6 +23,7 @@ public class SysUserLeaveServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(SysUserLeave::getUserId,userId); + lqw.eq(SysUserLeave::getLeaveStatus,0); return getOne(lqw,false); } } diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java index 631b64f3..509b6602 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java @@ -159,19 +159,20 @@ public class SysUserServiceImpl extends ServiceImpl impl public void leave(SysUserLeaveBo param) { LocalDate currDate = LocalDate.now(); SysUser leaveUser = this.getById(param.getUserId()); - if(currDate.isBefore(param.getLeaveEffectDate())){ + if(currDate.isAfter(param.getLeaveEffectDate())){ Assert.throwEx("离职日期必须大于等于今天"); } if(leaveUser.getServingState().equals(0)){ Assert.throwEx("员工已离职"); } - LambdaQueryWrapper leaveLqw = new LambdaQueryWrapper<>(); - leaveLqw.eq(SysUserLeave::getUserId,param.getUserId()); - leaveLqw.eq(SysUserLeave::getLeaveStatus,0); - SysUserLeave userLeaveObj = sysUserLeaveService.getOne(leaveLqw); + SysUserLeave userLeaveObj = sysUserLeaveService.getOneByUserId(param.getUserId()); if(userLeaveObj==null){ userLeaveObj = new SysUserLeave(); } + userLeaveObj.setLeaveEffectDate(param.getLeaveEffectDate()); + userLeaveObj.setUserId(leaveUser.getId()); + userLeaveObj.setUserName(leaveUser.getName()); + userLeaveObj.setUserCode(leaveUser.getCode()); if(StringUtils.hasText(param.getCusUserId())){ SysUser cusUser = this.getById(param.getCusUserId()); userLeaveObj.setCusUserId(cusUser.getId()); @@ -189,9 +190,13 @@ public class SysUserServiceImpl extends ServiceImpl impl userLeaveObj.setRoleUserId(roleUser.getId()); userLeaveObj.setRoleUserCode(roleUser.getCode()); userLeaveObj.setRoleUserName(roleUser.getName()); + }else { + userLeaveObj.setRoleUserId(""); + userLeaveObj.setRoleUserCode(""); + userLeaveObj.setRoleUserName(""); } userLeaveObj.setLeaveReason(param.getLeaveReason()); - sysUserLeaveService.save(userLeaveObj); + sysUserLeaveService.saveOrUpdate(userLeaveObj); //更新员工信息 SysUser user = new SysUser(); user.setId(leaveUser.getId()); @@ -216,7 +221,7 @@ public class SysUserServiceImpl extends ServiceImpl impl Assert.throwEx("非准备离职状态，取消失败"); } SysUser user = new SysUser(); - user.setId(user.getId()); + user.setId(sysUser.getId()); user.setServingState(1); this.updateById(user); LambdaQueryWrapper leaveLqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index 262a1f3c..051a4718 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -60,6 +60,9 @@ public class VtbVerification implements Serializable { /** 金额 */ private BigDecimal amount; + /** 申请时金额记录 */ + private BigDecimal amountRecord; + private String syFormId; private String syFlowId; diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java index 70020c49..9f6e0dea 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java @@ -73,6 +73,9 @@ public class VtbVerificationSubject implements Serializable { @NotNull(message = "本次核销额不能为空") private BigDecimal usedAmount; + /** 申请时本次核销额 */ + private BigDecimal usedAmountRecord; + /** 已支付核销费用 */ private BigDecimal payAmount; diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 00dba0f7..9e683f56 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -257,6 +257,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl