Merge remote-tracking branch 'origin/master'

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

@@ -375,12 +375,16 @@ 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;
     /** 单位科研项目及资金管理制度表 */

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

@@ -681,12 +681,14 @@ 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());
         // 单位科研项目及资金管理制度表