diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java index 19d483843..5c560eb87 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java @@ -32,6 +32,7 @@ import com.jero.modules.cert.template.enums.ParamsIsMustEnum; import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.project.entity.ProjectTaskInventoryEO; import com.jero.modules.project.util.Docx4jUtils; import com.jero.modules.project.util.ExcelUtil; import com.jero.modules.project.util.WordUtil; @@ -64,6 +65,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.lang.reflect.Field; +import java.math.BigDecimal; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; @@ -533,12 +535,16 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); List> listConfig = new LinkedList<>(); + int orderNumStart = 6; for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { Map map = new HashMap<>(); map.put("db_field_name", paramsConfigEO.getId()); map.put("db_field_txt", paramsConfigEO.getConfigName()); map.put("type", true); //配置列 标识 + map.put("orderNum", orderNumStart); //配置列 标识 listConfig.add(map); + + orderNumStart ++; } List> list = new LinkedList<>(); @@ -563,6 +569,23 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl map ){ + return new BigDecimal((Integer) map.get("orderNum")); + } + @Override public void exportNormal(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request) {