上报库-列表展示表头排序、固定左侧列标识（NIO编号、参数名称） 对应禅道BUG - 64251

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<ParamsReportDet
 		}
 		List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId);
 		List<Map<String, Object>> listConfig = new LinkedList<>();
+		int orderNumStart = 6;
 		for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
 			Map<String, Object> 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<Map<String, Object>> list = new LinkedList<>();
@@ -563,6 +569,23 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			}else{
 				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
 			}
+
+			if(StringUtils.equals("nio_number",dbFieldName)){
+				map.put("orderNum",1);
+				map.put("fixedLeft",true);
+			}else if(StringUtils.equals("params_name",dbFieldName)){
+				map.put("orderNum",2);
+				map.put("fixedLeft",true);
+			}else if(StringUtils.equals("cert_category",dbFieldName)){
+				map.put("orderNum",3);
+			}else if(StringUtils.equals("is_must",dbFieldName)){
+				map.put("orderNum",4);
+			}else if(StringUtils.equals("description",dbFieldName)){
+				map.put("orderNum",5);
+			}else {
+				map.put("orderNum",orderNumStart);
+				orderNumStart ++;
+			}
 			list.add(map);
 		}
 
@@ -574,10 +597,20 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			map.put("db_field_txt","操作");
 		}
 		map.put("click4", true);
+		map.put("orderNum", orderNumStart);
 		list.add(map);
+
+		list = list.stream().sorted(
+				Comparator.comparing(ParamsReportDetailEOServiceImpl::getMapValueByOrderNum).thenComparing(ParamsReportDetailEOServiceImpl::getMapValueByOrderNum)
+		).collect(Collectors.toList());
+
 		return list;
 	}
 
+	public static BigDecimal getMapValueByOrderNum(Map<String,Object> map ){
+		return new BigDecimal((Integer) map.get("orderNum"));
+	}
+
 	@Override
 	public void exportNormal(ParamsReportDetailVO paramsReportDetailVO, HttpServletResponse response, HttpServletRequest request) {