|
@@ -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)) {
|