diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormProjectDispatchServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormProjectDispatchServiceImpl.java index a1b57fa4c2b07db30845d422c9f634c84db48293..5768cc230f227b75a1181878b00aa5c82310a17e 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormProjectDispatchServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpRepairFormProjectDispatchServiceImpl.java @@ -146,7 +146,7 @@ public class ErpRepairFormProjectDispatchServiceImpl implements IErpRepairFormPr projectDispatch.setActualManHour(hour); // projectDispatch.setDeductManHour(hour); // 汇总实际总工时 - formProject.setActualTime(formProject.getActualTime().add(hour)); + formProject.setActualTime(hour); return projectDispatch; }).collect(Collectors.toList()); formProject.setIsDispatch(IsEnableStatus.YES.getCode()); @@ -160,6 +160,7 @@ public class ErpRepairFormProjectDispatchServiceImpl implements IErpRepairFormPr @Override public Boolean updateByBo(ErpRepairFormProjectDispatchBo bo) { ErpRepairFormProjectDispatch projectDispatch = baseMapper.selectById(bo.getId()); + projectDispatch.setDispatchManHour(bo.getDispatchManHour()); projectDispatch.setActualManHour(bo.getDispatchManHour().subtract(bo.getDeductManHour())); projectDispatch.setDeductManHour(bo.getDeductManHour()); return baseMapper.updateById(projectDispatch) > 0; diff --git a/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue b/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue index 9b04962fa0433684fae5292e9f18b07ad22a866f..68143d887872a54df8de4ea6bf113e0e29e8972f 100644 --- a/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue +++ b/maintain-ui/src/views/business/repairFormProjectDispatch/index.vue @@ -20,7 +20,20 @@ - + + +