From 5dfbc4af25ab4f5e8d75f99c6e889b5004a49ef0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 19:22:25 +0800
Subject: [PATCH] 大屏统计
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 9 ++++++---
1 files changed, 6 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 2233fcf..b97cf17 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -59,7 +59,7 @@
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SalaryParam insert = new SalaryParam();
- insert.setRootDepartId(salaryParam.getRootDepartId());
+ insert.setRootDepartId(principal.getRootDepartment().getId());
insert.setDepartId(salaryParam.getDepartId());
insert.setProcedureId(salaryParam.getProcedureId());
insert.setMaterialId(salaryParam.getMaterialId());
@@ -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))));
@@ -224,7 +227,7 @@
proceduresWrapper.lambda()
.eq(Procedures::getName,salaryParamImportDTO.getProcedureName())
.eq(Procedures::getRootDepartId,department.getRootId())
- .eq(Procedures::getOrgId,department.getId())
+// .eq(Procedures::getOrgId,department.getId())
.last("limit 1");
Procedures procedures = proceduresMapper.selectOne(proceduresWrapper);
if (Objects.isNull(procedures)){
--
Gitblit v1.9.3