From d094c003c27fe3da99b0e67ab777d2ac9f9ad8f3 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 28 Dec 2022 10:19:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93-=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F=E3=80=81?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=B7=A6=E4=BE=A7=E5=88=97=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=EF=BC=88NIO=E7=BC=96=E5=8F=B7=E3=80=81=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=89=20=E5=AF=B9=E5=BA=94=E7=A6=85?=
 =?UTF-8?q?=E9=81=93BUG=20-=2064251?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

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