77

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

@@ -344,14 +344,30 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         dto.setMemXsCount(comProjectMembersDTO.getMemXsCount());
         dto.setWorkCount(comProjectMembersDTO.getWorkCount());
 
-        // 项目合作单位
-        List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(), 1);
-        dto.setCooperativeUnits(cooperativeUnits);
+
+
+
+
+
+        // 项目安排及阶段目标
+        comProjectStageGoalService.deleteByObjectId(id);
+
 
         //获取项目组成员
         List<ComProjectMembersDTO> memList = comProjectMembersService.getListByObjectId(dto.getId());
         dto.setMembers(memList);
 
+        // 项目绩效目标表
+        LoadProjectKPIInfo(dto);
+
+        // 项目合作单位
+        List<ComProjectCooperativeUnitsDTO> cooperativeUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(), 1);
+        dto.setCooperativeUnits(cooperativeUnits);
+
+        // 项目参与单位
+        List<ComProjectCooperativeUnitsDTO> participateUnits = comProjectCooperativeUnitsService.getListByObjectId(dto.getId(), 2);
+        dto.setParticipateUnits(participateUnits);
+
         //经费表
         List<ComProjectBudgetDTO> budgetList = comProjectBudgetService.getListByObjectId(dto.getId());
         if (null == budgetList || budgetList.size() == 0)
@@ -364,10 +380,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             fundPlanList = comProjectFundPlanService.getList();
         dto.setFundPlan(fundPlanList);
 
-//        // 项目经费构成表
-//        List<ComProjectFundCompositionDTO> fundCompositions = comProjectFundCompositionService.getListByObjectId(dto.getId());
-//        dto.setFundCompositions(fundCompositions);
-
         // 购置设备预算明细表
         List<ComProjectEquipmentDTO> equipmentList = comProjectEquipmentService.getListByObjectId(dto.getId());
         dto.setDeviceList(equipmentList);
@@ -376,21 +388,22 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
         List<ComProjectManufactureDTO> manufactureList = comProjectManufactureService.getListByObjectId(dto.getId());
         dto.setManufactureList(manufactureList);
 
-//        // 单位支出明细预算
-//        List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
-//        dto.setUnitPayment(unitPaymentList);
+        // 单位支出明细预算
+        List<ComProjectUnitPaymentDTO> unitPaymentList = comProjectUnitPaymentService.getListByObjectId(dto.getId());
+        dto.setUnitPayment(unitPaymentList);
 
-        // 项目绩效目标表
-        LoadProjectKPIInfo(dto);
+        // 项目安排及阶段目标
+        List<ComProjectStageGoalDTO> stageGoals =  comProjectStageGoalService.getListByObjectId(id);
+        dto.setStageGoals(stageGoals);
+
+        // 项目课颖设置表
+        List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
+        dto.setProjectSubList(projectSubList);
 
 //        // 在研或完成基础研究项目情况
 //        List<ComProjectResearchDTO> projectResearchList = comProjectResearchService.getListByObjectId(dto.getId());
 //        dto.setProjectResearchList(projectResearchList);
 
-//        // 项目课颖设置表
-//        List<ComProjectSubDTO> projectSubList = comProjectSubService.getListByObjectId(dto.getId());
-//        dto.setProjectSubList(projectSubList);
-
 //        // 单位科研项目及资金管理制度表
 //        List<ComProjectManagementRuleDTO> managementRuleList = comProjectManagementRuleService.getListByObjectId(dto.getId());
 //        dto.setManagementRuleList(managementRuleList);
@@ -631,33 +644,32 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             throw new BusinessException("项目不存在");
         if (comProject.getProjState() > CommonEnum.projState.waitSubmit.getCode())
             throw new BusinessException("当前项目状态不能删除");
-        // 项目合作单位
-        comProjectCooperativeUnitsService.deleteByObjectId(id, 1);
-//        comProjectCooperativeUnitsService.deleteByObjectId(id,2);
         // 项目参加人员
         comProjectMembersService.deleteByObjectId(id);
+        // 项目绩效指标表
+        comProjectKpitDetailService.deleteByObjectId(id);
         // 经费预算
         comProjectBudgetService.deleteByObjectId(id);
         // 年度用款计划表
         comProjectFundPlanService.deleteByObjectId(id);
+        // 项目合作单位
+        comProjectCooperativeUnitsService.deleteByObjectId(id,1);
+        // 主要参与单位
+        comProjectCooperativeUnitsService.deleteByObjectId(id,2);
+        // 购置设备预算明细表
+        comProjectEquipmentService.deleteByObjectId(id);
+        // 试制设备预算明细表
+        comProjectManufactureService.deleteByObjectId(id);
         // 单位支出明细预算表
-//        comProjectUnitPaymentService.deleteByObjectId(id);
-        // 项目绩效指标表
-        comProjectKpitDetailService.deleteByObjectId(id);
-        // 项目经费构成表
-//        comProjectFundCompositionService.deleteByObjectId(id);
-        // 仪器、设备
-//        comProjectEquipmentService.deleteByObjectId(id);
-        // 在研或完成基础研究项目情况
-//        comProjectResearchService.deleteByObjectId(id);
+        comProjectUnitPaymentService.deleteByObjectId(id);
+        // 项目安排及阶段目标
+        comProjectStageGoalService.deleteByObjectId(id);
         // 项目课颖设置表
-//        comProjectSubService.deleteByObjectId(id);
-        // 单位科研项目及资金管理制度表
-//        comProjectManagementRuleService.deleteByObjectId(id);
-        // 项目信息表
-        comProjectBasicService.deleteByProjId(id);
+        comProjectSubService.deleteByObjectId(id);
         // 附件
         ComFileService.deleteByObjectId(id);
+        // 项目信息表
+        comProjectBasicService.deleteByProjId(id);
         this.deleteById(id);
         return id;
     }