措施费相关导入优化

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

@@ -38,8 +38,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 措施费导入
@@ -150,7 +152,24 @@ public class CbCostMeasureController {
 //    @SaCheckPermission("system:user:import")
     @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importData(@RequestPart("file") MultipartFile file, Long projectId) throws Exception {
-        cbCostMeasureService.importExcelData(file,projectId);
+        String name = file.getOriginalFilename();
+        cbCostMeasureService.importExcelData(file.getInputStream(),name,null,projectId);
+        return R.ok();
+    }
+
+
+    /**
+     * 措施费导入数据
+     *
+     * @param projectFileIds          导入文件
+     * @param projectId     项目id
+     */
+    @SaIgnore
+    @Log(title = "措施费导入", businessType = BusinessType.IMPORT)
+    @PostMapping(value = "/parseCbCostMeasureFile")
+    public R<Void> parseCbCostMeasureFile(Long projectId,@RequestParam("projectFileIds") Long[] projectFileIds) throws Exception {
+        List<Long> fileIds = Arrays.stream(projectFileIds).collect(Collectors.toList());
+        cbCostMeasureService.parseCbCostMeasureFile(projectId,fileIds);
         return R.ok();
     }
 
@@ -168,7 +187,7 @@ public class CbCostMeasureController {
     @PostMapping(value = "/summary/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importSummaryData(@RequestPart("file") MultipartFile file, Long projectId) throws Exception {
         Integer dataType=2;
-        cbCostMeasureService.importExcelSummaryData(file,projectId,dataType);
+        cbCostMeasureService.importExcelSummaryData(file.getInputStream(),projectId,dataType);
         return R.ok();
     }
 

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

@@ -28,7 +28,7 @@ public class CbCostMeasure {
     /**
     * 成本阶段( 0:标前成本、1:标后成本、2:转固成本)
     */
-    private Integer cbStage;
+    private Long projectFileId;
 
     /**
     * 父项id

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

@@ -40,6 +40,8 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
 
     private List<CbCostMeasuresImportVo> dataList = new ArrayList<>();
 
+    private List<String> errList = new ArrayList<>();
+
 //    private final String operName;
 
     private int successNum = 0;
@@ -62,11 +64,14 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
         if (StrUtil.isEmpty(importVo.getItemContent())) {
             failureNum++;
             failureMsg.append("<br/>" + rowIndex + "行 解析失败：清单内容不能为空");
+            errList.add(failureMsg.toString());
+            return;
         }
         String number = importVo.getNumber();
         if (StrUtil.isEmpty(number)) {
             failureNum++;
             failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号不能为空");
+            errList.add(failureMsg.toString());
         }
 
         Boolean numberMatch = false;
@@ -79,6 +84,7 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
         } else {
             failureNum++;
             failureMsg.append("<br/>" + rowIndex + "行 解析失败：序号格式错误");
+            errList.add(failureMsg.toString());
         }
 
 
@@ -186,7 +192,7 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
             public String getAnalysis() {
                 if (failureNum > 0) {
                     failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-                    throw new ServiceException(failureMsg.toString());
+//                    throw new ServiceException(failureMsg.toString());
                 } else {
                     successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
                 }
@@ -200,7 +206,7 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
 
             @Override
             public List<String> getErrorList() {
-                return null;
+                return errList;
             }
         };
     }

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

@@ -39,6 +39,7 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
     private final Integer dataType;
 
     private List<CbProjectExpenseSummaryImportVo> dataList = new ArrayList<>();
+    private List<String> errorList = new ArrayList<>();
 
 //    private final String operName;
 
@@ -62,8 +63,15 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
         cbProjectExpenseSummary.setProjectId(projectId);
         cbProjectExpenseSummary.setCbStage(cbStage);
         cbProjectExpenseSummary.setDataType(dataType);
-        cbProjectExpenseSummary.setCreateBy(LoginHelper.getUsername());
-        cbProjectExpenseSummaryService.save(cbProjectExpenseSummary);
+//        cbProjectExpenseSummary.setCreateBy(LoginHelper.getUsername());
+        boolean save = cbProjectExpenseSummaryService.save(cbProjectExpenseSummary);
+        if(!save){
+            String errmsg = context.readRowHolder().getRowIndex() + " error";
+            log.debug("ProjectCostMeasureSummaryImportListener.invoke() "+errmsg);
+            errorList.add(errmsg);
+        }
+        successNum+=1;
+        dataList.add(importVo);
 
     }
 
@@ -94,7 +102,7 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
 
             @Override
             public List<String> getErrorList() {
-                return null;
+                return errorList;
             }
         };
     }

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

@@ -56,4 +56,15 @@ public interface CbProjectFileService extends IService<CbProjectFile> {
      */
     List<CbProjectFile> selectAnalysisList(Long projectId, Integer cbType, Integer cbStage);
 
+
+    /**
+     * 更新项目文件状态
+     *
+     * @param projectId 项目ID
+     * @param cbType    CB型
+     * @param fileId    文件ID文件ID
+     * @param errmsg    RMSG
+     * @return boolean
+     */
+    boolean UpdateProjectFileStatus(Long fileId,String errmsg,Integer status);
 }

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

@@ -12,6 +12,7 @@ import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
 import com.dsk.cscec.domain.vo.CbCostMeasuresItemVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -23,7 +24,7 @@ import java.util.Map;
  */
 public interface ICbCostMeasureService extends IService<CbCostMeasure> {
 
-    void importExcelData(MultipartFile file, Long projectId);
+    void importExcelData(InputStream inputStream, String fileName,Long fileId, Long projectId);
 
     List<Map<String, Object>> listByLevel(Long projectId, int i);
 
@@ -33,6 +34,12 @@ public interface ICbCostMeasureService extends IService<CbCostMeasure> {
 
     void pushCostMeasureActual(CbCostMeasureActualPushBo pushBo);
 
-    void importExcelSummaryData(MultipartFile file, Long projectId,Integer dataType);
+    List<String> importExcelSummaryData(InputStream inputStream, Long projectId,Integer dataType);
+
+    void parseCbCostMeasureFile(Long projectId);
+
+    void parseCbCostMeasureFile(Long projectId, List<Long> projectFileIds);
+
+    boolean reparseCbCostMeasureFile(Long projectId,Long projectFileId);
 }
 

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

@@ -167,6 +167,16 @@ public class CbProjectFileServiceImpl extends ServiceImpl<CbProjectFileMapper, C
         return baseMapper.selectAnalysisList(projectId, cbType, cbStage);
     }
 
+    @Override
+    public boolean UpdateProjectFileStatus(Long fileId, String errmsg,Integer status) {
+        CbProjectFile cbProjectFile=new CbProjectFile();
+        cbProjectFile.setId(fileId);
+        cbProjectFile.setFailRemark(errmsg);
+        cbProjectFile.setFileParseStatus(status);
+        boolean b = this.updateById(cbProjectFile);
+        return b;
+    }
+
     /**
      * 校验项目是否存在
      *

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/CbCostMeasureMapper.xml

@@ -6,7 +6,7 @@
     <!--@Table cb_cost_measure-->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="project_id" jdbcType="BIGINT" property="projectId" />
-    <result column="cb_stage" jdbcType="INTEGER" property="cbStage" />
+    <result column="cb_stage" jdbcType="INTEGER" property="projectFileId" />
     <result column="parent_id" jdbcType="BIGINT" property="parentId" />
     <result column="level" jdbcType="INTEGER" property="level" />
     <result column="number" jdbcType="VARCHAR" property="number" />