bug fix

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectFileServiceImpl.java

@@ -40,14 +40,15 @@ public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, C
     private ICbQuantitySummaryService quantitySummaryService;
     @Resource
     private ICbQuantitySummaryActualService quantitySummaryActualService;
-    //@Resource
-    //private ICbCostMeasureService costMeasureService;
+    @Resource
+    private ICbCostMeasureService costMeasureService;
     @Resource
     private ICbCostMeasureActualService costMeasureActualActualService;
-    //@Resource
-    //private CbProjectOtherService projectOtherService;
+    @Resource
+    private CbProjectOtherService projectOtherService;
     @Resource
     private CbSceneExpenseChildrenService sceneExpenseChildrenService;
+    @Resource
     private CbProjectExpenseSummaryService projectExpenseSummaryService;
     @Resource
     private CbSummaryService summaryService;
@@ -137,16 +138,24 @@ public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, C
                     break;
                 case CbProjectConstants.CB_TYPE_MEASURE_PROJECT:
                     //措施项目
-                    //List<CbCostMeasure> costMeasureList = costMeasureService.list(new LambdaQueryWrapper<CbCostMeasure>()
-                    //        .eq(CbCostMeasure::getProjectFileId, fileId));
-                    ////删除每月成本数据(关联导入数据主键)
-                    //costMeasureActualActualService.removeBatchByIds(costMeasureActualActualService.list(new LambdaQueryWrapper<CbCostMeasureActual>()
-                    //        .in(CbCostMeasureActual::getPlanMeasureId, costMeasureList.stream().map(CbCostMeasure::getId).collect(Collectors.toList()))));
-                    ////删除导入数据(关联文件ID)
-                    //costMeasureService.removeBatchByIds(costMeasureList);
+                    List<CbCostMeasure> costMeasureList = costMeasureService.list(new LambdaQueryWrapper<CbCostMeasure>()
+                            .eq(CbCostMeasure::getProjectFileId, fileId));
+                    //删除每月成本数据(关联导入数据主键)
+                    costMeasureActualActualService.removeBatchByIds(costMeasureActualActualService.list(new LambdaQueryWrapper<CbCostMeasureActual>()
+                            .in(CbCostMeasureActual::getPlanMeasureId, costMeasureList.stream().map(CbCostMeasure::getId).collect(Collectors.toList()))));
+                    //删除导入数据(关联文件ID)
+                    costMeasureService.removeBatchByIds(costMeasureList);
+                    //删除汇总数据
+                    projectExpenseSummaryService.removeBatchByIds(projectExpenseSummaryService.list(new LambdaQueryWrapper<CbProjectExpenseSummary>()
+                            .eq(CbProjectExpenseSummary::getProjectFileId, deleteBo.getFileId())));
                     break;
                 case CbProjectConstants.CB_TYPE_OTHER_PROJECT:
                     //其他项目
+                    projectOtherService.removeBatchByIds(projectOtherService.list(new LambdaQueryWrapper<CbProjectOther>()
+                            .eq(CbProjectOther::getCbProjectFileId, deleteBo.getFileId())));
+                    //删除汇总数据
+                    projectExpenseSummaryService.removeBatchByIds(projectExpenseSummaryService.list(new LambdaQueryWrapper<CbProjectExpenseSummary>()
+                            .eq(CbProjectExpenseSummary::getProjectFileId, deleteBo.getFileId())));
                     break;
                 case CbProjectConstants.CB_TYPE_SCENE_EXPENSE:
                     //现场经费

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbProjectRecordMapper.xml

@@ -3,39 +3,6 @@
 <mapper namespace="com.dsk.cscec.mapper.CbProjectRecordMapper">
     <!--获取项目台账列表-->
     <select id="selectPageProjectRecordList" resultType="com.dsk.cscec.domain.vo.CbProjectRecordSearchVo">
-<!--        select-->
-<!--        cpr.id,-->
-<!--        cpr.related_id,-->
-<!--        cpr.project_name,-->
-<!--        cpr.cb_stage,-->
-<!--        cpr.project_file_status,-->
-<!--        cpr.ipm_project_no,-->
-<!--        cpr.is_get_project_detail,-->
-<!--        cpr.project_file_name,-->
-<!--        cpr.create_time-->
-<!--        from cb_project_record cpr-->
-<!--        left join cb_project_record cprr-->
-<!--        on cpr.related_id = cprr.related_id-->
-<!--        and cpr.cb_stage &lt; cprr.cb_stage-->
-<!--        where-->
-<!--        cprr.cb_stage is null-->
-<!--        and-->
-<!--        cpr.del_flag=#{deleteFlagExist}-->
-<!--        <if test="searchBo.projectName != null and searchBo.projectName != ''">-->
-<!--            and cpr.project_name like concat('%',#{searchBo.projectName},'%')-->
-<!--        </if>-->
-<!--        <if test="searchBo.ipmProjectNo != null and searchBo.ipmProjectNo != ''">-->
-<!--            and cpr.ipm_project_no = #{searchBo.ipmProjectNo}-->
-<!--        </if>-->
-<!--        <if test="searchBo.cbStage != null">-->
-<!--            and cpr.cb_stage = #{searchBo.cbStage}-->
-<!--        </if>-->
-<!--        <if test="searchBo.projectFileStatus != null">-->
-<!--            and project_file_status = #{searchBo.projectFileStatus}-->
-<!--        </if>-->
-<!--        and-->
-<!--        cpr.project_file_status != #{projectFileStatusPreparing}-->
-<!--        order by cpr.create_time desc-->
         select a.*
         from (
         select DISTINCT cpr.id,