update

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

 package com.dsk.cscec.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -48,6 +49,7 @@ public class CbSummaryActual implements Serializable {
     /**
      * 删除状态(0:否、2:是)
      */
+    @TableLogic
     private Integer delFlag;
 
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/CbSummaryCostAccountImportListener.java

@@ -49,15 +49,17 @@ public class CbSummaryCostAccountImportListener extends AnalysisEventListener<Cb
             int count = StringUtil.count(importVo.getNumber(), "-");
             importVo.setLevel(count + 1);
         } else {
-            failureNum++;
-            failureMsg.append("<br/>").append("第" + sort + "条数据序号为空");
-            return;
+//            failureNum++;
+//            failureMsg.append("<br/>").append("第" + sort + "条数据序号为空");
+//            return;
+            throw new ServiceException("表格中存在'序号'列为空数据!");
         }
         //成本科目不能为空
         if (StringUtil.isBlank(importVo.getCbName())) {
-            failureNum++;
-            failureMsg.append("<br/>").append("第" + sort + "条数据成本科目为空");
-            return;
+//            failureNum++;
+//            failureMsg.append("<br/>").append("第" + sort + "条数据成本科目为空");
+//            return;
+            throw new ServiceException("表格中存在'成本科目'列为空数据!");
         }
 
         //父级数据处理

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/CbSummaryProjectImportListener.java

@@ -45,9 +45,10 @@ public class CbSummaryProjectImportListener extends AnalysisEventListener<CbSumm
     public void invoke(CbSummaryProjectImportVo importVo, AnalysisContext context) {
         //名称不能为空
         if (StringUtil.isBlank(importVo.getCbName())) {
-            failureNum++;
-            failureMsg.append("<br/>").append("第" + sort + "条数据名称为空");
-            return;
+//            failureNum++;
+//            failureMsg.append("<br/>").append("第" + sort + "条数据名称为空");
+//            return;
+            throw new ServiceException("表格中存在'名称'列为空数据!");
         }
         //添加父级数据
         if (sort == 0) {
@@ -70,9 +71,10 @@ public class CbSummaryProjectImportListener extends AnalysisEventListener<CbSumm
                     .filter(vo -> StringUtil.isNotBlank(vo.getNumber())).limit(1).map(CbSummaryProjectImportVo::getLevel).toArray();
             //数据序号错误
             if (ObjectUtil.isEmpty(objects)) {
-                failureNum++;
-                failureMsg.append("<br/>").append("第" + sort + "条数据序号错误");
-                return;
+//                failureNum++;
+//                failureMsg.append("<br/>").append("第" + sort + "条数据序号错误");
+//                return;
+                throw new ServiceException("'序号'列数据错误，无法匹配层级!");
             }
 
             Integer lastLevel = (Integer) objects[0];

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

@@ -71,16 +71,16 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
     @Override
     public void importCbSummary(Long projectId) {
 
-        //获取待解析和待删除文件信息
+        //获取待解析和解析失败文件信息
         List<CbProjectFile> cbProjectFiles = cbProjectFileMapper.selectAnalysisList(projectId, CbProjectConstants.CB_TYPE_SUMMARY, null);
 
         //解析数据
         cbProjectFiles.forEach(cbProjectFile -> {
-            if (cbProjectFile.getDelFlag() == 1) {
-                //根据fileId删除相关基础数据，并删除文件
-                baseMapper.delete(new LambdaQueryWrapper<CbSummary>().eq(CbSummary::getCbProjectFileId, cbProjectFile.getId()));
-                cbProjectFileMapper.removeById(cbProjectFile.getId());
-            } else {
+//            if (cbProjectFile.getDelFlag() == 1) {
+//                //根据fileId删除相关基础数据，并删除文件
+//                baseMapper.delete(new LambdaQueryWrapper<CbSummary>().eq(CbSummary::getCbProjectFileId, cbProjectFile.getId()));
+//                cbProjectFileMapper.removeById(cbProjectFile.getId());
+//            } else {
                 try {
                     if (cbProjectFile.getFileName().contains("项目")) {
                         saveCbSummaryProject(projectId, cbProjectFile);
@@ -96,7 +96,7 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
                     cbProjectFile.setFailRemark("失败原因：" + e.getMessage());
                     cbProjectFileMapper.updateById(cbProjectFile);
                 }
-            }
+//            }
 
         });
 
@@ -152,6 +152,9 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
                     CbSummary parent = cbSummaryList.stream().filter(summary -> summary.getSort() < cbSummary.getSort() && summary.getLevel() == parentLevel)
                             .max(Comparator.comparing(CbSummary::getSort)).get();
 
+                    if(ObjectUtil.isNull(parent)){
+                        throw new ServiceException("'序号'列数据错误，无法匹配层级!");
+                    }
                     cbSummary.setParentId(parent.getId());
                 }
 
@@ -224,7 +227,9 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
                     Integer parentLevel = cbSummary.getLevel() - 1;
                     CbSummary parent = cbSummaryList.stream().filter(summary -> summary.getSort() < cbSummary.getSort() && summary.getLevel() == parentLevel)
                             .max(Comparator.comparing(CbSummary::getSort)).get();
-
+                    if(ObjectUtil.isNull(parent)){
+                        throw new ServiceException("'序号'列数据错误，无法匹配层级!");
+                    }
                     cbSummary.setParentId(parent.getId());
                 }
 
@@ -290,6 +295,11 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
             children.setTaxExclusiveExpenseTotal(total.get("taxExclusiveExpenseTotal"));
             children.setTaxInclusiveExpenseTotal(total.get("taxInclusiveExpenseTotal"));
         });
+        if (CollectionUtil.isNotEmpty(childrenList)) {
+            cbSummaryActualListVo.setHasChildren(1);
+        } else {
+            cbSummaryActualListVo.setHasChildren(0);
+        }
 
         if (0 == cbSummaryActualListVo.getLevel() && 1 == bo.getCbType()) {
             //项目汇总一级列表