From b08d03b39c11963d815de236a5c4bcc9d08a1dab Mon Sep 17 00:00:00 2001
From: wangzhijiang <wangzhijiang1314>
Date: Thu, 6 Apr 2023 18:32:39 +0800
Subject: [PATCH] =?UTF-8?q?UAT=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95-53?=
 =?UTF-8?q?=E6=9D=A1=EF=BC=8C=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AuthDummyInventoryInfoEO.java      |  7 ++++
 .../AuthDummyInventoryInfoEOServiceImpl.java  | 34 ++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
index d4e9f4589..fce9cc117 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java
@@ -142,4 +142,11 @@ public class AuthDummyInventoryInfoEO implements Serializable {
     @TableField(exist = false)
     @Excel(name = "交付物模板", width = 20)
     private String deliverableTemplateName;
+
+    @TableField(exist = false)
+    private String orderByField;
+
+    // 1顺序  2倒序
+    @TableField(exist = false)
+    private String orderBy;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
index 6a36942a6..6ccf3ec38 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java
@@ -587,11 +587,43 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl<AuthDummyIn
 	@Override
     public List<AuthDummyInventoryInfoEO> queryList(AuthDummyInventoryInfoEO authDummyInventoryInfoEO,HttpServletRequest req) {
 		QueryWrapper<AuthDummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(authDummyInventoryInfoEO, req.getParameterMap());
-		queryWrapper.orderByDesc("create_time");
+
+		String orderByField = authDummyInventoryInfoEO.getOrderByField();
+		String orderBy = authDummyInventoryInfoEO.getOrderBy();
+		// 如果排序字段不为空
+		if(org.apache.commons.lang.StringUtils.isNotEmpty(orderByField)){
+//			if (StringUtils.equals(orderBy,"2")) {
+//				orderBy = " DESC";
+//			}else {
+//				orderBy = " ASC";
+//			}
+			// 转换字段
+			orderByField = convertOrderByField(orderByField);
+			queryWrapper.orderBy(true, "1".equals(orderBy)?true:false, orderByField);
+		}else {
+			queryWrapper.orderByDesc("create_time");
+		}
+
 		List<AuthDummyInventoryInfoEO> authDummyInventoryInfoEOList = this.list(queryWrapper);
 		return authDummyInventoryInfoEOList;
     }
 
+	private String convertOrderByField(String orderByField) {
+		if(StringUtils.isEmpty(orderByField)){
+			return null;
+		}
+		switch (orderByField) {
+			case "category" : return  "category";
+			case "inspectionItem" : return"inspection_item";
+			case "configItem" : return"config_item";
+			case "wvtaId" : return"wvta_id";
+			case "serialNumber" : return "serial_number";
+			case "dutyTerritory" : return "duty_territory";
+			case "deliverableType" : return "deliverable_type";
+			default: return null;
+		}
+	}
+
 	@Override
 	public Result<?> copyInfoByIds(String ids, String cut) {
 		String resultMsg = "";