111

science-admin/src/main/java/com/yiboshi/science/service/ComProjectKpitDetailService.java

@@ -16,4 +16,10 @@ public interface ComProjectKpitDetailService extends BaseService<ComProjectKpitD
     List<ComProjectKpitDTO> getProjectKpitDetailStatistic(String projId);
 
     void insertList(List<ComProjectKpitDetailDTO> list, String objectId);
+
+    /** 删除对象列表
+     *
+     * @param objectId
+     */
+    void deleteByObjectId(String objectId);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.dao.ComProjectKpitDAO;
 import com.yiboshi.science.dao.ComProjectKpitDetailDAO;
+import com.yiboshi.science.entity.ComProjectFundComposition;
 import com.yiboshi.science.entity.ComProjectFundPlan;
 import com.yiboshi.science.entity.ComProjectKpit;
 import com.yiboshi.science.entity.ComProjectKpitDetail;
@@ -56,4 +57,9 @@ public class ComProjectKpitDetailServiceImpl extends BaseServiceImpl<ComProjectK
             this.insertBatch(iList);
         }
     }
+    public void deleteByObjectId(String objectId){
+        ComProjectKpitDetail model = new ComProjectKpitDetail();
+        model.setObjectId(objectId);
+        this.delete(model);
+    }
 }

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

@@ -646,24 +646,33 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
             throw new BusinessException("项目不存在");
         if (comProject.getProjState() > CommonEnum.projState.waitSubmit.getCode())
             throw new BusinessException("当前项目状态不能删除");
-        this.deleteById(id);
+        // 项目合作单位
+        comProjectCooperativeUnitsService.deleteByObjectId(id);
         // 项目参加人员
         comProjectMembersService.deleteByObjectId(id);
         // 经费预算
         comProjectBudgetService.deleteByObjectId(id);
-        // 仪器、设备
-        comProjectEquipmentService.deleteByObjectId(id);
-        // 项目合作单位
-        comProjectCooperativeUnitsService.deleteByObjectId(id);
-        // 成果形式
-        comProjectResultsService.deleteByObjectId(id);
-        // 项目安排及阶段目标
-        comProjectStageGoalService.deleteByObjectId(id);
+        // 年度用款计划表
+        comProjectFundPlanService.deleteByObjectId(id);
+        // 单位支出明细预算表
+        comProjectUnitPaymentService.deleteByObjectId(id);
+        // 项目绩效指标表
+        comProjectKpitDetailService.deleteByObjectId(id);
         // 项目经费构成表
         comProjectFundCompositionService.deleteByObjectId(id);
+        // 仪器、设备
+        comProjectEquipmentService.deleteByObjectId(id);
+        // 在研或完成基础研究项目情况
+        comProjectResearchService.deleteByObjectId(id);
+        // 项目课颖设置表
+        comProjectSubService.deleteByObjectId(id);
+        // 单位科研项目及资金管理制度表
+        comProjectManagementRuleService.deleteByObjectId(id);
+        // 项目信息表
+        comProjectBasicService.deleteByProjId(id);
         // 附件
         ComFileService.deleteByObjectId(id);
-        comProjectBasicService.deleteByProjId(id);
+        this.deleteById(id);
         return id;
     }