xujun

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

@@ -328,7 +328,7 @@ public class ComProjectDTO extends BaseDTO {
     /** 购置设备预算明细表 */
     private List<ComProjectEquipmentDTO> equipments;
     /** 试制设备预算明细表 */
-    private List<ComProjectManufactureDTO> manufacture;
+    private List<ComProjectManufactureDTO> manufactureList;
     /** 附件列表 */
     private List<ComFileDTO> fileList;
     /** 审核列表 */

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

@@ -377,7 +377,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
 
         // 试制设备预算明细表
         List<ComProjectManufactureDTO> manufactureList = comProjectManufactureService.getListByObjectId(dto.getId());
-        dto.setManufacture(manufactureList);
+        dto.setManufactureList(manufactureList);
 
 //        // 单位支出明细预算
 //        List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
@@ -758,7 +758,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 购置设备预算明细表
         comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), id);
         // 试制设备预算明细表
-        comProjectManufactureService.insertEquipmentList(dto.getManufacture(), id);
+        comProjectManufactureService.insertEquipmentList(dto.getManufactureList(), id);
 
         // 在研或完成基础研究项目情况
 //        comProjectResearchService.insertList(dto.getProjectResearchList(), id);
@@ -812,7 +812,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 购置设备预算明细表
         comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId());
         // 试制设备预算明细表
-        comProjectManufactureService.insertEquipmentList(dto.getManufacture(), comProject.getId());
+        comProjectManufactureService.insertEquipmentList(dto.getManufactureList(), comProject.getId());
         // 单位支出明细预算表
 //        comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId());
         // 项目绩效指标表