diff --git a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java index a5c18327db50e9036e17ae1f606540fbfbad9f36..366205ddaff8662c74f3076ab58fdaab79189394 100644 --- a/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java +++ b/science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java @@ -375,12 +375,15 @@ public class ComProjectDTO extends BaseDTO { private List<ComProjectBudgetDTO> budget; /** 年度用款计划 */ private List<ComProjectFundPlanDTO> fundPlan; + /** 设备仪器经费表 */ + private List<ComProjectEquipmentDTO> equipments; /** 单位支出明细预算 */ private List<ComProjectUnitPaymentDTO> unitPayment; + /** 项目绩效目标表 */ + private ProjectKPIStatisticDTO projectKPI; + /** 项目经费构成表 */ private List<ComProjectFundCompositionDTO> fundCompositions; - /** 设备仪器经费表 */ - private List<ComProjectEquipmentDTO> equipments; /** 项目课颖设置表 */ private List<ComProjectSubDTO> projectSubList; /** 单位科研项目及资金管理制度表 */ diff --git a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java index ea8a48cf0463bf42d0567aac6755dc0148d8601b..08d2ef338af85b82355256de8d9ba50cb71e2db1 100644 --- a/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java +++ b/science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java @@ -680,12 +680,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro comProjectBudgetService.insertBudgetList(dto.getBudget(), comProject.getId()); // 年度用款计划表 comProjectFundPlanService.insertList(dto.getFundPlan(), comProject.getId()); + // 仪器、设备 + comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId()); // 单位支出明细预算表 comProjectUnitPaymentService.insertList(dto.getUnitPayment(), comProject.getId()); + // 项目经费构成表 comProjectFundCompositionService.insertList(dto.getFundCompositions(), comProject.getId()); - // 仪器、设备 - comProjectEquipmentService.insertEquipmentList(dto.getEquipments(), comProject.getId()); // 项目课颖设置表 comProjectSubService.insertList(dto.getProjectSubList(), comProject.getId()); // 单位科研项目及资金管理制度表