From 353b488b9891034f3f7832483c3d7e8e914e9d9e Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 7 Sep 2023 14:02:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xml/ProjectLawsInventoryEOMapper.xml      |   4 +-
 .../ProjectLawsInventoryEOServiceImpl.java    | 147 ++++++++++++++++++
 2 files changed, 149 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
index b24afb028..cb55c2edf 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
@@ -159,7 +159,7 @@
                   </foreach>
         ) temp
         <!--<include refid="BaseQuerySql"/>-->
-        <if test="params.orderByField != null and params.orderByField != ''">
+        <!--<if test="params.orderByField != null and params.orderByField != ''">
             order by temp.${params.orderByField}
             <if test="params.orderBy == 1">
                 asc
@@ -167,7 +167,7 @@
             <if test="params.orderBy == 2">
                 desc
             </if>
-        </if>
+        </if>-->
         <if test="params.orderByField == null or params.orderByField == ''">
             order by temp.serial_number desc
         </if>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 0ec8afc5f..aec45aa36 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -10406,9 +10406,156 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}
 		//条件查询
 		result = dataParameter(params, result);
+		//表头排序
+		heartSort(params, result);
+
+
 		return result;
 	}
 
+	private void heartSort(Map<String, Object> params, List<Map<String, Object>> result) {
+		Collator comparator = Collator.getInstance(Locale.CHINESE);
+		if ("title".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("title")) ? String.valueOf(e1.get("title")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("title")) ? String.valueOf(e2.get("title")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("title")) ? String.valueOf(e1.get("title")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("title")) ? String.valueOf(e2.get("title")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("lawsName".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("lawsName")) ? String.valueOf(e1.get("lawsName")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("lawsName")) ? String.valueOf(e2.get("lawsName")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("lawsName")) ? String.valueOf(e1.get("lawsName")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("lawsName")) ? String.valueOf(e2.get("lawsName")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("projectName".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("projectName")) ? String.valueOf(e1.get("projectName")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("projectName")) ? String.valueOf(e2.get("projectName")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("projectName")) ? String.valueOf(e1.get("projectName")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("projectName")) ? String.valueOf(e2.get("projectName")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("problemType_dictText".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("problemType_dictText")) ? String.valueOf(e1.get("problemType_dictText")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("problemType_dictText")) ? String.valueOf(e2.get("problemType_dictText")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("problemType_dictText")) ? String.valueOf(e1.get("problemType_dictText")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("problemType_dictText")) ? String.valueOf(e2.get("problemType_dictText")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("dutyTerritory".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("dutyTerritory")) ? String.valueOf(e1.get("dutyTerritory")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("dutyTerritory")) ? String.valueOf(e2.get("dutyTerritory")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("dutyTerritory")) ? String.valueOf(e1.get("dutyTerritory")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("dutyTerritory")) ? String.valueOf(e2.get("dutyTerritory")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("createBy".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("createBy")) ? String.valueOf(e1.get("createBy")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("createBy")) ? String.valueOf(e2.get("createBy")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("createBy")) ? String.valueOf(e1.get("createBy")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("createBy")) ? String.valueOf(e2.get("createBy")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("problemState".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("problemState")) ? String.valueOf(e1.get("problemState")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("problemState")) ? String.valueOf(e2.get("problemState")) : "";
+					return comparator.compare(e1Field, e2Field);
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					String e1Field = ObjectUtils.isNotEmpty(e1.get("problemState")) ? String.valueOf(e1.get("problemState")) : "";
+					String e2Field = ObjectUtils.isNotEmpty(e2.get("problemState")) ? String.valueOf(e2.get("problemState")) : "";
+					return comparator.compare(e2Field, e1Field);
+				});
+			}
+		}
+		if ("createTime".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					if (e1.get("createTime") == null || e2.get("createTime") == null) {
+						return 0;
+					}
+					return comparator.compare(e1.get("createTime"), e2.get("createTime"));
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					if (e1.get("createTime") == null || e2.get("createTime") == null) {
+						return 0;
+					}
+					return comparator.compare(e2.get("createTime"), e1.get("createTime"));
+				});
+			}
+		}
+		if ("updateTime".equals(params.get("orderByField"))) {
+			if (OrderEnum.POSITIVE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					if (e1.get("updateTime") == null || e2.get("updateTime") == null) {
+						return 0;
+					}
+					return comparator.compare(e1.get("updateTime"), e2.get("updateTime"));
+				});
+			} else if (OrderEnum.REVERSE.getValue().equals(params.get("orderBy"))) {
+				Collections.sort(result, (e1, e2) -> {
+					if (e1.get("updateTime") == null || e2.get("updateTime") == null) {
+						return 0;
+					}
+					return comparator.compare(e2.get("updateTime"), e1.get("updateTime"));
+				});
+			}
+		}
+	}
+
 	@NotNull
 	private List<Map<String, Object>> getNewData(Map<String, Object> params, String cut) {
 		//新数据