From a0be8dd44dfb4216293cfffdbb8ef1c406818b1f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 11:50:54 +0800
Subject: [PATCH] #产出计算
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
index 2233fcf..b83e401 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -117,7 +117,7 @@
// .set(SalaryParam::getDepartId,salaryParam.getDepartId())
// .set(SalaryParam::getMaterialId,salaryParam.getMaterialId())
// .set(SalaryParam::getProcedureId,salaryParam.getProcedureId())
- .set(SalaryParam::getSalary,salaryParam.getSalary().divide(new BigDecimal(100)))
+ .set(SalaryParam::getSalary,salaryParam.getSalary().multiply(new BigDecimal(100)))
.set(SalaryParam::getNum,salaryParam.getNum())
.set(SalaryParam::getTimes,salaryParam.getTimes())
.set(SalaryParam::getUnqualified,salaryParam.getUnqualified());
@@ -155,7 +155,10 @@
@Override
public PageData<SalaryParamVO> findPage(PageWrap<SalaryParamDTO> pageWrap) {
IPage<SalaryParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SalaryParamDTO model = pageWrap.getModel();
+ model.setRootDepartId(principal.getRootDepartment().getId());
+ model.setDepartId(principal.getComDepartment().getId());
IPage<SalaryParamVO> salaryParamVOIPage = salaryParamMapper.selectPage(page, model);
if (!CollectionUtils.isEmpty(salaryParamVOIPage.getRecords())){
salaryParamVOIPage.getRecords().forEach(s->s.setSalary(s.getSalary().divide(new BigDecimal(100))));
--
Gitblit v1.9.3