添加用户离职调整；提交核销添加历史字段

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;
 
     /** 权限编码 */

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLeaveServiceImpl.java

@@ -23,6 +23,7 @@ public class SysUserLeaveServiceImpl extends ServiceImpl<SysUserLeaveMapper,SysU
     public SysUserLeave getOneByUserId(String userId) {
         LambdaQueryWrapper<SysUserLeave> lqw = new LambdaQueryWrapper<>();
         lqw.eq(SysUserLeave::getUserId,userId);
+        lqw.eq(SysUserLeave::getLeaveStatus,0);
         return getOne(lqw,false);
     }
 }

src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java

@@ -159,19 +159,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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<SysUserLeave> leaveLqw = new LambdaQueryWrapper<>();
+        SysUserLeave userLeaveObj = sysUserLeaveService.getOneByUserId(param.getUserId());
-        leaveLqw.eq(SysUserLeave::getUserId,param.getUserId());
-        leaveLqw.eq(SysUserLeave::getLeaveStatus,0);
-        SysUserLeave userLeaveObj = sysUserLeaveService.getOne(leaveLqw);
         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<SysUserMapper, SysUser> 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<SysUserMapper, SysUser> impl
             Assert.throwEx("非准备离职状态，取消失败");
         }
         SysUser user = new SysUser();
-        user.setId(user.getId());
+        user.setId(sysUser.getId());
         user.setServingState(1);
         this.updateById(user);
         LambdaQueryWrapper<SysUserLeave> leaveLqw = new LambdaQueryWrapper<>();

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;

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;
 

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -257,6 +257,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             totalAmount = totalAmount.add(verificationSubject.getUsedAmount());
         }
         verification.setAmount(totalAmount);
+        verification.setAmountRecord(totalAmount);
         //保存
         this.saveOrUpdate(verification);
         this.commitSy(activity.getActTitle(),sysUser,verification);
@@ -434,6 +435,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             verificationSubject.setSupplierCode(supplier.getCode());
             verificationSubject.setSupplierName(supplier.getName());
             verificationSubject.setUsedAmount(subjectBo.getAmount());
+            verificationSubject.setUsedAmountRecord(subjectBo.getAmount());
             verificationSubject.setCountPerson(subjectBo.getCountPerson());
             verificationSubject.setCountSession(subjectBo.getCountSession());
             verificationSubject.setRemark(subjectBo.getRemark());