薪资管理 调整

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

@@ -26,6 +26,11 @@ public class UserSalaryDetail extends BasePo {
     private Long userId;
 
     /**
+     * 类型 10考勤结算 20业绩/计件结算
+     */
+    private Integer type;
+
+    /**
      * 薪资结构id
      */
     private Long salaryStructureId;

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

@@ -37,6 +37,7 @@ public class UserSalaryManage {
      * 薪资合计
      */
     private BigDecimal amount;
+    private BigDecimal perfAmount;
     /**
      * 学历
      */

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

@@ -17,7 +17,6 @@ import com.fjhx.oa.service.user.UserSalaryManageService;
 import com.fjhx.tenant.utils.DeptUstil;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -43,8 +42,6 @@ public class UserSalaryManageServiceImpl implements UserSalaryManageService {
     private UserSalaryManageMapper baseMapper;
     @Resource
     private UserSalaryDetailService userSalaryDetailService;
-    @Resource
-    private ISysDeptService sysDeptService;
 
     @Override
     public Page<UserSalaryManageVo> getPage(UserSalaryManageSelectDto dto) {

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

@@ -9,6 +9,7 @@
                su.employee_type,
                su.probation_ratio,
                su.internship_ratio,
+               su.perf_amount,
                su.amount,
                su.education,
                su.post,
@@ -40,6 +41,7 @@
             <if test="probationRatio != null and probationRatio != ''">probation_ratio = #{probationRatio},</if>
             <if test="internshipRatio != null and internshipRatio != ''">internship_ratio = #{internshipRatio},</if>
             <if test="amount != null and amount != ''">amount = #{amount},</if>
+            <if test="perfAmount != null and perfAmount != ''">perf_amount = #{perfAmount},</if>
             <if test="education != null and education != ''">education = #{education},</if>
             <if test="post != null and post != ''">post = #{post},</if>
             <if test="probationPeriod != null and probationPeriod != ''">probation_period = #{probationPeriod},</if>