措施费相关导入优化

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

@@ -17,6 +17,7 @@ import com.dsk.common.helper.LoginHelper;
 import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.common.utils.redis.RedisUtils;
 import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.CbProjectExpenseSummary;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualPushBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
@@ -24,6 +25,7 @@ import com.dsk.cscec.domain.vo.CbCostMeasureActualVo;
 import com.dsk.cscec.domain.vo.CbCostMeasuresImportVo;
 import com.dsk.cscec.domain.vo.CbCostMeasuresItemVo;
 import com.dsk.cscec.listener.ProjectCostMeasureImportListener;
+import com.dsk.cscec.service.CbProjectExpenseSummaryService;
 import com.dsk.cscec.service.ICbCostMeasureService;
 import com.dsk.system.domain.vo.SysUserImportVo;
 import com.dsk.system.listener.SysUserImportListener;
@@ -57,6 +59,10 @@ public class CbCostMeasureController {
     private ICbCostMeasureService cbCostMeasureService;
 
 
+    @Autowired
+    private CbProjectExpenseSummaryService cbProjectExpenseSummaryService;
+
+
     /**
      * 措施费一级大类
      * 根据项目查询措施费一级大类
@@ -161,15 +167,13 @@ public class CbCostMeasureController {
     /**
      * 措施费导入数据
      *
-     * @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);
+    public R<Void> parseCbCostMeasureFile(Long projectId) throws Exception {
+        cbCostMeasureService.parseCbCostMeasureFile(projectId);
         return R.ok();
     }
 
@@ -187,11 +191,23 @@ 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.getInputStream(),projectId,dataType);
+        cbCostMeasureService.importExcelSummaryData(file.getInputStream(),projectId,null,dataType);
         return R.ok();
     }
 
 
+    @SaIgnore
+    @Log(title = "措施费汇总获取")
+//    @SaCheckPermission("system:user:import")
+    @PostMapping(value = "/summary/data")
+    public R<List<CbProjectExpenseSummary>> importSummaryData(Long projectId) throws Exception {
+        Integer dataType=2;
+        List<CbProjectExpenseSummary> cbProjectExpenseSummaries = cbProjectExpenseSummaryService.queryCbSceneExpenseSummaryDataByType(projectId, dataType);
+        return R.ok(cbProjectExpenseSummaries);
+    }
+
+
+
     public static void main(String[] args) throws FileNotFoundException {
         List list =new ArrayList<>();
 
@@ -199,7 +215,7 @@ public class CbCostMeasureController {
         FileInputStream inputStream=new FileInputStream(file);
 
 
-        ExcelResult<CbCostMeasuresImportVo> result = ExcelUtil.importExcel(inputStream, CbCostMeasuresImportVo.class, new ProjectCostMeasureImportListener(1L,1));
+        ExcelResult<CbCostMeasuresImportVo> result = ExcelUtil.importExcel(inputStream, CbCostMeasuresImportVo.class, new ProjectCostMeasureImportListener(1L));
         String analysis = result.getAnalysis();
         List<CbCostMeasuresImportVo> list1 = result.getList();
 

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

@@ -32,11 +32,7 @@ import java.util.regex.Pattern;
 public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCostMeasuresImportVo> implements ExcelListener<CbCostMeasuresImportVo> {
 
     private final CbCostMeasureServiceImpl cbCostMeasureService;
-//
-//    private final String password;
-
     private final Long projectId;
-    private final Integer cbStage;
 
     private List<CbCostMeasuresImportVo> dataList = new ArrayList<>();
 
@@ -49,10 +45,8 @@ public class ProjectCostMeasureImportListener extends AnalysisEventListener<CbCo
     private final StringBuilder successMsg = new StringBuilder();
     private final StringBuilder failureMsg = new StringBuilder();
 
-    public ProjectCostMeasureImportListener(Long projectId, Integer cbStage) {
-//        String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
+    public ProjectCostMeasureImportListener(Long projectId) {
         this.cbCostMeasureService = SpringUtils.getBean(CbCostMeasureServiceImpl.class);
-        this.cbStage = cbStage;
         this.projectId = projectId;
 //        this.operName = LoginHelper.getUsername();
     }

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

@@ -35,7 +35,7 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
 //    private final String password;
 
     private final Long projectId;
-    private final Integer cbStage;
+    private final Long fileId;
     private final Integer dataType;
 
     private List<CbProjectExpenseSummaryImportVo> dataList = new ArrayList<>();
@@ -48,9 +48,9 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
     private final StringBuilder successMsg = new StringBuilder();
     private final StringBuilder failureMsg = new StringBuilder();
 
-    public ProjectCostMeasureSummaryImportListener(Long projectId, Integer cbStage,Integer dataType) {
+    public ProjectCostMeasureSummaryImportListener(Long projectId, Long fileId,Integer dataType) {
         this.cbProjectExpenseSummaryService = SpringUtils.getBean(CbProjectExpenseSummaryService.class);
-        this.cbStage = cbStage;
+        this.fileId = fileId;
         this.projectId = projectId;
         this.dataType=dataType;
     }
@@ -61,7 +61,7 @@ public class ProjectCostMeasureSummaryImportListener extends AnalysisEventListen
         CbProjectExpenseSummary cbProjectExpenseSummary=new CbProjectExpenseSummary();
         BeanUtil.copyProperties(importVo,cbProjectExpenseSummary);
         cbProjectExpenseSummary.setProjectId(projectId);
-        cbProjectExpenseSummary.setCbStage(cbStage);
+        cbProjectExpenseSummary.setProjectFileId(fileId);
         cbProjectExpenseSummary.setDataType(dataType);
 //        cbProjectExpenseSummary.setCreateBy(LoginHelper.getUsername());
         boolean save = cbProjectExpenseSummaryService.save(cbProjectExpenseSummary);

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

@@ -22,4 +22,7 @@ public interface CbProjectExpenseSummaryService extends IService<CbProjectExpens
      * @return 现场经费汇总数据
      */
     List<CbProjectExpenseSummary> getCbSceneExpenseSummaryData(Long projectId);
+
+
+    List<CbProjectExpenseSummary> queryCbSceneExpenseSummaryDataByType(Long projectId,Integer dataType);
 }

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

@@ -5,6 +5,7 @@ import com.dsk.common.core.domain.PageQuery;
 import com.dsk.common.core.domain.entity.SysDictData;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.cscec.domain.CbCostMeasure;
+import com.dsk.cscec.domain.CbProjectExpenseSummary;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualPushBo;
 import com.dsk.cscec.domain.bo.CbCostMeasureActualSaveBo;
@@ -34,12 +35,10 @@ public interface ICbCostMeasureService extends IService<CbCostMeasure> {
 
     void pushCostMeasureActual(CbCostMeasureActualPushBo pushBo);
 
-    List<String> importExcelSummaryData(InputStream inputStream, Long projectId,Integer dataType);
+    List<String> importExcelSummaryData(InputStream inputStream, Long projectId,Long fileId, 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/CbProjectExpenseSummaryServiceImpl.java

@@ -139,6 +139,16 @@ public class CbProjectExpenseSummaryServiceImpl extends ServiceImpl<CbProjectExp
                 .eq(CbProjectExpenseSummary::getDataType, CbProjectConstants.CB_TYPE_SCENE_EXPENSE));
     }
 
+    @Override
+    public List<CbProjectExpenseSummary> queryCbSceneExpenseSummaryDataByType(Long projectId, Integer dataType) {
+        //校验项目是否存在
+        this.checkProjectExist(projectId);
+
+        return baseMapper.selectList(new LambdaQueryWrapper<CbProjectExpenseSummary>()
+                .eq(CbProjectExpenseSummary::getProjectId, projectId)
+                .eq(CbProjectExpenseSummary::getDataType, dataType));
+    }
+
     /**
      * 校验项目是否存在
      *