From af00e89990ae9757cc9261cbe560873c2066b69c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 14:34:11 +0800
Subject: [PATCH] 大屏统计
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 d98d0ca..2233fcf 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -72,7 +72,7 @@
insert.setUpdateUser(principal.getId());
insert.setUpdateTime(new Date());
insert.setRemark(salaryParam.getRemark());
- insert.setSalary(salaryParam.getSalary());
+ insert.setSalary(salaryParam.getSalary().multiply(new BigDecimal("100")));
insert.setNum(salaryParam.getNum());
insert.setTimes(salaryParam.getTimes());
insert.setUnqualified(salaryParam.getUnqualified());
@@ -117,7 +117,7 @@
// .set(SalaryParam::getDepartId,salaryParam.getDepartId())
// .set(SalaryParam::getMaterialId,salaryParam.getMaterialId())
// .set(SalaryParam::getProcedureId,salaryParam.getProcedureId())
- .set(SalaryParam::getSalary,salaryParam.getSalary())
+ .set(SalaryParam::getSalary,salaryParam.getSalary().divide(new BigDecimal(100)))
.set(SalaryParam::getNum,salaryParam.getNum())
.set(SalaryParam::getTimes,salaryParam.getTimes())
.set(SalaryParam::getUnqualified,salaryParam.getUnqualified());
@@ -156,7 +156,11 @@
public PageData<SalaryParamVO> findPage(PageWrap<SalaryParamDTO> pageWrap) {
IPage<SalaryParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
SalaryParamDTO model = pageWrap.getModel();
- return PageData.from(salaryParamMapper.selectPage(page, model));
+ IPage<SalaryParamVO> salaryParamVOIPage = salaryParamMapper.selectPage(page, model);
+ if (!CollectionUtils.isEmpty(salaryParamVOIPage.getRecords())){
+ salaryParamVOIPage.getRecords().forEach(s->s.setSalary(s.getSalary().divide(new BigDecimal(100))));
+ }
+ return PageData.from(salaryParamVOIPage);
}
@Override
--
Gitblit v1.9.3