|
@@ -416,30 +416,16 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
|
|
|
|
@Override
|
|
|
public int exportRectifyReportData(Map<String, Object> map, HttpServletResponse response) {
|
|
|
-
|
|
|
-// if(!excelUtils.GetLicense()) {
|
|
|
-// return 0;
|
|
|
-// }
|
|
|
-//
|
|
|
-// Workbook workbook = new Workbook();
|
|
|
-// WorksheetCollection worksheets = workbook.getWorksheets();
|
|
|
-// Worksheet worksheet = worksheets.get(0);
|
|
|
-//
|
|
|
-// return exportRectifyReportDataBySheet(workbook, worksheet, map, response);
|
|
|
- Object summaryfiles = map.get("summaryfiles");
|
|
|
- Object projectIdobj = map.get("projectId");
|
|
|
- if (ObjectUtil.isEmpty(summaryfiles) || ObjectUtil.isEmpty(projectIdobj)) {
|
|
|
+ Object batchIdObj = map.get("batchId");
|
|
|
+ if (ObjectUtil.isEmpty(batchIdObj)) {
|
|
|
return 0;
|
|
|
}
|
|
|
- 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);
|
|
|
- List<JSONObject> excelJson = luckySheetFeignService.getExcelJson(listId);
|
|
|
+ String batchId = (String) batchIdObj;
|
|
|
+ ZhcxProjectManageRectifyBatchDo batchDo = projectManageRectifyBatchService.getById(batchId);
|
|
|
+ List<JSONObject> excelJson = luckySheetFeignService.getExcelJson(batchDo.getSummaryfiles());
|
|
|
ExportProjectSummaryDto dto = new ExportProjectSummaryDto();
|
|
|
dto.setSheetList(excelJson);
|
|
|
- dto.setProjectId(projectId);
|
|
|
+ dto.setProjectId(batchDo.getProjectid());
|
|
|
Object projnameobj = map.get("projname");
|
|
|
if (ObjectUtil.isEmpty(projnameobj)) {
|
|
|
return 0;
|