소스 검색

问题修改

wangming 1 년 전
부모
커밋
1d4ae0eb1d
1개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 5 4
      business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxProjectManageServiceImpl.java

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

@@ -410,11 +410,12 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
         }
         String listId = (String) summaryfiles;
         String projectId = (String) projectIdobj;
-        ResponseVO responseVO = luckySheetFeignService.getLuckySheetJson(listId);
-        //List<JSONObject> jsonObjects = JsonUtil.convertToJsonObjectList(responseVO.getData());
-        List<JSONObject> jsonObjects = JSON.parseArray(JSON.toJSONString(responseVO.getData()), JSONObject.class);
+//        ResponseVO responseVO = luckySheetFeignService.getLuckySheetJson(listId);
+//        //List<JSONObject> jsonObjects = JsonUtil.convertToJsonObjectList(responseVO.getData());
+//        List<JSONObject> jsonObjects = JSON.parseArray(JSON.toJSONString(responseVO.getData()), JSONObject.class);
+        List<JSONObject> excelJson = luckySheetFeignService.getExcelJson(listId);
         ExportProjectSummaryDto dto = new ExportProjectSummaryDto();
-        dto.setSheetList(jsonObjects);
+        dto.setSheetList(excelJson);
         dto.setProjectId(projectId);
         Object projnameobj = map.get("projname");
         if (ObjectUtil.isEmpty(projnameobj)) {