From 6ad10e278e9193bd65314a2f3c954ab16e8c104f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 八月 2023 21:57:03 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 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 767be19..355ca24 100644
--- a/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java
@@ -11,6 +11,7 @@
import doumeemes.dao.business.*;
import doumeemes.dao.business.model.*;
import doumeemes.dao.business.vo.SalaryParamVO;
+import doumeemes.dao.ext.MaterialExtMapper;
import doumeemes.dao.ext.dto.SalaryParamDTO;
import doumeemes.dao.ext.dto.SalaryParamImportDTO;
import doumeemes.dao.ext.vo.DepartmentExtListVO;
@@ -70,6 +71,7 @@
insert.setProcedureId(salaryParam.getProcedureId());
insert.setMaterialId(salaryParam.getMaterialId());
insert.setDeleted((byte) Constants.ZERO);
+ insert.setType(salaryParam.getType());
if(findOne(insert) != null){
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍚屼竴涓墿鏂欏湪鐩稿悓宸ュ簭涓嶈兘閲嶅閰嶇疆鍝︼紒");
}
@@ -235,6 +237,7 @@
if (Objects.isNull(material)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佺紪鐮併�戞湁璇紒");
}
+<<<<<<< HEAD
if (Objects.nonNull(material) && !Objects.equals(material.getName(),salaryParamImportDTO.getMaterialName())){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佸悕绉般�戞湁璇紒");
}
@@ -249,6 +252,18 @@
if (Objects.isNull(materialDistribute)){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佺紪鐮併�戞湁璇紒");
}
+=======
+ QueryWrapper<MaterialDistribute> materialDistribute = new QueryWrapper<>();
+ materialDistribute.lambda()
+ .eq(MaterialDistribute::getDeleted,Constants.ZERO)
+ .eq(MaterialDistribute::getMaterialId,material.getId())
+ .eq(MaterialDistribute::getRootDepartId,department.getRootId())
+ .eq(MaterialDistribute::getDepartId,department.getParentId());
+ MaterialDistribute materialDistribute1 = materialDistributeMapper.selectOne(materialDistribute);
+// if (Objects.nonNull(material) && !Objects.equals(material.getName(),salaryParamImportDTO.getMaterialName())){
+// throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵煎叆鏁版嵁鍐呭銆愪骇鍝佸悕绉般�戞湁璇紒");
+// }
+>>>>>>> 4d94726acad17e5cdcf828e21cab762e8b39921c
QueryWrapper<Procedures> proceduresWrapper = new QueryWrapper<>();
proceduresWrapper.lambda()
.eq(Procedures::getName,salaryParamImportDTO.getProcedureName())
@@ -263,7 +278,7 @@
salaryParam.setRootDepartId(department.getRootId());
salaryParam.setDepartId(department.getId());
salaryParam.setProcedureId(procedures.getId());
- salaryParam.setMaterialId(materialDistribute.getId());
+ salaryParam.setMaterialId(materialDistribute1.getId());
salaryParam.setSalary(salaryParamImportDTO.getSalary());
salaryParam.setNum(new BigDecimal(salaryParamImportDTO.getNum()));
salaryParam.setTimes(getIntegerTimes(salaryParamImportDTO.getTimesName()));
--
Gitblit v1.9.3