Merge remote-tracking branch 'origin/master'

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

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

@@ -335,6 +335,11 @@ public class ComProjectDTO extends BaseDTO {
     private List<ComProjectStageGoalDTO> stageGoals;
     /** 项目课颖设置表 */
     private List<ComProjectSubDTO> projectSubList;
+<<<<<<< HEAD
+    /** 试制设备预算明细表 */
+    private List<ComProjectManufactureDTO> manufactureList;
+=======
+>>>>>>> 90574225c4c1f47742d66430afac9c7d3cf70f6a
     /** 附件列表 */
     private List<ComFileDTO> fileList;
     /** 审核列表 */

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

@@ -374,7 +374,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());
@@ -737,17 +737,17 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         // 项目合作单位
         comProjectCooperativeUnitsService.insertList(dto.getCooperativeUnits(), id, 1);
         // 主要参与单位
-        comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), id,2);
+//        comProjectCooperativeUnitsService.insertList(dto.getParticipateUnits(), comProject.getId(),2);
         // 项目参加人员
         comProjectMembersService.insertList(dto.getMembers(), id);
         // 经费预算
         comProjectBudgetService.insertBudgetList(dto.getBudget(), id);
         // 年度用款计划表
         comProjectFundPlanService.insertList(dto.getFundPlan(), id);
-        // 项目绩效指标表
-        comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), id);
         // 单位支出明细预算表
 //        comProjectUnitPaymentService.insertList(dto.getUnitPayment(), id);
+        // 项目绩效指标表
+        comProjectKpitDetailService.insertList(dto.getProjectKPI().getKpiList(), id);
         // 项目经费构成表
 //        comProjectFundCompositionService.insertList(dto.getFundCompositions(), id);
         // 购置设备预算明细表