Commit 2c32294b authored by 刘帅's avatar 刘帅

1.均分工时不除尽报错问题

parent e0482442
...@@ -23,6 +23,7 @@ import com.maintain.business.service.IErpRepairFormProjectDispatchService; ...@@ -23,6 +23,7 @@ import com.maintain.business.service.IErpRepairFormProjectDispatchService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection; import java.util.Collection;
...@@ -112,10 +113,16 @@ public class ErpRepairFormProjectDispatchServiceImpl implements IErpRepairFormPr ...@@ -112,10 +113,16 @@ public class ErpRepairFormProjectDispatchServiceImpl implements IErpRepairFormPr
@Override @Override
public Boolean insertBatchByBo(ErpRepairFormProjectDispatchBatchBo bo) { public Boolean insertBatchByBo(ErpRepairFormProjectDispatchBatchBo bo) {
ErpRepairFormProject formProject = projectMapper.selectById(bo.getProjectId()); ErpRepairFormProject formProject = projectMapper.selectById(bo.getProjectId());
// 删除原有绑定 // 删除原有绑定
LambdaQueryWrapper<ErpRepairFormProjectDispatch> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<ErpRepairFormProjectDispatch> lqw = Wrappers.lambdaQuery();
lqw.eq(ErpRepairFormProjectDispatch::getRepairFormProjectId, bo.getProjectId()); lqw.eq(ErpRepairFormProjectDispatch::getRepairFormProjectId, bo.getProjectId());
BigDecimal totalActualManHour = baseMapper.selectList(lqw)
.stream()
.map(ErpRepairFormProjectDispatch::getActualManHour).reduce(BigDecimal.ZERO, BigDecimal::add);
baseMapper.delete(lqw); baseMapper.delete(lqw);
// 汇总原总工时
// 批量新增派工人员列表 // 批量新增派工人员列表
List<ErpRepairFormProjectDispatch> collect = bo.getDispatchIdList().stream().map(item -> { List<ErpRepairFormProjectDispatch> collect = bo.getDispatchIdList().stream().map(item -> {
ErpRepairFormProjectDispatch projectDispatch = new ErpRepairFormProjectDispatch(); ErpRepairFormProjectDispatch projectDispatch = new ErpRepairFormProjectDispatch();
...@@ -132,7 +139,9 @@ public class ErpRepairFormProjectDispatchServiceImpl implements IErpRepairFormPr ...@@ -132,7 +139,9 @@ public class ErpRepairFormProjectDispatchServiceImpl implements IErpRepairFormPr
projectDispatch.setMaintainUserName(userVo.getName()); projectDispatch.setMaintainUserName(userVo.getName());
projectDispatch.setMaintainJobNumber(userVo.getJobNumber()); projectDispatch.setMaintainJobNumber(userVo.getJobNumber());
projectDispatch.setMaintainUserState(userVo.getState()); projectDispatch.setMaintainUserState(userVo.getState());
BigDecimal hour = formProject.getStandardManHour().divide(BigDecimal.valueOf(bo.getDispatchIdList().size())); BigDecimal hour = formProject.getStandardManHour().divide(
BigDecimal.valueOf(bo.getDispatchIdList().size()), 2, RoundingMode.HALF_UP
);
projectDispatch.setDispatchManHour(hour); projectDispatch.setDispatchManHour(hour);
projectDispatch.setActualManHour(hour); projectDispatch.setActualManHour(hour);
// projectDispatch.setDeductManHour(hour); // projectDispatch.setDeductManHour(hour);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment