薪资管理代码整理

hx-oa/src/main/java/com/fjhx/oa/controller/user/UserSalaryController.java

@@ -1,34 +1,36 @@
 package com.fjhx.oa.controller.user;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.user.dto.UserSalaryDto;
 import com.fjhx.oa.entity.user.dto.UserSalarySelectDto;
 import com.fjhx.oa.entity.user.vo.UserSalaryVo;
 import com.fjhx.oa.service.user.UserSalaryService;
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 
 /**
  * <p>
- * 用户薪资备份表 前端控制器
+ * 用户薪资 前端控制器
  * </p>
  *
  * @author
  * @since 2024-06-18
  */
 @RestController
-@RequestMapping("/userSalary")
+@RequestMapping("/userSalaryManage")
 public class UserSalaryController {
 
-    @Autowired
+    @Resource
     private UserSalaryService userSalaryService;
 
     /**
-     * 用户薪资备份表分页
+     * 员工薪资管理分页
      */
     @PostMapping("/page")
     public Page<UserSalaryVo> page(@RequestBody UserSalarySelectDto dto) {
@@ -36,11 +38,28 @@ public class UserSalaryController {
     }
 
     /**
-     * 用户薪资备份表明细
+     * 员工薪资管理明细
      */
     @PostMapping("/detail")
-    public UserSalaryVo detail(@RequestBody BaseSelectDto dto) {
-        return userSalaryService.detail(dto.getId());
+    public UserSalaryVo detail(@RequestBody UserSalaryDto dto) {
+        return userSalaryService.detail(dto.getUserId());
+    }
+
+    /**
+     * 员工薪资管理新增
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody UserSalaryDto userSalaryManageDto) {
+        userSalaryService.edit(userSalaryManageDto);
+    }
+
+
+    /**
+     * 获取历史版本结构
+     */
+    @PostMapping("/getHistoryVerList")
+    List<UserSalaryVo> getHistoryVerList(@RequestBody UserSalaryDto dto) {
+        return userSalaryService.getHistoryVerList(dto.getUserId());
     }
 
 }

hx-oa/src/main/java/com/fjhx/oa/controller/user/UserSalaryManageController.java

@@ -1,65 +0,0 @@
-package com.fjhx.oa.controller.user;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.oa.entity.user.dto.UserSalaryManageDto;
-import com.fjhx.oa.entity.user.dto.UserSalaryManageSelectDto;
-import com.fjhx.oa.entity.user.vo.UserSalaryManageVo;
-import com.fjhx.oa.entity.user.vo.UserSalaryVo;
-import com.fjhx.oa.service.user.UserSalaryManageService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-/**
- * <p>
- * 员工薪资管理 前端控制器
- * </p>
- *
- * @author _
- * @since 2024-06-11
- */
-@RestController
-@RequestMapping("/userSalaryManage")
-public class UserSalaryManageController {
-
-    @Resource
-    private UserSalaryManageService userSalaryManageService;
-
-    /**
-     * 员工薪资管理分页
-     */
-    @PostMapping("/page")
-    public Page<UserSalaryManageVo> page(@RequestBody UserSalaryManageSelectDto dto) {
-        return userSalaryManageService.getPage(dto);
-    }
-
-    /**
-     * 员工薪资管理明细
-     */
-    @PostMapping("/detail")
-    public UserSalaryManageVo detail(@RequestBody UserSalaryManageDto dto) {
-        return userSalaryManageService.detail(dto.getUserId());
-    }
-
-    /**
-     * 员工薪资管理新增
-     */
-    @PostMapping("/edit")
-    public void edit(@RequestBody UserSalaryManageDto userSalaryManageDto) {
-        userSalaryManageService.edit(userSalaryManageDto);
-    }
-
-
-    /**
-     * 获取历史版本结构
-     */
-    @PostMapping("/getHistoryVerList")
-    List<UserSalaryVo> getHistoryVerList(@RequestBody UserSalaryManageDto dto) {
-        return userSalaryManageService.getHistoryVerList(dto.getUserId());
-    }
-}

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

@@ -25,7 +25,7 @@ public class AdjustSalaryApplyVo extends AdjustSalaryApply {
     /**
      * 历史计件薪资
      */
-    private String oldPerfAmount;
+    private BigDecimal oldPerfAmount;
 
     /**
      * 历史薪资合计

hx-oa/src/main/java/com/fjhx/oa/entity/user/dto/UserSalaryDto.java

@@ -1,11 +1,15 @@
 package com.fjhx.oa.entity.user.dto;
 
+import com.fjhx.file.entity.ObsFile;
 import com.fjhx.oa.entity.user.po.UserSalary;
+import com.fjhx.oa.entity.user.po.UserSalaryDetail;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
- * 用户薪资备份表新增编辑入参实体
+ * 用户薪资新增编辑入参实体
  *
  * @author
  * @since 2024-06-18
@@ -13,5 +17,12 @@ import lombok.Setter;
 @Getter
 @Setter
 public class UserSalaryDto extends UserSalary {
-
+    /**
+     * 薪资明细
+     */
+    List<UserSalaryDetail> userSalaryDetailList;
+    /**
+     * 签名文件 类型10
+     */
+    private List<ObsFile> fileList;
 }

hx-oa/src/main/java/com/fjhx/oa/entity/user/dto/UserSalaryManageDto.java

@@ -1,28 +0,0 @@
-package com.fjhx.oa.entity.user.dto;
-
-import com.fjhx.file.entity.ObsFile;
-import com.fjhx.oa.entity.user.po.UserSalaryDetail;
-import com.fjhx.oa.entity.user.po.UserSalaryManage;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 员工薪资管理新增编辑入参实体
- *
- * @author
- * @since 2024-06-11
- */
-@Getter
-@Setter
-public class UserSalaryManageDto extends UserSalaryManage {
-    /**
-     * 薪资明细
-     */
-    List<UserSalaryDetail> userSalaryDetailList;
-    /**
-     * 签名文件 类型10
-     */
-    private List<ObsFile> fileList;
-}

hx-oa/src/main/java/com/fjhx/oa/entity/user/dto/UserSalaryManageSelectDto.java

@@ -1,17 +0,0 @@
-package com.fjhx.oa.entity.user.dto;
-
-import com.ruoyi.common.core.domain.BaseSelectDto;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 员工薪资管理列表查询入参实体
- *
- * @author
- * @since 2024-06-11
- */
-@Getter
-@Setter
-public class UserSalaryManageSelectDto extends BaseSelectDto {
-
-}

hx-oa/src/main/java/com/fjhx/oa/entity/user/dto/UserSalarySelectDto.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 用户薪资备份表列表查询入参实体
+ * 用户薪资列表查询入参实体
  *
  * @author
  * @since 2024-06-18

hx-oa/src/main/java/com/fjhx/oa/entity/user/po/UserSalary.java

@@ -1,6 +1,7 @@
 package com.fjhx.oa.entity.user.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,7 +12,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 用户薪资备份表
+ * 用户薪资
  * </p>
  *
  * @author
@@ -40,7 +41,7 @@ public class UserSalary extends BasePo {
     /**
      * 10实习员工、20试用员工、30正式员工
      */
-    private String employeeType;
+    private Integer employeeType;
 
     /**
      * 试用期薪资比例
@@ -55,7 +56,7 @@ public class UserSalary extends BasePo {
     /**
      * 计件薪资
      */
-    private String perfAmount;
+    private BigDecimal perfAmount;
 
     /**
      * 薪资合计
@@ -80,16 +81,19 @@ public class UserSalary extends BasePo {
     /**
      * 入职日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date entryDate;
 
     /**
      * 生效日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date effectiveDate;
 
     /**
      * 转正日期
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date fullTimeDate;
 
     /**
@@ -105,21 +109,25 @@ public class UserSalary extends BasePo {
     /**
      * 上午开始工作时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
     private Time morningBeginTime;
 
     /**
      * 上午结束工作时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
     private Time morningEndTime;
 
     /**
      * 下午开始工作时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
     private Time afternoonBeginTime;
 
     /**
      * 下午结束工作时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
     private Time afternoonEndTime;
 
     /**

hx-oa/src/main/java/com/fjhx/oa/entity/user/vo/UserSalaryHistoryVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.oa.entity.user.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.Date;
-
-@Getter
-@Setter
-public class UserSalaryHistoryVo {
-
-    private Long user_id;
-    private Integer data_ver;
-    private Date create_time;
-    private Date update_time;
-
-}

hx-oa/src/main/java/com/fjhx/oa/entity/user/vo/UserSalaryManageVo.java

@@ -1,35 +0,0 @@
-package com.fjhx.oa.entity.user.vo;
-
-import com.fjhx.file.entity.FileInfoVo;
-import com.fjhx.oa.entity.user.po.UserSalaryDetail;
-import com.fjhx.oa.entity.user.po.UserSalaryManage;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * 员工薪资管理列表查询返回值实体
- *
- * @author
- * @since 2024-06-11
- */
-@Getter
-@Setter
-public class UserSalaryManageVo extends UserSalaryManage {
-
-    private String companyName;
-    private String deptName;
-    private String deptNames;
-
-    /**
-     * 薪资明细
-     */
-    private List<UserSalaryDetail> userSalaryDetailList;
-
-    /**
-     * 附件信息
-     */
-    private List<FileInfoVo> fileList;
-
-}

hx-oa/src/main/java/com/fjhx/oa/entity/user/vo/UserSalaryVo.java

@@ -1,5 +1,6 @@
 package com.fjhx.oa.entity.user.vo;
 
+import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.oa.entity.user.po.UserSalary;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,7 +8,7 @@ import lombok.Setter;
 import java.util.List;
 
 /**
- * 用户薪资备份表列表查询返回值实体
+ * 用户薪资列表查询返回值实体
  *
  * @author
  * @since 2024-06-18
@@ -20,4 +21,17 @@ public class UserSalaryVo extends UserSalary {
 
     private List<UserSalaryDetailVo> userSalaryDetailList;
 
+    private Long companyId;
+    private Long deptId;
+
+    private String companyName;
+    private String deptName;
+    private String deptNames;
+
+
+    /**
+     * 附件信息
+     */
+    private List<FileInfoVo> fileList;
+
 }

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

@@ -12,7 +12,7 @@ import com.fjhx.flow.enums.FlowStatusEnum;
 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.dto.UserSalaryDto;
 import com.fjhx.oa.entity.user.po.UserSalary;
 import com.fjhx.oa.entity.user.po.UserSalaryDetail;
 import com.fjhx.oa.service.adjust.AdjustSalaryApplyService;
@@ -98,11 +98,11 @@ public class AdjustSalaryApplyFlow extends FlowDelegate {
         List<AdjustSalaryDetail> list = adjustSalaryDetailService.list(q -> q.eq(AdjustSalaryDetail::getAdjustSalaryId, businessId));
 
         //更新用户薪资
-        UserSalaryManageDto userSalaryManageDto = BeanUtil.copyProperties(byId, UserSalaryManageDto.class);
+        UserSalaryDto userSalaryManageDto = BeanUtil.copyProperties(byId, UserSalaryDto.class);
         userSalaryManageDto.setFileList(BeanUtil.copyToList(fileMap.get(businessId), ObsFile.class));
         userSalaryManageDto.setUserSalaryDetailList(BeanUtil.copyToList(list, UserSalaryDetail.class));
         userSalaryManageDto.getUserSalaryDetailList().forEach(item -> item.setId(null));
 
-        userSalaryManageService.edit(userSalaryManageDto);
+        userSalaryService.edit(userSalaryManageDto);
     }
 }

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

@@ -7,10 +7,11 @@ import com.fjhx.flow.core.FlowDelegate;
 import com.fjhx.flow.enums.FlowStatusEnum;
 import com.fjhx.oa.entity.promotion.dto.PromotionApplyDto;
 import com.fjhx.oa.entity.promotion.po.PromotionApply;
-import com.fjhx.oa.entity.user.dto.UserSalaryManageDto;
-import com.fjhx.oa.entity.user.vo.UserSalaryManageVo;
+import com.fjhx.oa.entity.user.dto.UserSalaryDto;
+import com.fjhx.oa.entity.user.vo.UserSalaryVo;
 import com.fjhx.oa.service.promotion.PromotionApplyService;
 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;
 
@@ -23,6 +24,8 @@ public class PromotionApplyFlow extends FlowDelegate {
     private PromotionApplyService promotionApplyService;
     @Resource
     private UserSalaryManageService userSalaryManageService;
+    @Resource
+    private UserSalaryService userSalaryService;
 
     @Override
     public String getFlowKey() {
@@ -68,11 +71,11 @@ public class PromotionApplyFlow extends FlowDelegate {
                 .set(PromotionApply::getStatus, FlowStatusEnum1.PASS.getKey())
         );
         //更新用户薪资
-        UserSalaryManageVo detail = userSalaryManageService.detail(byId.getCreateUser());
-        UserSalaryManageDto userSalaryManageDto = BeanUtil.copyProperties(detail, UserSalaryManageDto.class);
+        UserSalaryVo detail = userSalaryService.detail(byId.getCreateUser());
+        UserSalaryDto userSalaryManageDto = BeanUtil.copyProperties(detail, UserSalaryDto.class);
         userSalaryManageDto.setEmployeeType(byId.getEmployeeType());
         userSalaryManageDto.setFullTimeDate(byId.getPromotionDate());
         userSalaryManageDto.setEffectiveDate(byId.getPromotionDate());
-        userSalaryManageService.edit(userSalaryManageDto);
+        userSalaryService.edit(userSalaryManageDto);
     }
 }

hx-oa/src/main/java/com/fjhx/oa/mapper/user/UserSalaryManageMapper.java

@@ -1,15 +1,8 @@
 package com.fjhx.oa.mapper.user;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.oa.entity.user.po.UserSalaryManage;
-import com.fjhx.oa.entity.user.vo.UserSalaryHistoryVo;
-import com.fjhx.oa.entity.user.vo.UserSalaryManageVo;
-import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 
 /**
@@ -22,15 +15,4 @@ import java.util.List;
  */
 @Mapper
 public interface UserSalaryManageMapper extends BaseMapper<UserSalaryManage> {
-
-    /**
-     * 员工薪资管理分页
-     */
-    Page<UserSalaryManageVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Object> wrapper);
-
-    List<UserSalaryManageVo> getPage(@Param("ew") IWrapper<Object> wrapper);
-
-    UserSalaryManageVo getDetail(@Param("userId") Long userId);
-
-    List<UserSalaryHistoryVo> getHistoryVerList(@Param("userId") Long userId);
 }

hx-oa/src/main/java/com/fjhx/oa/mapper/user/UserSalaryMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
- * 用户薪资备份表 Mapper 接口
+ * 用户薪资 Mapper 接口
  * </p>
  *
  * @author
@@ -19,8 +19,12 @@ import org.apache.ibatis.annotations.Param;
 public interface UserSalaryMapper extends BaseMapper<UserSalary> {
 
     /**
-     * 用户薪资备份表分页
+     * 员工薪资管理分页
      */
-    Page<UserSalaryVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<UserSalary> wrapper);
+    Page<UserSalaryVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Object> wrapper);
+
+
+    UserSalaryVo getDetail(@Param("userId") Long userId);
+
 
 }

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

@@ -1,39 +1,11 @@
 package com.fjhx.oa.service.user;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.oa.entity.user.dto.UserSalaryManageDto;
-import com.fjhx.oa.entity.user.dto.UserSalaryManageSelectDto;
 import com.fjhx.oa.entity.user.po.UserSalaryManage;
-import com.fjhx.oa.entity.user.vo.UserSalaryManageVo;
-import com.fjhx.oa.entity.user.vo.UserSalaryVo;
-
-import java.util.List;
 
 
 /**
  * 员工薪资管理 服务类
  */
 public interface UserSalaryManageService extends IService<UserSalaryManage> {
-
-    /**
-     * 员工薪资管理分页
-     */
-    Page<UserSalaryManageVo> getPage(UserSalaryManageSelectDto dto);
-
-    /**
-     * 员工薪资管理明细
-     */
-    UserSalaryManageVo detail(Long id);
-
-    /**
-     * 员工薪资管理编辑
-     */
-    void edit(UserSalaryManageDto userSalaryManageDto);
-
-    /**
-     * 获取历史版本结构
-     */
-    List<UserSalaryVo> getHistoryVerList(Long userId);
-
 }

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

@@ -2,6 +2,7 @@ package com.fjhx.oa.service.user;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.user.dto.UserSalaryDto;
 import com.fjhx.oa.entity.user.dto.UserSalarySelectDto;
 import com.fjhx.oa.entity.user.po.UserSalary;
 import com.fjhx.oa.entity.user.vo.UserSalaryVo;
@@ -13,7 +14,7 @@ import java.util.function.Consumer;
 
 /**
  * <p>
- * 用户薪资备份表 服务类
+ * 用户薪资 服务类
  * </p>
  *
  * @author
@@ -22,15 +23,24 @@ import java.util.function.Consumer;
 public interface UserSalaryService extends BaseService<UserSalary> {
 
     /**
-     * 用户薪资备份表分页
+     * 用户薪资分页
      */
     Page<UserSalaryVo> getPage(UserSalarySelectDto dto);
 
     List<UserSalaryVo> getList(Consumer<LambdaQueryWrapper<UserSalary>> consumer);
 
     /**
-     * 用户薪资备份表明细
+     * 用户薪资明细
      */
     UserSalaryVo detail(Long id);
 
+    /**
+     * 员工薪资管理编辑
+     */
+    void edit(UserSalaryDto dto);
+
+    /**
+     * 获取历史版本结构
+     */
+    List<UserSalaryVo> getHistoryVerList(Long userId);
 }

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

@@ -1,39 +1,11 @@
 package com.fjhx.oa.service.user.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.utils.Assert;
-import com.fjhx.file.entity.FileInfoVo;
-import com.fjhx.file.utils.ObsFileUtil;
-import com.fjhx.oa.entity.user.dto.UserSalaryManageDto;
-import com.fjhx.oa.entity.user.dto.UserSalaryManageSelectDto;
-import com.fjhx.oa.entity.user.po.UserSalary;
-import com.fjhx.oa.entity.user.po.UserSalaryDetail;
 import com.fjhx.oa.entity.user.po.UserSalaryManage;
-import com.fjhx.oa.entity.user.vo.UserSalaryDetailVo;
-import com.fjhx.oa.entity.user.vo.UserSalaryManageVo;
-import com.fjhx.oa.entity.user.vo.UserSalaryVo;
 import com.fjhx.oa.mapper.user.UserSalaryManageMapper;
-import com.fjhx.oa.service.user.UserSalaryDetailService;
 import com.fjhx.oa.service.user.UserSalaryManageService;
-import com.fjhx.oa.service.user.UserSalaryService;
-import com.fjhx.tenant.utils.DeptUtils;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.system.utils.UserUtil;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 
 /**
  * <p>
@@ -45,158 +17,4 @@ import java.util.stream.Collectors;
  */
 @Service
 public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMapper, UserSalaryManage> implements UserSalaryManageService {
-
-    @Resource
-    private UserSalaryDetailService userSalaryDetailService;
-    @Resource
-    private UserSalaryService userSalaryService;
-
-    @Override
-    public Page<UserSalaryManageVo> getPage(UserSalaryManageSelectDto dto) {
-        IWrapper<Object> wrapper = IWrapper.getWrapper();
-        Page<UserSalaryManageVo> page = baseMapper.getPage(dto.getPage(), wrapper);
-        List<UserSalaryManageVo> records = page.getRecords();
-        setInfo(records);
-        return page;
-    }
-
-    @Override
-    public UserSalaryManageVo detail(Long userId) {
-        Assert.notEmpty(userId, "用户Id不能为空！");
-        UserSalaryManageVo detail = baseMapper.getDetail(userId);
-        if (ObjectUtil.isEmpty(detail)) {
-            throw new ServiceException("查询不到用户薪资信息！");
-        }
-        setInfo(Collections.singletonList(detail));
-        return detail;
-    }
-
-    @DSTransactional
-    @Override
-    public synchronized void edit(UserSalaryManageDto dto) {
-        Assert.notEmpty(dto.getUserId(), "用户Id不能为空！");
-        Integer dataVer = 0;
-        //先处理历史版本数据
-        List<UserSalaryDetail> oldList = userSalaryDetailService.list(q -> q
-                .eq(UserSalaryDetail::getUserId, dto.getUserId())
-                .eq(UserSalaryDetail::getIsCurrentVer, 1)
-        );
-        if (ObjectUtil.isNotEmpty(oldList)) {
-            for (UserSalaryDetail userSalaryDetail : oldList) {
-                dataVer = userSalaryDetail.getDataVer();
-                userSalaryDetail.setIsCurrentVer(0);
-            }
-            userSalaryDetailService.updateBatchById(oldList);
-        }
-        //保存历史版本
-        UserSalary oldUserSalary = userSalaryService.getOne(q -> q.eq(UserSalary::getUserId, dto.getUserId()).eq(UserSalary::getIsCurrentVer, 1));
-        if (ObjectUtil.isNotEmpty(oldUserSalary)) {
-            UserSalary userSalary = BeanUtil.copyProperties(this.getById(dto.getUserId()), UserSalary.class);
-            userSalary.setId(oldUserSalary.getId());
-            userSalary.setIsCurrentVer(0);
-            userSalaryService.updateById(userSalary);
-        }
-
-        //再处理新数据
-        //计算工资
-        BigDecimal ratio;
-        if (ObjectUtil.equals(dto.getEmployeeType(), 10)) {
-            BigDecimal internshipRatio = dto.getInternshipRatio();
-            if (ObjectUtil.isEmpty(internshipRatio)) {
-                internshipRatio = oldUserSalary.getInternshipRatio();
-            }
-            ratio = internshipRatio.divide(BigDecimal.valueOf(100));
-        } else if (ObjectUtil.equals(dto.getEmployeeType(), 20)) {
-            BigDecimal probationRatio = dto.getProbationRatio();
-            if (ObjectUtil.isEmpty(probationRatio)) {
-                probationRatio = oldUserSalary.getProbationRatio();
-            }
-            ratio = probationRatio.divide(BigDecimal.valueOf(100));
-        } else if (ObjectUtil.equals(dto.getEmployeeType(), 30)) {
-            ratio = BigDecimal.valueOf(1);
-        } else {
-            throw new ServiceException("未知劳动关系！");
-        }
-        BigDecimal amount = dto.getUserSalaryDetailList().stream()
-                .filter(item -> ObjectUtil.equals(item.getType(), 10))
-                .map(UserSalaryDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal perfAmount = dto.getUserSalaryDetailList().stream()
-                .filter(item -> ObjectUtil.equals(item.getType(), 20))
-                .map(UserSalaryDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
-        dto.setAmount(amount.multiply(ratio).setScale(4, BigDecimal.ROUND_HALF_UP));
-        dto.setPerfAmount(perfAmount.multiply(ratio).setScale(4, BigDecimal.ROUND_HALF_UP));
-
-        dataVer++;//版本号+1
-        this.updateById(dto);
-        ObsFileUtil.editFile(dto.getFileList(), dto.getUserId(), 10);
-
-        UserSalary newUserSalary = BeanUtil.copyProperties(dto, UserSalary.class);
-        newUserSalary.setDataVer(dataVer);
-        newUserSalary.setIsCurrentVer(1);
-        userSalaryService.save(newUserSalary);
-        ObsFileUtil.copyFileAndSave(dto.getFileList(), newUserSalary.getId(), 10);
-
-        List<UserSalaryDetail> userSalaryDetailList = dto.getUserSalaryDetailList();
-        for (UserSalaryDetail userSalaryDetail : userSalaryDetailList) {
-            userSalaryDetail.setId(null);
-            userSalaryDetail.setUserSalaryId(newUserSalary.getId());
-            userSalaryDetail.setUserId(dto.getUserId());
-            userSalaryDetail.setDataVer(dataVer);
-            userSalaryDetail.setIsCurrentVer(1);
-        }
-        userSalaryDetailService.saveBatch(userSalaryDetailList);
-    }
-
-    @Override
-    public List<UserSalaryVo> getHistoryVerList(Long userId) {
-        Assert.notEmpty(userId, "用户id不能为空！");
-        List<UserSalaryVo> list = userSalaryService.getList(q -> q
-                .eq(UserSalary::getUserId, userId)
-                .orderByDesc(UserSalary::getDataVer)
-        );
-        if (ObjectUtil.isEmpty(list)) {
-            return list;
-        }
-
-        //赋值明细
-        List<Long> ids = list.stream().map(UserSalary::getId).collect(Collectors.toList());
-        List<UserSalaryDetailVo> userSalaryDetailVos = userSalaryDetailService.getList(IWrapper.getWrapper()
-                .in(UserSalaryDetail::getUserSalaryId, ids)
-        );
-        Map<Long, List<UserSalaryDetailVo>> collect = userSalaryDetailVos.stream().collect(Collectors.groupingBy(UserSalaryDetail::getUserSalaryId));
-        for (UserSalaryVo userSalary : list) {
-            userSalary.setUserSalaryDetailList(collect.getOrDefault(userSalary.getId(), new ArrayList<>()));
-        }
-
-        UserUtil.assignmentNickName(list, UserSalary::getUserId, UserSalaryVo::setUserName);
-
-        return list;
-    }
-
-    private void setInfo(List<UserSalaryManageVo> list) {
-        if (ObjectUtil.isEmpty(list)) {
-            return;
-        }
-        List<Long> userIds = list.stream().map(UserSalaryManage::getUserId).collect(Collectors.toList());
-        Map<Long, List<UserSalaryDetail>> usdMap = userSalaryDetailService.mapKGroup(UserSalaryDetail::getUserId, q -> q
-                .in(UserSalaryDetail::getUserId, userIds)
-                .eq(UserSalaryDetail::getIsCurrentVer, 1)
-        );
-
-        Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(userIds, 10);
-        Map<Long, String> deptNameMap = DeptUtils.getDeptNameMap();
-        for (UserSalaryManageVo userSalaryManageVo : list) {
-            userSalaryManageVo.setUserSalaryDetailList(usdMap.getOrDefault(userSalaryManageVo.getUserId(), new ArrayList<>()));
-            userSalaryManageVo.setFileList(fileMap.getOrDefault(userSalaryManageVo.getUserId(), new ArrayList<>()));
-            userSalaryManageVo.setCompanyName(deptNameMap.get(userSalaryManageVo.getCompanyId()));
-            userSalaryManageVo.setDeptName(deptNameMap.get(userSalaryManageVo.getDeptId()));
-        }
-
-        //赋值部门名称树
-        DeptUtils.assignmentDeptNames(list, UserSalaryManageVo::getDeptId, (item, nameList) -> {
-            item.setDeptNames(nameList.stream().collect(Collectors.joining("=>")));
-        });
-
-    }
-
 }

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

@@ -1,24 +1,44 @@
 package com.fjhx.oa.service.user.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.utils.Assert;
+import com.fjhx.file.entity.FileInfoVo;
+import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.oa.entity.user.dto.UserSalaryDto;
 import com.fjhx.oa.entity.user.dto.UserSalarySelectDto;
 import com.fjhx.oa.entity.user.po.UserSalary;
+import com.fjhx.oa.entity.user.po.UserSalaryDetail;
+import com.fjhx.oa.entity.user.po.UserSalaryManage;
+import com.fjhx.oa.entity.user.vo.UserSalaryDetailVo;
 import com.fjhx.oa.entity.user.vo.UserSalaryVo;
 import com.fjhx.oa.mapper.user.UserSalaryMapper;
+import com.fjhx.oa.service.user.UserSalaryDetailService;
+import com.fjhx.oa.service.user.UserSalaryManageService;
 import com.fjhx.oa.service.user.UserSalaryService;
+import com.fjhx.tenant.utils.DeptUtils;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 
 /**
  * <p>
- * 用户薪资备份表 服务实现类
+ * 用户薪资 服务实现类
  * </p>
  *
  * @author
@@ -27,14 +47,21 @@ import java.util.function.Consumer;
 @Service
 public class UserSalaryServiceImpl extends ServiceImpl<UserSalaryMapper, UserSalary> implements UserSalaryService {
 
+    @Resource
+    private UserSalaryDetailService userSalaryDetailService;
+    @Resource
+    private UserSalaryManageService userSalaryManageService;
+
     @Override
     public Page<UserSalaryVo> getPage(UserSalarySelectDto dto) {
-        IWrapper<UserSalary> wrapper = getWrapper();
-        wrapper.orderByDesc("us", UserSalary::getId);
-        Page<UserSalaryVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        IWrapper<Object> wrapper = IWrapper.getWrapper();
+        Page<UserSalaryVo> page = baseMapper.getPage(dto.getPage(), wrapper);
+        List<UserSalaryVo> records = page.getRecords();
+        setInfo(records);
         return page;
     }
 
+
     @Override
     public List<UserSalaryVo> getList(Consumer<LambdaQueryWrapper<UserSalary>> consumer) {
         List<UserSalaryVo> userSalaryVos = BeanUtil.copyToList(this.list(consumer), UserSalaryVo.class);
@@ -42,10 +69,144 @@ public class UserSalaryServiceImpl extends ServiceImpl<UserSalaryMapper, UserSal
     }
 
     @Override
-    public UserSalaryVo detail(Long id) {
-        UserSalary UserSalary = this.getById(id);
-        UserSalaryVo result = BeanUtil.toBean(UserSalary, UserSalaryVo.class);
-        return result;
+    public UserSalaryVo detail(Long userId) {
+        Assert.notEmpty(userId, "用户Id不能为空！");
+        UserSalaryVo detail = baseMapper.getDetail(userId);
+        if (ObjectUtil.isEmpty(detail)) {
+            throw new ServiceException("查询不到用户薪资信息！");
+        }
+        setInfo(Collections.singletonList(detail));
+        return detail;
+    }
+
+    @DSTransactional
+    @Override
+    public synchronized void edit(UserSalaryDto dto) {
+        Assert.notEmpty(dto.getUserId(), "用户Id不能为空！");
+        Integer dataVer = 0;
+        //先处理历史版本数据
+        List<UserSalaryDetail> oldList = userSalaryDetailService.list(q -> q
+                .eq(UserSalaryDetail::getUserId, dto.getUserId())
+                .eq(UserSalaryDetail::getIsCurrentVer, 1)
+        );
+        if (ObjectUtil.isNotEmpty(oldList)) {
+            for (UserSalaryDetail userSalaryDetail : oldList) {
+                dataVer = userSalaryDetail.getDataVer();
+                userSalaryDetail.setIsCurrentVer(0);
+            }
+            userSalaryDetailService.updateBatchById(oldList);
+        }
+        //保存历史版本
+        UserSalary oldUserSalary = this.getOne(q -> q.eq(UserSalary::getUserId, dto.getUserId()).eq(UserSalary::getIsCurrentVer, 1));
+        if (ObjectUtil.isNotEmpty(oldUserSalary)) {
+            UserSalary userSalary = BeanUtil.copyProperties(userSalaryManageService.getById(dto.getUserId()), UserSalary.class);
+            userSalary.setId(oldUserSalary.getId());
+            userSalary.setIsCurrentVer(0);
+            this.updateById(userSalary);
+        }
+
+        //再处理新数据
+        //计算工资
+        BigDecimal ratio;
+        if (ObjectUtil.equals(dto.getEmployeeType(), 10)) {
+            BigDecimal internshipRatio = dto.getInternshipRatio();
+            if (ObjectUtil.isEmpty(internshipRatio)) {
+                internshipRatio = oldUserSalary.getInternshipRatio();
+            }
+            ratio = internshipRatio.divide(BigDecimal.valueOf(100));
+        } else if (ObjectUtil.equals(dto.getEmployeeType(), 20)) {
+            BigDecimal probationRatio = dto.getProbationRatio();
+            if (ObjectUtil.isEmpty(probationRatio)) {
+                probationRatio = oldUserSalary.getProbationRatio();
+            }
+            ratio = probationRatio.divide(BigDecimal.valueOf(100));
+        } else if (ObjectUtil.equals(dto.getEmployeeType(), 30)) {
+            ratio = BigDecimal.valueOf(1);
+        } else {
+            throw new ServiceException("未知劳动关系！");
+        }
+        BigDecimal amount = dto.getUserSalaryDetailList().stream()
+                .filter(item -> ObjectUtil.equals(item.getType(), 10))
+                .map(UserSalaryDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+        BigDecimal perfAmount = dto.getUserSalaryDetailList().stream()
+                .filter(item -> ObjectUtil.equals(item.getType(), 20))
+                .map(UserSalaryDetail::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+        dto.setAmount(amount.multiply(ratio).setScale(4, BigDecimal.ROUND_HALF_UP));
+        dto.setPerfAmount(perfAmount.multiply(ratio).setScale(4, BigDecimal.ROUND_HALF_UP));
+
+        dataVer++;//版本号+1
+        userSalaryManageService.updateById(BeanUtil.copyProperties(dto, UserSalaryManage.class));
+        ObsFileUtil.editFile(dto.getFileList(), dto.getUserId(), 10);
+
+        UserSalary newUserSalary = BeanUtil.copyProperties(dto, UserSalary.class);
+        newUserSalary.setDataVer(dataVer);
+        newUserSalary.setIsCurrentVer(1);
+        this.save(newUserSalary);
+        ObsFileUtil.copyFileAndSave(dto.getFileList(), newUserSalary.getId(), 10);
+
+        List<UserSalaryDetail> userSalaryDetailList = dto.getUserSalaryDetailList();
+        for (UserSalaryDetail userSalaryDetail : userSalaryDetailList) {
+            userSalaryDetail.setId(null);
+            userSalaryDetail.setUserSalaryId(newUserSalary.getId());
+            userSalaryDetail.setUserId(dto.getUserId());
+            userSalaryDetail.setDataVer(dataVer);
+            userSalaryDetail.setIsCurrentVer(1);
+        }
+        userSalaryDetailService.saveBatch(userSalaryDetailList);
+    }
+
+    @Override
+    public List<UserSalaryVo> getHistoryVerList(Long userId) {
+        Assert.notEmpty(userId, "用户id不能为空！");
+        List<UserSalaryVo> list = this.getList(q -> q
+                .eq(UserSalary::getUserId, userId)
+                .orderByDesc(UserSalary::getDataVer)
+        );
+        if (ObjectUtil.isEmpty(list)) {
+            return list;
+        }
+
+        //赋值明细
+        List<Long> ids = list.stream().map(UserSalary::getId).collect(Collectors.toList());
+        List<UserSalaryDetailVo> userSalaryDetailVos = userSalaryDetailService.getList(IWrapper.getWrapper()
+                .in(UserSalaryDetail::getUserSalaryId, ids)
+        );
+        Map<Long, List<UserSalaryDetailVo>> collect = userSalaryDetailVos.stream().collect(Collectors.groupingBy(UserSalaryDetail::getUserSalaryId));
+        for (UserSalaryVo userSalary : list) {
+            userSalary.setUserSalaryDetailList(collect.getOrDefault(userSalary.getId(), new ArrayList<>()));
+        }
+
+        UserUtil.assignmentNickName(list, UserSalary::getUserId, UserSalaryVo::setUserName);
+
+        return list;
+    }
+
+
+    private void setInfo(List<UserSalaryVo> list) {
+        if (ObjectUtil.isEmpty(list)) {
+            return;
+        }
+        List<Long> userIds = list.stream().map(UserSalary::getUserId).collect(Collectors.toList());
+        Map<Long, List<UserSalaryDetail>> usdMap = userSalaryDetailService.mapKGroup(UserSalaryDetail::getUserId, q -> q
+                .in(UserSalaryDetail::getUserId, userIds)
+                .eq(UserSalaryDetail::getIsCurrentVer, 1)
+        );
+
+        Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(userIds, 10);
+        Map<Long, String> deptNameMap = DeptUtils.getDeptNameMap();
+        for (UserSalaryVo userSalaryManageVo : list) {
+            List<UserSalaryDetail> orDefault = usdMap.getOrDefault(userSalaryManageVo.getUserId(), new ArrayList<>());
+            userSalaryManageVo.setUserSalaryDetailList(BeanUtil.copyToList(orDefault, UserSalaryDetailVo.class));
+            userSalaryManageVo.setFileList(fileMap.getOrDefault(userSalaryManageVo.getUserId(), new ArrayList<>()));
+            userSalaryManageVo.setCompanyName(deptNameMap.get(userSalaryManageVo.getCompanyId()));
+            userSalaryManageVo.setDeptName(deptNameMap.get(userSalaryManageVo.getDeptId()));
+        }
+
+        //赋值部门名称树
+        DeptUtils.assignmentDeptNames(list, UserSalaryVo::getDeptId, (item, nameList) -> {
+            item.setDeptNames(nameList.stream().collect(Collectors.joining("=>")));
+        });
+
     }
 
 }

hx-oa/src/main/resources/mapper/user/UserSalaryManageMapper.xml

@@ -1,50 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.oa.mapper.user.UserSalaryManageMapper">
-    <sql id="list">
-        SELECT su.user_id,
-               su.nick_name,
-               su.company_id,
-               su.dept_id,
-               su.phonenumber,
-               su.employee_type,
-               su.probation_ratio,
-               su.internship_ratio,
-               su.perf_amount,
-               su.amount,
-               su.education,
-               su.post,
-               su.probation_period,
-               su.effective_date,
-               su.full_time_date,
-               su.entry_date,
-               su.month_rest,
-               su.daily_hours,
-               su.morning_begin_time,
-               su.morning_end_time,
-               su.afternoon_begin_time,
-               su.afternoon_end_time,
-               su.settle_method,
-               su.salary_remark
-        FROM sys_user su
-    </sql>
-    <select id="getPage" resultType="com.fjhx.oa.entity.user.vo.UserSalaryManageVo">
-        <include refid="list"/>
-        ${ew.customSqlSegment}
-    </select>
-    <select id="getDetail" resultType="com.fjhx.oa.entity.user.vo.UserSalaryManageVo">
-        <include refid="list"/>
-        where su.user_id = #{userId}
-    </select>
-    <select id="getHistoryVerList" resultType="com.fjhx.oa.entity.user.vo.UserSalaryHistoryVo">
-        SELECT usd.user_id,
-               usd.data_ver,
-               usd.create_time,
-               usd.update_time
-        FROM user_salary_detail usd
-        WHERE usd.is_current_ver = 0
-          AND usd.user_id = #{userId}
-        GROUP BY usd.data_ver
-        ORDER BY usd.data_ver DESC
-    </select>
 </mapper>

hx-oa/src/main/resources/mapper/user/UserSalaryMapper.xml

@@ -1,36 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.oa.mapper.user.UserSalaryMapper">
-    <select id="getPage" resultType="com.fjhx.oa.entity.user.vo.UserSalaryVo">
-        select us.id,
-               us.user_id,
-               us.data_ver,
-               us.is_current_ver,
-               us.employee_type,
-               us.probation_ratio,
-               us.internship_ratio,
-               us.perf_amount,
-               us.amount,
-               us.education,
-               us.post,
-               us.probation_period,
-               us.entry_date,
-               us.effective_date,
-               us.full_time_date,
-               us.month_rest,
-               us.daily_hours,
-               us.morning_begin_time,
-               us.morning_end_time,
-               us.afternoon_begin_time,
-               us.afternoon_end_time,
-               us.settle_method,
-               us.salary_remark,
-               us.create_user,
-               us.create_time,
-               us.update_user,
-               us.update_time
-        from user_salary us
-            ${ew.customSqlSegment}
-    </select>
+       <sql id="list">
+              SELECT su.user_id,
+                     su.nick_name,
+                     su.company_id,
+                     su.dept_id,
+                     su.phonenumber,
+                     su.employee_type,
+                     su.probation_ratio,
+                     su.internship_ratio,
+                     su.perf_amount,
+                     su.amount,
+                     su.education,
+                     su.post,
+                     su.probation_period,
+                     su.effective_date,
+                     su.full_time_date,
+                     su.entry_date,
+                     su.month_rest,
+                     su.daily_hours,
+                     su.morning_begin_time,
+                     su.morning_end_time,
+                     su.afternoon_begin_time,
+                     su.afternoon_end_time,
+                     su.settle_method,
+                     su.salary_remark
+              FROM sys_user su
+       </sql>
+       <select id="getPage" resultType="com.fjhx.oa.entity.user.vo.UserSalaryVo">
+              <include refid="list"/>
+              ${ew.customSqlSegment}
+       </select>
+       <select id="getDetail" resultType="com.fjhx.oa.entity.user.vo.UserSalaryVo">
+              <include refid="list"/>
+              where su.user_id = #{userId}
+       </select>
 
 </mapper>