From 29c9a7cfc8de40e246409963784d8f7112d953da Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 18 八月 2023 14:56:17 +0800
Subject: [PATCH] #产出计算
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 21 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 95da0cb..52478da 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -29,10 +29,8 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.math.BigDecimal;
+import java.util.*;
/**
* 璁剧疆绫�-缁╂晥宸ヨ祫閰嶇疆琛⊿ervice瀹炵幇
@@ -56,20 +54,25 @@
@Override
public Integer create(SalaryParam salaryParam) {
+
+
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SalaryParam insert = new SalaryParam();
+ insert.setRootDepartId(principal.getRootDepartment().getId());
+ insert.setDepartId(salaryParam.getDepartId());
+ insert.setProcedureId(salaryParam.getProcedureId());
+ insert.setMaterialId(salaryParam.getMaterialId());
insert.setDeleted((byte) Constants.ZERO);
+ if(findOne(insert) != null){
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍚屼竴涓墿鏂欏湪鐩稿悓宸ュ簭涓嶈兘閲嶅閰嶇疆鍝︼紒");
+ }
insert.setCreateUser(principal.getId());
insert.setCreateTime(new Date());
insert.setUpdateUser(principal.getId());
insert.setUpdateTime(new Date());
insert.setRemark(salaryParam.getRemark());
- insert.setRootDepartId(salaryParam.getRootDepartId());
- insert.setDepartId(salaryParam.getDepartId());
- insert.setProcedureId(salaryParam.getProcedureId());
- insert.setMaterialId(salaryParam.getMaterialId());
- insert.setSalary(salaryParam.getSalary());
+ insert.setSalary(salaryParam.getSalary().multiply(new BigDecimal("100")));
insert.setNum(salaryParam.getNum());
insert.setTimes(salaryParam.getTimes());
insert.setUnqualified(salaryParam.getUnqualified());
@@ -111,10 +114,10 @@
.set(SalaryParam::getUpdateTime,new Date())
.set(SalaryParam::getUpdateUser,principal.getId())
.set(SalaryParam::getType,salaryParam.getType())
- .set(SalaryParam::getDepartId,salaryParam.getDepartId())
- .set(SalaryParam::getMaterialId,salaryParam.getMaterialId())
- .set(SalaryParam::getProcedureId,salaryParam.getProcedureId())
- .set(SalaryParam::getSalary,salaryParam.getSalary())
+// .set(SalaryParam::getDepartId,salaryParam.getDepartId())
+// .set(SalaryParam::getMaterialId,salaryParam.getMaterialId())
+// .set(SalaryParam::getProcedureId,salaryParam.getProcedureId())
+ .set(SalaryParam::getSalary,salaryParam.getSalary().multiply(new BigDecimal(100)))
.set(SalaryParam::getNum,salaryParam.getNum())
.set(SalaryParam::getTimes,salaryParam.getTimes())
.set(SalaryParam::getUnqualified,salaryParam.getUnqualified());
@@ -139,6 +142,7 @@
@Override
public SalaryParam findOne(SalaryParam salaryParam) {
QueryWrapper<SalaryParam> wrapper = new QueryWrapper<>(salaryParam);
+ wrapper.last("limit 1");
return salaryParamMapper.selectOne(wrapper);
}
@@ -151,8 +155,15 @@
@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();
- return PageData.from(salaryParamMapper.selectPage(page, model));
+ 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))));
+ }
+ return PageData.from(salaryParamVOIPage);
}
@Override
@@ -180,7 +191,7 @@
|| Objects.isNull(s.getDepartName())
|| Objects.isNull(s.getMaterialCode())
|| Objects.isNull(s.getProcedureName())
- || Objects.isNull(s.getNUM())){
+ || Objects.isNull(s.getNum())){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭鏈夎锛�");
}
});
@@ -216,7 +227,7 @@
proceduresWrapper.lambda()
.eq(Procedures::getName,salaryParamImportDTO.getProcedureName())
.eq(Procedures::getRootDepartId,department.getRootId())
- .eq(Procedures::getDepartId,department.getId())
+ .eq(Procedures::getOrgId,department.getId())
.last("limit 1");
Procedures procedures = proceduresMapper.selectOne(proceduresWrapper);
if (Objects.isNull(procedures)){
@@ -228,13 +239,49 @@
salaryParam.setProcedureId(procedures.getId());
salaryParam.setMaterialId(material.getId());
salaryParam.setSalary(salaryParamImportDTO.getSalary());
- salaryParam.setNum(salaryParamImportDTO.getNUM());
- //todo
-// salaryParam.setTimes();
-// salaryParam.setUnqualified(salaryParamImportDTO.getUnqualified() );
-// salaryParam.setType(salaryParamImportDTO.getType());
+ salaryParam.setNum(new BigDecimal(salaryParamImportDTO.getNum()));
+ salaryParam.setTimes(getIntegerTimes(salaryParamImportDTO.getTimesName()));
+ Integer unqualified = Optional.ofNullable(salaryParamImportDTO.getUnqualified()).map(s -> {
+ if ("鍚�".equals(s)) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }).orElse(0);
+ salaryParam.setUnqualified(unqualified);
+
+ Integer type = Optional.ofNullable(salaryParamImportDTO.getUnqualified()).map(s -> {
+ if ("璁′欢".equals(s)) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }).orElse(0);
+ salaryParam.setType(type);
create(salaryParam);
}
}
+
+ private Integer getIntegerTimes(String a) {
+ int h =0,m=0,s=0;
+ try{
+ int hIndex =a.lastIndexOf("灏忔椂");
+ int mIndex=a.lastIndexOf("鍒嗛挓");
+ int sIndex =a.lastIndexOf("绉�");
+ if( hIndex>0){
+ h = Integer.parseInt(a.substring(0,hIndex));
+ }
+ if(mIndex > hIndex){
+ m = Integer.parseInt(a.substring(hIndex >=0?hIndex+2:0,mIndex));
+ }
+ if(sIndex > mIndex){
+ s = Integer.parseInt(a.substring(mIndex >= 0 ? mIndex+2 : 0, sIndex));
+ }
+ return h*3600+m*60+s;
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏃堕暱銆�"+a+"銆戞牸寮忎笉姝ｇ‘锛�" );
+ }
+
+ }
}
--
Gitblit v1.9.3