Merge remote-tracking branch 'origin/master'

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java

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