diff --git a/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java b/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java index d144b59e81c3b0cfc5c089b3cfd90b230a0f19ac..f01cadf892a82c090a0e4dd073133fbc6af3a303 100644 --- a/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java +++ b/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java @@ -1,9 +1,9 @@ package neatlogic.module.inspect.api.newproblem; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.cmdb.crossover.ICiCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo; @@ -86,7 +86,8 @@ public class InspectNewProblemReportExportApi extends PrivateBinaryStreamApiComp @Description(desc = "导出巡检最报告列表接口") @Override public Object myDoService(JSONObject paramObj, HttpServletRequest request, HttpServletResponse response) throws Exception { - ResourceSearchVo searchVo = JSON.toJavaObject(paramObj, ResourceSearchVo.class); + IResourceCenterResourceCrossoverService resourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + ResourceSearchVo searchVo = resourceCrossoverService.assembleResourceSearchVo(paramObj); Integer isNeedAlertDetail = paramObj.getInteger("isNeedAlertDetail"); if (isNeedAlertDetail == null) { isNeedAlertDetail = 0; @@ -121,7 +122,6 @@ public class InspectNewProblemReportExportApi extends PrivateBinaryStreamApiComp if (workbook == null) { List headerList = new ArrayList<>(); List columnList = new ArrayList<>(); -// buildHeaderListAndColumnList(headerList, columnList, isNeedAlertDetail); ExcelBuilder builder = new ExcelBuilder(SXSSFWorkbook.class); SheetBuilder sheetBuilder = builder.withBorderColor(HSSFColor.HSSFColorPredefined.GREY_40_PERCENT)