update

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

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

@@ -22,6 +22,7 @@ import com.dsk.cscec.domain.vo.CbProjectOtherImportVo;
 import com.dsk.cscec.domain.vo.CbProjectOtherVo;
 import com.dsk.cscec.listener.CbProjectExpenseSummaryImportListener;
 import com.dsk.cscec.listener.CbProjectOtherImportListener;
+import com.dsk.cscec.mapper.CbProjectFileMapper;
 import com.dsk.cscec.mapper.CbProjectOtherMapper;
 import com.dsk.cscec.service.*;
 import com.dsk.system.service.ISysOssService;
@@ -54,6 +55,8 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
     private ISysOssService ossService;
     @Resource
     private CbProjectExpenseSummaryService projectExpenseSummaryService;
+    @Resource
+    private CbProjectFileMapper projectFileMapper;
 
     @SneakyThrows
     @Override
@@ -164,11 +167,7 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
         Integer cbStage = baseBo.getCbStage();
         Assert.notNull(projectId, "项目信息不能为空");
         // 查询其他费用导入文件
-        List<CbProjectFile> projectFileList = projectFileService.list(Wrappers.<CbProjectFile>lambdaQuery()
-                .eq(CbProjectFile::getProjectId, baseBo.getProjectId())
-                .eq(CbProjectFile::getCbType, CbProjectConstants.CB_TYPE_SCENE_EXPENSE)
-                .eq(CbProjectFile::getCbStage, baseBo.getCbStage())
-                .in(CbProjectFile::getFileParseStatus, Arrays.asList(0)));
+        List<CbProjectFile> projectFileList = projectFileMapper.selectAnalysisList(projectId, CbProjectConstants.CB_TYPE_OTHER_PROJECT, cbStage);
         if (ObjectUtils.isEmpty(projectFileList)) {
             return;
         }
@@ -196,7 +195,6 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                 //解析数据
                 ExcelResult<CbProjectOtherImportVo> importVoExcelResult =
                         ExcelUtil.importExcel(inputStream, CbProjectOtherImportVo.class,new CbProjectOtherImportListener(projectId, fileId));
-                log.info(importVoExcelResult.getAnalysis());
                 List<CbProjectOtherImportVo> importVoList = importVoExcelResult.getList();
                 if (CollectionUtil.isEmpty(importVoList)) {
                     //解析失败
@@ -262,7 +260,6 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
         //解析数据
         ExcelResult<CbProjectExpenseSummaryImportVo> importVoExcelResult =
                 ExcelUtil.importExcel(inputStream, CbProjectExpenseSummaryImportVo.class,new CbProjectExpenseSummaryImportListener(projectId, cbStage));
-        log.info(importVoExcelResult.getAnalysis());
         List<CbProjectExpenseSummaryImportVo> importVoList = importVoExcelResult.getList();
         if (CollectionUtil.isEmpty(importVoList)) {
             //解析失败

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

@@ -93,7 +93,7 @@ public class CbSummaryServiceImpl extends ServiceImpl<CbSummaryMapper, CbSummary
                 } catch (Exception e) {
                     //修改文件状态
                     cbProjectFile.setFileParseStatus(CbProjectConstants.PROJECT_FILE_STATUS_PARSE_FAIL);
-                    cbProjectFile.setFailRemark("失败原因：" + e.getMessage());
+                    cbProjectFile.setFailRemark(e.getMessage());
                     cbProjectFileMapper.updateById(cbProjectFile);
                 }
 //            }