update

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbSummaryActualListVo.java

@@ -88,4 +88,9 @@ public class CbSummaryActualListVo extends BaseEntity {
     private String expenseDate;
 
     private List<CbSummaryActualListVo> children;
+
+    /**
+     * 是否有子级（0否1是）
+     */
+    private Integer hasChildren;
 }

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

@@ -22,7 +22,7 @@ import java.util.Map;
 public interface CbSummaryService extends IService<CbSummary> {
 
     /**
-     * 项目汇总导入
+     * 成本汇总导入
      * @param projectId
      */
     void importCbSummary(Long projectId);

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

@@ -111,8 +111,8 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
      */
     boolean saveCbSummaryProject(Long projectId, CbProjectFile file) {
         //修改文件状态为解析中
-        file.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSING);
-        cbProjectFileMapper.updateById(file);
+//        file.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSING);
+//        cbProjectFileMapper.updateById(file);
 
         //文件下载
         InputStream inputStream = ossService.downFileIO(file.getFileOssId());
@@ -184,8 +184,8 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
      */
     boolean saveCbSummaryCostAccount(Long projectId, CbProjectFile file) {
         //修改文件状态为解析中
-        file.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSING);
-        cbProjectFileMapper.updateById(file);
+//        file.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSING);
+//        cbProjectFileMapper.updateById(file);
 
         //文件下载
         InputStream inputStream = ossService.downFileIO(file.getFileOssId());
@@ -213,7 +213,7 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
                 List<CbSummary> cbSummaryList = baseMapper.selectList(
                         new LambdaQueryWrapper<CbSummary>()
                                 .eq(CbSummary::getProjectId, projectId)
-                                .eq(CbSummary::getCbType, 1)
+                                .eq(CbSummary::getCbType, 2)
                                 .orderByAsc(CbSummary::getSort)
                 );
                 for (CbSummary cbSummary : cbSummaryList) {
@@ -301,8 +301,16 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
             list.add(cbSummaryActualListVo);
             return list;
         } else {
-            //递归列表
-            childrenList = getProjectSumList(bo);
+//            //递归列表
+//            childrenList = getProjectSumList(bo);
+            childrenList.forEach(child->{
+                Long count = baseMapper.selectCount(new LambdaQueryWrapper<CbSummary>().eq(CbSummary::getParentId,child.getId()));
+                if(count>0l){
+                    child.setHasChildren(1);
+                }else {
+                    child.setHasChildren(0);
+                }
+            });
             cbSummaryActualListVo.setChildren(childrenList);
 
             list.add(cbSummaryActualListVo);