From 29cd44fce6af6b1bcb98a255890a9f982bea6779 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 13 Dec 2022 10:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DummyInventoryBaseEOController.java       | 29 ++++++++++++++-
 .../dummy/entity/DummyInventoryBaseEO.java    |  8 ++++
 .../jero/modules/dummy/enums/OrderEnum.java   | 37 +++++++++++++++++++
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/OrderEnum.java

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
index 813b3dd32..1788da961 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
@@ -10,11 +10,13 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
 import com.jero.modules.dummy.enums.InventoryStateEnum;
+import com.jero.modules.dummy.enums.OrderEnum;
 import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
 import com.jero.modules.dummy.vo.VirtualCreaterVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -58,9 +60,32 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-//		dummyInventoryBaseEO.setName("*发*");
 		QueryWrapper<DummyInventoryBaseEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryBaseEO, req.getParameterMap());
-		queryWrapper.orderByDesc("create_time");
+		//处理表头排序
+		if(StringUtils.isNotBlank(dummyInventoryBaseEO.getOrderByField())){
+			//名称，创建人
+			if("name".equals(dummyInventoryBaseEO.getOrderByField())
+					|| "create_By".equals(dummyInventoryBaseEO.getOrderByField())){
+				if(OrderEnum.POSITIVE.getValue().equals(dummyInventoryBaseEO.getOrderBy())){
+					//conditionSb.append(" order by " + "CONVERT("+orderByField +"USING gbk) COLLATE gbk_chinese_ci");
+					queryWrapper.orderBy(true,true,"convert("+dummyInventoryBaseEO.getOrderByField()+" using gbk)");
+//					queryWrapper.orderBy(true,true,"convert("+dummyInventoryBaseEO.getOrderByField()+" using gbk");
+				}else if(OrderEnum.REVERSE.getValue().equals(dummyInventoryBaseEO.getOrderBy())){
+					queryWrapper.orderBy(true,false,"convert("+dummyInventoryBaseEO.getOrderByField()+" using gbk)");
+				}
+			}
+			//清单状态
+			if("state".equals(dummyInventoryBaseEO.getOrderByField())){
+				if(OrderEnum.POSITIVE.getValue().equals(dummyInventoryBaseEO.getOrderBy())){
+					queryWrapper.orderByAsc("state");
+				}else if(OrderEnum.REVERSE.getValue().equals(dummyInventoryBaseEO.getOrderBy())){
+					queryWrapper.orderByDesc("state");
+				}
+			}
+
+		}else{
+			queryWrapper.orderByDesc("create_time");
+		}
 		Page<DummyInventoryBaseEO> page = new Page<DummyInventoryBaseEO>(pageNo, pageSize);
 		IPage<DummyInventoryBaseEO> pageList = dummyInventoryBaseEOService.getPageInfo(page,queryWrapper);
 		return Result.OK(dummyInventoryBaseEO.getCut(),pageList);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java
index 16bf188a8..44c3b2bd2 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java
@@ -87,4 +87,12 @@ public class DummyInventoryBaseEO implements Serializable {
     @TableField(exist = false)
 	private String cut;
 
+    //排序（1->正序， 2->倒序）
+    @TableField(exist = false)
+	private String orderBy;
+
+    //排序字段
+    @TableField(exist = false)
+	private String orderByField;
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/OrderEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/OrderEnum.java
new file mode 100644
index 000000000..52f36d2fb
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/enums/OrderEnum.java
@@ -0,0 +1,37 @@
+package com.jero.modules.dummy.enums;
+
+/**
+ * @description
+ * @date 2022/1/21 15:22
+ * @auth zhn
+ */
+public enum OrderEnum {
+    POSITIVE("正序","1"),
+    REVERSE("倒序","2");
+
+
+
+    String name;
+    String value;
+
+    private OrderEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}