问题处理

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

@@ -45,12 +45,12 @@ public class UserSalary extends BasePo {
     /**
      * 试用期薪资比例
      */
-    private Integer probationRatio;
+    private BigDecimal probationRatio;
 
     /**
      * 实习期薪资比例
      */
-    private Integer internshipRatio;
+    private BigDecimal internshipRatio;
 
     /**
      * 计件薪资

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

@@ -31,11 +31,11 @@ public class UserSalaryManage {
     /**
      * 试用期薪资比例
      */
-    private Integer probationRatio;
+    private BigDecimal probationRatio;
     /**
      * 实习期薪资比例
      */
-    private Integer internshipRatio;
+    private BigDecimal internshipRatio;
     /**
      * 薪资合计
      */

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

@@ -101,17 +101,17 @@ public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMap
         //计算工资
         BigDecimal ratio;
         if (ObjectUtil.equals(dto.getEmployeeType(), 10)) {
-            Integer internshipRatio = dto.getInternshipRatio();
+            BigDecimal internshipRatio = dto.getInternshipRatio();
             if (ObjectUtil.isEmpty(internshipRatio)) {
                 internshipRatio = oldUserSalary.getInternshipRatio();
             }
-            ratio = BigDecimal.valueOf(internshipRatio / 100);
+            ratio = internshipRatio.divide(BigDecimal.valueOf(100));
         } else if (ObjectUtil.equals(dto.getEmployeeType(), 20)) {
-            Integer probationRatio = dto.getProbationRatio();
+            BigDecimal probationRatio = dto.getProbationRatio();
             if (ObjectUtil.isEmpty(probationRatio)) {
                 probationRatio = oldUserSalary.getProbationRatio();
             }
-            ratio = BigDecimal.valueOf(probationRatio / 100);
+            ratio = probationRatio.divide(BigDecimal.valueOf(100));
         } else if (ObjectUtil.equals(dto.getEmployeeType(), 30)) {
             ratio = BigDecimal.valueOf(1);
         } else {