-

Signed-off-by: Administrator <admin@example.com>

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

@@ -34,6 +34,10 @@ public class CbProjectOther implements Serializable {
      * 父项id
      */
     private Long parentId;
+    /**
+     * 层级数
+     */
+    private Integer level;
 
     /**
      * 序号

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

@@ -109,6 +109,10 @@ public class CbProjectOtherImportVo {
      * 父项id
      */
     private Long parentId;
+    /**
+     * 层级数
+     */
+    private Integer level;
     /**
      * 处理后序号
      */

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

@@ -131,6 +131,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
         Assert.notNull(byId, "项目信息不能为空");
         CbProjectOther projectOther = new CbProjectOther();
         projectOther.setParentId(0L);
+        projectOther.setLevel(i);
         projectOther.setProjectId(projectId);
         projectOther.setCbStage(byId.getCbStage());
         QueryWrapper<CbProjectOther> tWrapper = Wrappers.query(projectOther);
@@ -184,12 +185,12 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 }
 
                 // 文件名称
-                String name = file.getFileName();
-                name = FileNameUtil.getPrefix(name);
+                String fileName = file.getFileName();
+                fileName = FileNameUtil.getPrefix(fileName);
                 // 文件Id
                 Long fileId = file.getId();
-                if ("其他费".equals(name)) {
-                    totalDataAnalysis(inputStream, name, file, projectId, cbStage);
+                if ("其他费".equals(fileName)) {
+                    totalDataAnalysis(inputStream, fileName, file, projectId, cbStage);
                     continue;
                 }
                 //解析数据
@@ -206,11 +207,12 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 }
                 log.debug(">>>>" + importVoList.size());
                 CbProjectOther rootProjectOther = new CbProjectOther();
-                rootProjectOther.setItemContent(name);
+                rootProjectOther.setItemContent(fileName);
                 rootProjectOther.setParentId(0L);
                 rootProjectOther.setProjectId(projectId);
+                rootProjectOther.setLevel(0);
                 rootProjectOther.setCbStage(cbStage);
-                rootProjectOther.setCbProjectFileId(0L);
+                rootProjectOther.setCbProjectFileId(fileId);
 
                 LambdaQueryWrapper<CbProjectOther> tWrapper = Wrappers.lambdaQuery(rootProjectOther);
                 CbProjectOther rootOther = this.getOne(tWrapper);
@@ -224,17 +226,24 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 if (CollectionUtil.isNotEmpty(importVoList)) {
                     for (CbProjectOtherImportVo importVo : importVoList) {
                         String number = importVo.getNumber();
-
                         CbProjectOther cbProjectOther = new CbProjectOther();
                         BeanUtil.copyProperties(importVo, cbProjectOther);
+                        if (ObjectUtil.isEmpty(number)) {
+                            cbProjectOther.setParentId(rootMeasuresId);
+                            cbProjectOther.setLevel(1);
+                        } else {
                             //保存一级节点
                             if (ReUtil.isMatch(firstPattern, number) || ReUtil.isMatch(pattern3, number)) {
                                 cbProjectOther.setParentId(rootMeasuresId);
+                                cbProjectOther.setLevel(1);
                             } else if (ReUtil.isMatch(secondPattern, number)) {
                                 // 根据no查询父级节点
                                 CbProjectOther parentCbCostMeasure = getCbProjectOther(rootMeasuresId, number, projectId, cbStage);
+                                String[] split = number.split("\\.");
+                                cbProjectOther.setLevel(split.length);
                                 cbProjectOther.setParentId(parentCbCostMeasure.getId());
                             }
+                        }
                         if (ObjectUtil.isNotEmpty(cbProjectOther.getDealWithNumber())) {
                             String newNo = String.valueOf(rootMeasuresId).concat(".").concat(cbProjectOther.getDealWithNumber());
                             cbProjectOther.setDealWithNumber(newNo);
@@ -277,7 +286,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 BeanUtil.copyProperties(importVo, projectExpenseSummary);
                 projectExpenseSummary.setProjectId(projectId);
                 projectExpenseSummary.setCbStage(cbStage);
-                projectExpenseSummary.setDataType(1);
+                projectExpenseSummary.setDataType(3);
                 projectExpenseSummaryService.save(projectExpenseSummary);
             }
         }