u

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectFileController.java

@@ -8,6 +8,7 @@ import com.dsk.common.enums.BusinessType;
 import com.dsk.common.exception.ServiceException;
 import com.dsk.cscec.domain.CbProjectFile;
 import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
+import com.dsk.cscec.domain.bo.DeleteCbProjectFileBo;
 import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
 import com.dsk.cscec.service.CbProjectFileService;
 import com.dsk.system.domain.vo.SysOssVo;
@@ -75,11 +76,11 @@ public class CbProjectFileController extends BaseController {
     }
 
     /**
-     * 删除项目台账文件
+     * 删除项目台账文件及对应数据
      */
-    @DeleteMapping("/deleteCbProjectFile/{fileId}")
-    public R<Void> deleteCbProjectFile(@NotNull(message = "文件ID不能为空") @PathVariable Long fileId) {
-        return toAjax(baseService.deleteProjectFile(new Long[]{fileId}));
+    @DeleteMapping("/deleteCbProjectFile")
+    public R<Void> deleteCbProjectFile(@Validated @RequestBody DeleteCbProjectFileBo deleteBo) {
+        return toAjax(baseService.deleteProjectFile(deleteBo));
     }
 
     /**

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

+package com.dsk.cscec.domain.bo;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author sxk
+ * @date 2024.02.28
+ * @time 10:45
+ */
+@Data
+public class DeleteCbProjectFileBo {
+    @NotNull(message = "文件ID不能为空")
+    private Long fileId;
+    @NotNull(message = "成本类型不能为空")
+    private Integer cbType;
+}

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

@@ -3,6 +3,7 @@ package com.dsk.cscec.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.cscec.domain.CbProjectFile;
 import com.dsk.cscec.domain.bo.AddProjectFileUploadBo;
+import com.dsk.cscec.domain.bo.DeleteCbProjectFileBo;
 import com.dsk.cscec.domain.vo.QueryProjectFileUploadDetailVo;
 import com.dsk.system.domain.vo.SysOssVo;
 
@@ -32,12 +33,12 @@ public interface CbProjectFileService extends IService<CbProjectFile> {
     CbProjectFile addProjectFile(AddProjectFileUploadBo fileUploadBo, SysOssVo oss);
 
     /**
-     * 批量逻辑删除项目上传文件记录
+     * 删除项目台账文件及对应数据
      *
-     * @param fileIds 文件ID
+     * @param deleteBo 待删除文件信息
      * @return 删除结果
      */
-    Integer deleteProjectFile(Long[] fileIds);
+    Integer deleteProjectFile(DeleteCbProjectFileBo deleteBo);
 
     /**
      * 获取项目文件上传详情
@@ -49,9 +50,10 @@ public interface CbProjectFileService extends IService<CbProjectFile> {
 
     /**
      * 查询项目文件解析列表
+     *
      * @param projectId 项目ID
-     * @param cbType 成本类型(0:直接费成本、1:工料汇总、2:措施项目、3:其他项目、4:现场经费、5:成本汇总)
-     * @param cbStage 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     * @param cbType    成本类型(0:直接费成本、1:工料汇总、2:措施项目、3:其他项目、4:现场经费、5:成本汇总)
+     * @param cbStage   成本阶段(0:标前成本、1:标后成本、2:转固成本)
      * @return
      */
     List<CbProjectFile> selectAnalysisList(Long projectId, Integer cbType, Integer cbStage);
@@ -66,5 +68,5 @@ public interface CbProjectFileService extends IService<CbProjectFile> {
      * @param errmsg    RMSG
      * @return boolean
      */
-    boolean UpdateProjectFileStatus(Long fileId,String errmsg,Integer status);
+    boolean UpdateProjectFileStatus(Long fileId, String errmsg, Integer status);
 }

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

@@ -102,8 +102,8 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
                     .collect(Collectors.toList());
             if (summaryList.size() != importList.size()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
-                log.error("FileId:" + projectFile.getId() + ",表格中存在\"名称\"列为空数据!");
-                projectFile.setFailRemark("表格中存在\"名称\"列为空数据");
+                log.error("FileId:" + projectFile.getId() + ",表格中\"名称\"列存在空数据!");
+                projectFile.setFailRemark("表格中\"名称\"列存在空数据");
                 projectFileMapper.updateById(projectFile);
                 continue;
             }

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

@@ -129,7 +129,7 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
             }
 
             //筛选有效数据
-            List<CbSceneExpenseChildrenImportBo> summaryList = importList.stream().parallel()
+            List<CbSceneExpenseChildrenImportBo> chidrenList = importList.stream().parallel()
                     //筛选名称列不为空数据
                     .filter(item -> StringUtils.isNotBlank(item.getExpenseName()))
                     .peek(item -> {
@@ -154,10 +154,10 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
                         item.setCreateTime(new Date());
                     })
                     .collect(Collectors.toList());
-            if (summaryList.size() != importList.size()) {
+            if (chidrenList.size() != importList.size()) {
                 projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
-                log.error("FileId:" + projectFile.getId() + ",表格中存在\"名称\"列为空数据");
-                projectFile.setFailRemark("表格中存在\"名称\"列为空数据");
+                log.error("FileId:" + projectFile.getId() + ",表格中\"名称\"列存在空数据");
+                projectFile.setFailRemark("表格中\"名称\"列存在空数据");
                 projectFileMapper.updateById(projectFile);
                 continue;
             }
@@ -165,7 +165,7 @@ public class CbSceneExpenseChildrenServiceImpl extends ServiceImpl<CbSceneExpens
                 try {
                     //批量插入数据
                     CbSceneExpenseChildrenServiceImpl impl = new CbSceneExpenseChildrenServiceImpl();
-                    Assert.isTrue(impl.saveBatch(BeanUtil.copyToList(summaryList, CbSceneExpenseChildren.class)), "数据插入失败");
+                    Assert.isTrue(impl.saveBatch(BeanUtil.copyToList(chidrenList, CbSceneExpenseChildren.class)), "数据插入失败");
                     //更新文件状态
                     projectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_SUCCESS);
                     Assert.isTrue(projectFileMapper.updateById(projectFile) > 0, "解析成功后文件状态更新失败");