薪资管理

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

@@ -0,0 +1,46 @@
+package com.fjhx.oa.controller.user;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
+
+
+/**
+ * <p>
+ * 用户薪资备份表 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2024-06-18
+ */
+@RestController
+@RequestMapping("/userSalary")
+public class UserSalaryController {
+
+    @Autowired
+    private UserSalaryService userSalaryService;
+
+    /**
+     * 用户薪资备份表分页
+     */
+    @PostMapping("/page")
+    public Page<UserSalaryVo> page(@RequestBody UserSalarySelectDto dto) {
+        return userSalaryService.getPage(dto);
+    }
+
+    /**
+     * 用户薪资备份表明细
+     */
+    @PostMapping("/detail")
+    public UserSalaryVo detail(@RequestBody BaseSelectDto dto) {
+        return userSalaryService.detail(dto.getId());
+    }
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.user.dto;
+
+import com.fjhx.oa.entity.user.po.UserSalary;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 用户薪资备份表新增编辑入参实体
+ *
+ * @author
+ * @since 2024-06-18
+ */
+@Getter
+@Setter
+public class UserSalaryDto extends UserSalary {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.user.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 用户薪资备份表列表查询入参实体
+ *
+ * @author
+ * @since 2024-06-18
+ */
+@Getter
+@Setter
+public class UserSalarySelectDto extends BaseSelectDto {
+
+}

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

@@ -0,0 +1,135 @@
+package com.fjhx.oa.entity.user.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.util.Date;
+
+/**
+ * <p>
+ * 用户薪资备份表
+ * </p>
+ *
+ * @author
+ * @since 2024-06-18
+ */
+@Getter
+@Setter
+@TableName("user_salary")
+public class UserSalary extends BasePo {
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 数据版本
+     */
+    private Integer dataVer;
+
+    /**
+     * 是否是当前版本
+     */
+    private Integer isCurrentVer;
+
+    /**
+     * 10实习员工、20试用员工、30正式员工
+     */
+    private String employeeType;
+
+    /**
+     * 试用期薪资比例
+     */
+    private BigDecimal probationRatio;
+
+    /**
+     * 实习期薪资比例
+     */
+    private BigDecimal internshipRatio;
+
+    /**
+     * 计件薪资
+     */
+    private String perfAmount;
+
+    /**
+     * 薪资合计
+     */
+    private BigDecimal amount;
+
+    /**
+     * 学历
+     */
+    private String education;
+
+    /**
+     * 岗位
+     */
+    private String post;
+
+    /**
+     * 试用期
+     */
+    private Integer probationPeriod;
+
+    /**
+     * 入职日期
+     */
+    private Date entryDate;
+
+    /**
+     * 生效日期
+     */
+    private Date effectiveDate;
+
+    /**
+     * 转正日期
+     */
+    private Date fullTimeDate;
+
+    /**
+     * 月休
+     */
+    private Integer monthRest;
+
+    /**
+     * 日工作时长
+     */
+    private Integer dailyHours;
+
+    /**
+     * 上午开始工作时间
+     */
+    private Time morningBeginTime;
+
+    /**
+     * 上午结束工作时间
+     */
+    private Time morningEndTime;
+
+    /**
+     * 下午开始工作时间
+     */
+    private Time afternoonBeginTime;
+
+    /**
+     * 下午结束工作时间
+     */
+    private Time afternoonEndTime;
+
+    /**
+     * 薪资结算方式 10考勤结算 20业绩/计件结算
+     */
+    private String settleMethod;
+
+    /**
+     * 薪资说明
+     */
+    private String salaryRemark;
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.oa.entity.user.vo;
+
+import com.fjhx.oa.entity.user.po.UserSalary;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 用户薪资备份表列表查询返回值实体
+ *
+ * @author
+ * @since 2024-06-18
+ */
+@Getter
+@Setter
+public class UserSalaryVo extends UserSalary {
+
+}

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

@@ -0,0 +1,26 @@
+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.UserSalary;
+import com.fjhx.oa.entity.user.vo.UserSalaryVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 用户薪资备份表 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2024-06-18
+ */
+public interface UserSalaryMapper extends BaseMapper<UserSalary> {
+
+    /**
+     * 用户薪资备份表分页
+     */
+    Page<UserSalaryVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<UserSalary> wrapper);
+
+}

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

@@ -0,0 +1,30 @@
+package com.fjhx.oa.service.user;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.oa.entity.user.dto.UserSalarySelectDto;
+import com.fjhx.oa.entity.user.po.UserSalary;
+import com.fjhx.oa.entity.user.vo.UserSalaryVo;
+import com.ruoyi.common.core.service.BaseService;
+
+
+/**
+ * <p>
+ * 用户薪资备份表 服务类
+ * </p>
+ *
+ * @author
+ * @since 2024-06-18
+ */
+public interface UserSalaryService extends BaseService<UserSalary> {
+
+    /**
+     * 用户薪资备份表分页
+     */
+    Page<UserSalaryVo> getPage(UserSalarySelectDto dto);
+
+    /**
+     * 用户薪资备份表明细
+     */
+    UserSalaryVo detail(Long id);
+
+}

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

@@ -0,0 +1,41 @@
+package com.fjhx.oa.service.user.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.oa.entity.user.dto.UserSalarySelectDto;
+import com.fjhx.oa.entity.user.po.UserSalary;
+import com.fjhx.oa.entity.user.vo.UserSalaryVo;
+import com.fjhx.oa.mapper.user.UserSalaryMapper;
+import com.fjhx.oa.service.user.UserSalaryService;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 用户薪资备份表 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2024-06-18
+ */
+@Service
+public class UserSalaryServiceImpl extends ServiceImpl<UserSalaryMapper, UserSalary> implements UserSalaryService {
+
+    @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);
+        return page;
+    }
+
+    @Override
+    public UserSalaryVo detail(Long id) {
+        UserSalary UserSalary = this.getById(id);
+        UserSalaryVo result = BeanUtil.toBean(UserSalary, UserSalaryVo.class);
+        return result;
+    }
+
+}

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

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