Commit 3a4a4e0b authored by 徐俊's avatar 徐俊

xujun

parent 9c4ee0b7
...@@ -60,6 +60,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -60,6 +60,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
private ComProjectBudgetService comProjectBudgetService; private ComProjectBudgetService comProjectBudgetService;
@Autowired @Autowired
private ComProjectEquipmentService comProjectEquipmentService; private ComProjectEquipmentService comProjectEquipmentService;
@Autowired
private ComProjectManufactureService comProjectManufactureService;
@Autowired @Autowired
private ComProjectResearchService comProjectResearchService; private ComProjectResearchService comProjectResearchService;
...@@ -373,6 +375,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -373,6 +375,10 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId()); List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
dto.setEquipments(equipmentList); dto.setEquipments(equipmentList);
// 试制设备预算明细表
List<ComProjectManufactureDTO> manufactureList = comProjectManufactureService.getListByObjectId(dto.getId());
dto.setManufacture(manufactureList);
// // 单位支出明细预算 // // 单位支出明细预算
// List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId()); // List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
// dto.setUnitPayment(unitPaymentList); // dto.setUnitPayment(unitPaymentList);
...@@ -751,6 +757,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -751,6 +757,9 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// comProjectFundCompositionService.insertList(dto.getFundCompositions(), id); // comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
// 购置设备预算明细表 // 购置设备预算明细表
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id); comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
// 试制设备预算明细表
comProjectManufactureService.insertEquipmentList(dto.getManufacture(), id);
// 在研或完成基础研究项目情况 // 在研或完成基础研究项目情况
// comProjectResearchService.insertList(dto.getProjectResearchList(), id); // comProjectResearchService.insertList(dto.getProjectResearchList(), id);
// 项目课颖设置表 // 项目课颖设置表
...@@ -802,6 +811,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -802,6 +811,8 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
comProjectFundPlanService.insertList(dto.getFundPlan(), comProject.getId()); comProjectFundPlanService.insertList(dto.getFundPlan(), comProject.getId());
// 购置设备预算明细表 // 购置设备预算明细表
comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId()); comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
// 试制设备预算明细表
comProjectManufactureService.insertEquipmentList(dto.getManufacture(), comProject.getId());
// 单位支出明细预算表 // 单位支出明细预算表
// comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId()); // comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
// 项目绩效指标表 // 项目绩效指标表
......
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