项目批次整改保存

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxProjectManageService.java

@@ -53,6 +53,13 @@ public interface ZhcxProjectManageService extends IService<ZhcxProjectManageDo>
      */
     void saveSummaryData(SavePorjectSummaryDto dto);
 
+    /**
+     * 保存汇总数据
+     *
+     * @param batchId
+     */
+    void saveSummaryData(String batchId);
+
     R getRectifyReportData(Map<String, Object> map);
 
     int exportRectifyReportData(Map<String, Object> map, HttpServletResponse response);

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

@@ -174,6 +174,27 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
         saveSummaryData2Db(prjTitle, celldatas, summaryDataBo);
     }
 
+    /**
+     * 保存汇总数据
+     *
+     * @param batchId
+     */
+    @Override
+    public void saveSummaryData(String batchId) {
+
+        ZhcxProjectManageRectifyBatchDo batchDo = projectManageRectifyBatchService.getById(batchId);
+
+        List<JSONObject> sheetList = luckySheetFeignService.getExcelJson(batchDo.getSummaryfiles());
+
+        SavePorjectSummaryDto summaryDto = SavePorjectSummaryDto.builder()
+                .batchId(batchId)
+                .projectId(batchDo.getProjectid())
+                .sheetList(sheetList)
+                .build();
+
+        saveSummaryData(summaryDto);
+    }
+
     @Override
     public R getRectifyReportData(Map<String, Object> map) {
         Object projectIdObj = map.get("projectId");
@@ -1090,7 +1111,7 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
      */
     private SaveSummaryDataBo assembleSaveSummaryDataParam(SavePorjectSummaryDto dto) {
 
-        List<ZhcxProjectDeviceNumberDo> deviceNumList = null;
+        List<ZhcxProjectDeviceNumberDo> deviceNumList;
         Map<String, ZhcxProjectDeviceNumberDo> deviceNumMap = new LinkedHashMap<>();
         //机号列表
         if(ObjectUtil.isNotEmpty(dto.getBatchId())) {

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxProjectManageController.java

@@ -78,15 +78,20 @@ public class ZhcxProjectManageController {
     @PostMapping("/saveSummaryData")
     @ApiOperation("保存汇总文件数据")
     public R saveSummaryData(@RequestBody SavePorjectSummaryDto dto) {
-        try {
-            service.saveSummaryData(dto);
-        } catch (CustomException e) {
-            log.error("保存自定义异常", e);
-            R.error("数据加载中，请稍后再同步");
-        } catch (Exception e) {
-            log.error("保存异常", e);
-            return R.error("数据加载中，请稍后再同步");
-        }
+        service.saveSummaryData(dto);
+        return R.ok();
+    }
+
+    /**
+     * 保存汇总文件数据
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("/saveSummaryDataByBatchId")
+    @ApiOperation("保存汇总文件数据")
+    public R saveSummaryDataByBatchId(@RequestBody SavePorjectSummaryDto dto) {
+        service.saveSummaryData(dto.getBatchId());
         return R.ok();
     }