From 91b92422716cb4c5d0433f77fd2d6d45a69639c4 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 15 八月 2023 18:35:17 +0800
Subject: [PATCH] # 工资表配置表 联调修改
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 7d63f71..38e3017 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -54,6 +54,8 @@
@Override
public Integer create(SalaryParam salaryParam) {
+
+
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
SalaryParam insert = new SalaryParam();
@@ -178,7 +180,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(), "瀵煎叆鏁版嵁鍐呭鏈夎锛�");
}
});
@@ -214,7 +216,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)){
@@ -226,10 +228,8 @@
salaryParam.setProcedureId(procedures.getId());
salaryParam.setMaterialId(material.getId());
salaryParam.setSalary(salaryParamImportDTO.getSalary());
- salaryParam.setNum(new BigDecimal(salaryParamImportDTO.getNUM()));
-
+ salaryParam.setNum(new BigDecimal(salaryParamImportDTO.getNum()));
salaryParam.setTimes(getIntegerTimes(salaryParamImportDTO.getTimesName()));
-
Integer unqualified = Optional.ofNullable(salaryParamImportDTO.getUnqualified()).map(s -> {
if ("鍚�".equals(s)) {
return 0;
@@ -265,7 +265,7 @@
m = Integer.parseInt(a.substring(hIndex >=0?hIndex+2:0,mIndex));
}
if(sIndex > mIndex){
- s = Integer.parseInt(a.substring(mIndex >=0?mIndex+2:0,mIndex));
+ s = Integer.parseInt(a.substring(mIndex >= 0 ? mIndex+2 : 0, sIndex));
}
return h*3600+m*60+s;
}catch (Exception e){
--
Gitblit v1.9.3