问题处理

hx-oa/src/main/java/com/fjhx/oa/entity/adjust/po/AdjustSalaryApply.java

@@ -29,6 +29,11 @@ public class AdjustSalaryApply extends BasePo {
     private Long userId;
 
     /**
+     * 原薪资id
+     */
+    private Long oldUserSalaryId;
+
+    /**
      * 调薪日期
      */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")

hx-oa/src/main/java/com/fjhx/oa/entity/adjust/vo/AdjustSalaryApplyVo.java

@@ -1,9 +1,11 @@
 package com.fjhx.oa.entity.adjust.vo;
 
 import com.fjhx.oa.entity.adjust.po.AdjustSalaryApply;
+import com.fjhx.oa.entity.user.po.UserSalaryDetail;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -20,4 +22,20 @@ public class AdjustSalaryApplyVo extends AdjustSalaryApply {
 
     private List<AdjustSalaryDetailVo> userSalaryDetailList;
 
+    /**
+     * 历史计件薪资
+     */
+    private String oldPerfAmount;
+
+    /**
+     * 历史薪资合计
+     */
+    private BigDecimal oldAmount;
+
+    /**
+     * 历史薪资明细
+     */
+    private List<UserSalaryDetail> oldUserSalaryDetailList;
+
+
 }

hx-oa/src/main/java/com/fjhx/oa/flow/AdjustSalaryApplyFlow.java

@@ -3,6 +3,7 @@ package com.fjhx.oa.flow;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fjhx.common.enums.FlowStatusEnum1;
+import com.fjhx.common.utils.Assert;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.entity.ObsFile;
 import com.fjhx.file.utils.ObsFileUtil;
@@ -12,10 +13,12 @@ import com.fjhx.oa.entity.adjust.dto.AdjustSalaryApplyDto;
 import com.fjhx.oa.entity.adjust.po.AdjustSalaryApply;
 import com.fjhx.oa.entity.adjust.po.AdjustSalaryDetail;
 import com.fjhx.oa.entity.user.dto.UserSalaryManageDto;
+import com.fjhx.oa.entity.user.po.UserSalary;
 import com.fjhx.oa.entity.user.po.UserSalaryDetail;
 import com.fjhx.oa.service.adjust.AdjustSalaryApplyService;
 import com.fjhx.oa.service.adjust.AdjustSalaryDetailService;
 import com.fjhx.oa.service.user.UserSalaryManageService;
+import com.fjhx.oa.service.user.UserSalaryService;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.stereotype.Component;
 
@@ -33,6 +36,8 @@ public class AdjustSalaryApplyFlow extends FlowDelegate {
     private AdjustSalaryDetailService adjustSalaryDetailService;
     @Resource
     private UserSalaryManageService userSalaryManageService;
+    @Resource
+    private UserSalaryService userSalaryService;
 
     @Override
     public String getFlowKey() {
@@ -46,6 +51,11 @@ public class AdjustSalaryApplyFlow extends FlowDelegate {
         dto.setStatus(FlowStatusEnum1.UNDER_REVIEW.getKey());
         dto.setUserId(SecurityUtils.getUserId());
 
+        //赋值原薪资管理id
+        UserSalary oldUserSalary = userSalaryService.getOne(q -> q.eq(UserSalary::getUserId, dto.getUserId()).eq(UserSalary::getIsCurrentVer, 1));
+        Assert.notEmpty(oldUserSalary, "未找到历史薪资信息！");
+        dto.setOldUserSalaryId(oldUserSalary.getId());
+
         //回填用户名
         String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
         submitData.put("userName", nickName);

hx-oa/src/main/java/com/fjhx/oa/service/adjust/impl/AdjustSalaryApplyServiceImpl.java

@@ -9,9 +9,13 @@ import com.fjhx.oa.entity.adjust.po.AdjustSalaryApply;
 import com.fjhx.oa.entity.adjust.po.AdjustSalaryDetail;
 import com.fjhx.oa.entity.adjust.vo.AdjustSalaryApplyVo;
 import com.fjhx.oa.entity.adjust.vo.AdjustSalaryDetailVo;
+import com.fjhx.oa.entity.user.po.UserSalary;
+import com.fjhx.oa.entity.user.po.UserSalaryDetail;
 import com.fjhx.oa.mapper.adjust.AdjustSalaryApplyMapper;
 import com.fjhx.oa.service.adjust.AdjustSalaryApplyService;
 import com.fjhx.oa.service.adjust.AdjustSalaryDetailService;
+import com.fjhx.oa.service.user.UserSalaryDetailService;
+import com.fjhx.oa.service.user.UserSalaryService;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
@@ -38,6 +42,10 @@ public class AdjustSalaryApplyServiceImpl extends ServiceImpl<AdjustSalaryApplyM
 
     @Resource
     private AdjustSalaryDetailService adjustSalaryDetailService;
+    @Resource
+    private UserSalaryService userSalaryService;
+    @Resource
+    private UserSalaryDetailService userSalaryDetailService;
 
     @Override
     public Page<AdjustSalaryApplyVo> getPage(AdjustSalaryApplySelectDto dto) {
@@ -62,10 +70,17 @@ public class AdjustSalaryApplyServiceImpl extends ServiceImpl<AdjustSalaryApplyM
 
     @Override
     public AdjustSalaryApplyVo detail(Long id) {
-        AdjustSalaryApply AdjustSalaryApply = this.getById(id);
-        AdjustSalaryApplyVo result = BeanUtil.toBean(AdjustSalaryApply, AdjustSalaryApplyVo.class);
+        AdjustSalaryApplyVo result = BeanUtil.toBean(this.getById(id), AdjustSalaryApplyVo.class);
 
         setInfo(Collections.singletonList(result));
+
+        //赋值历史版本薪资信息
+        UserSalary oldUserSalary = userSalaryService.getById(result.getOldUserSalaryId());
+        result.setOldAmount(oldUserSalary.getAmount());
+        result.setOldPerfAmount(oldUserSalary.getPerfAmount());
+        List<UserSalaryDetail> oldList = userSalaryDetailService.list(q -> q.eq(UserSalaryDetail::getUserSalaryId, result.getOldUserSalaryId()));
+        result.setOldUserSalaryDetailList(oldList);
+
         return result;
     }
 

hx-oa/src/main/java/com/fjhx/oa/service/user/impl/UserSalaryServiceImpl.java

@@ -37,7 +37,6 @@ public class UserSalaryServiceImpl extends ServiceImpl<UserSalaryMapper, UserSal
 
     @Override
     public List<UserSalaryVo> getList(Consumer<LambdaQueryWrapper<UserSalary>> consumer) {
-        List<UserSalary> list = this.list(consumer);
         List<UserSalaryVo> userSalaryVos = BeanUtil.copyToList(this.list(consumer), UserSalaryVo.class);
         return userSalaryVos;
     }