薪资管理代码整理

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

@@ -1,108 +0,0 @@
-package com.fjhx.oa.entity.user.po;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 员工薪资管理
- */
-@Getter
-@Setter
-@TableName("sys_user")
-public class UserSalaryManage {
-
-    @TableId
-    private Long userId;
-    private Long companyId;
-    private Long deptId;
-    private String nickName;
-    private Long phonenumber;
-
-    /**
-     * 10实习员工、20试用员工、30正式员工
-     */
-    private Integer employeeType;
-    /**
-     * 试用期薪资比例
-     */
-    private BigDecimal probationRatio;
-    /**
-     * 实习期薪资比例
-     */
-    private BigDecimal internshipRatio;
-    /**
-     * 薪资合计
-     */
-    private BigDecimal amount;
-    private BigDecimal perfAmount;
-    /**
-     * 学历
-     */
-    private String education;
-    /**
-     * 岗位
-     */
-    private String post;
-    /**
-     * 试用期
-     */
-    private Integer probationPeriod;
-    /**
-     * 入职时间
-     */
-    @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;
-    /**
-     * 月休
-     */
-    private Integer monthRest;
-    /**
-     * 日工作时长
-     */
-    private Integer dailyHours;
-    /**
-     * 上午开始工作时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
-    private Date morningBeginTime;
-    /**
-     * 上午结束工作时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
-    private Date morningEndTime;
-    /**
-     * 下午开始工作时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
-    private Date afternoonBeginTime;
-    /**
-     * 下午结束工作时间
-     */
-    @JsonFormat(timezone = "GMT+8", pattern = "HH:mm")
-    private Date afternoonEndTime;
-    /**
-     * 薪资结算方式
-     */
-    private String settleMethod;
-    /**
-     * 薪资说明
-     */
-    private String salaryRemark;
-
-}

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

@@ -17,7 +17,6 @@ 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;
@@ -35,8 +34,6 @@ public class AdjustSalaryApplyFlow extends FlowDelegate {
     @Resource
     private AdjustSalaryDetailService adjustSalaryDetailService;
     @Resource
-    private UserSalaryManageService userSalaryManageService;
-    @Resource
     private UserSalaryService userSalaryService;
 
     @Override

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

@@ -10,7 +10,6 @@ import com.fjhx.oa.entity.promotion.po.PromotionApply;
 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,8 +22,6 @@ public class PromotionApplyFlow extends FlowDelegate {
     @Resource
     private PromotionApplyService promotionApplyService;
     @Resource
-    private UserSalaryManageService userSalaryManageService;
-    @Resource
     private UserSalaryService userSalaryService;
 
     @Override

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

@@ -1,18 +0,0 @@
-package com.fjhx.oa.mapper.user;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.oa.entity.user.po.UserSalaryManage;
-import org.apache.ibatis.annotations.Mapper;
-
-
-/**
- * <p>
- * 员工薪资管理 Mapper 接口
- * </p>
- *
- * @author
- * @since 2024-06-11
- */
-@Mapper
-public interface UserSalaryManageMapper extends BaseMapper<UserSalaryManage> {
-}

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

@@ -1,11 +0,0 @@
-package com.fjhx.oa.service.user;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fjhx.oa.entity.user.po.UserSalaryManage;
-
-
-/**
- * 员工薪资管理 服务类
- */
-public interface UserSalaryManageService extends IService<UserSalaryManage> {
-}

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

@@ -1,20 +0,0 @@
-package com.fjhx.oa.service.user.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.oa.entity.user.po.UserSalaryManage;
-import com.fjhx.oa.mapper.user.UserSalaryManageMapper;
-import com.fjhx.oa.service.user.UserSalaryManageService;
-import org.springframework.stereotype.Service;
-
-
-/**
- * <p>
- * 员工薪资管理 服务实现类
- * </p>
- *
- * @author _
- * @since 2024-06-11
- */
-@Service
-public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMapper, UserSalaryManage> implements UserSalaryManageService {
-}

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

@@ -13,16 +13,16 @@ 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.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.stereotype.Service;
 
@@ -50,7 +50,7 @@ public class UserSalaryServiceImpl extends ServiceImpl<UserSalaryMapper, UserSal
     @Resource
     private UserSalaryDetailService userSalaryDetailService;
     @Resource
-    private UserSalaryManageService userSalaryManageService;
+    private ISysUserService userService;
 
     @Override
     public Page<UserSalaryVo> getPage(UserSalarySelectDto dto) {
@@ -99,7 +99,7 @@ public class UserSalaryServiceImpl extends ServiceImpl<UserSalaryMapper, UserSal
         //保存历史版本
         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 userSalary = BeanUtil.copyProperties(userService.getById(dto.getUserId()), UserSalary.class);
             userSalary.setId(oldUserSalary.getId());
             userSalary.setIsCurrentVer(0);
             this.updateById(userSalary);
@@ -135,7 +135,7 @@ public class UserSalaryServiceImpl extends ServiceImpl<UserSalaryMapper, UserSal
         dto.setPerfAmount(perfAmount.multiply(ratio).setScale(4, BigDecimal.ROUND_HALF_UP));
 
         dataVer++;//版本号+1
-        userSalaryManageService.updateById(BeanUtil.copyProperties(dto, UserSalaryManage.class));
+        userService.updateById(BeanUtil.copyProperties(dto, SysUser.class));
         ObsFileUtil.editFile(dto.getFileList(), dto.getUserId(), 10);
 
         UserSalary newUserSalary = BeanUtil.copyProperties(dto, UserSalary.class);

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

@@ -1,4 +0,0 @@
-<?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">
-</mapper>