|
@@ -497,10 +497,18 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
//发放系数
|
|
//发放系数
|
|
datum.put("paySalaryRatio", userEntity.getPaySalaryRatio());
|
|
datum.put("paySalaryRatio", userEntity.getPaySalaryRatio());
|
|
//最终发放金额
|
|
//最终发放金额
|
|
- datum.put("finalPutMoney", new BigDecimal(userEntity.getPaySalaryRatio()).multiply(putMoney).setScale(3, BigDecimal.ROUND_HALF_UP));
|
|
|
|
|
|
+ if ("是".equals(datum.getString("paySalary"))) {
|
|
|
|
+ datum.put("finalPutMoney", new BigDecimal(userEntity.getPaySalaryRatio()).multiply(putMoney).setScale(3, BigDecimal.ROUND_HALF_UP));
|
|
|
|
+ } else {
|
|
|
|
+ datum.put("finalPutMoney", 0.0);
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
datum.put("paySalaryRatio", 1);
|
|
datum.put("paySalaryRatio", 1);
|
|
- datum.put("finalPutMoney", putMoney);
|
|
|
|
|
|
+ if ("是".equals(datum.getString("paySalary"))) {
|
|
|
|
+ datum.put("finalPutMoney", putMoney);
|
|
|
|
+ } else {
|
|
|
|
+ datum.put("finalPutMoney", 0.0);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -978,11 +986,19 @@ public class KuaishouOperationReportServiceImpl extends ServiceImpl<KuaishouOper
|
|
if (!Check.isNull(userEntity) && !Check.isNull(userEntity.getPaySalaryRatio())) {
|
|
if (!Check.isNull(userEntity) && !Check.isNull(userEntity.getPaySalaryRatio())) {
|
|
//发放系数
|
|
//发放系数
|
|
datum.put("paySalaryRatio", userEntity.getPaySalaryRatio());
|
|
datum.put("paySalaryRatio", userEntity.getPaySalaryRatio());
|
|
- //最终发放金额
|
|
|
|
- datum.put("finalPutMoney", new BigDecimal(userEntity.getPaySalaryRatio()).multiply(putMoney).setScale(3, BigDecimal.ROUND_HALF_UP));
|
|
|
|
|
|
+ if ("是".equals(datum.getString("paySalary"))) {
|
|
|
|
+ //最终发放金额
|
|
|
|
+ datum.put("finalPutMoney", new BigDecimal(userEntity.getPaySalaryRatio()).multiply(putMoney).setScale(3, BigDecimal.ROUND_HALF_UP));
|
|
|
|
+ } else {
|
|
|
|
+ datum.put("finalPutMoney", 0.0);
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
datum.put("paySalaryRatio", 1);
|
|
datum.put("paySalaryRatio", 1);
|
|
- datum.put("finalPutMoney", putMoney);
|
|
|
|
|
|
+ if ("是".equals(datum.getString("paySalary"))) {
|
|
|
|
+ datum.put("finalPutMoney", putMoney);
|
|
|
|
+ } else {
|
|
|
|
+ datum.put("finalPutMoney", 0.0);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|