From 799e1b7133e20578a5835e1f5f2f81a49d2eab4c Mon Sep 17 00:00:00 2001
From: NH-LHG <lhg0612@126.com>
Date: Fri, 16 Jun 2023 11:29:29 +0800
Subject: [PATCH] =?UTF-8?q?[init]=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/demo/erp/mapper/xml/OrderMapper.xml      |  1 +
 .../org/jeecg/modules/demo/erp/vo/OrderStateVo.java  | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderMapper.xml b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderMapper.xml
index 111368a..ee5e75b 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderMapper.xml
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/mapper/xml/OrderMapper.xml
@@ -6,6 +6,7 @@
     <select id="queryState" resultType="org.jeecg.modules.demo.erp.vo.OrderStateVo">
       SELECT
         count(1) as totalNum,
+        sum(CASE state WHEN -1 THEN 1 ELSE 0 END ) AS unconfirmed,
         sum(CASE state WHEN 0 THEN 1 ELSE 0 END ) AS unpaid,
         sum(CASE state WHEN 1 THEN 1 ELSE 0 END ) AS notSend,
         sum(CASE state WHEN 2 THEN 1 ELSE 0 END) as send,
diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderStateVo.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderStateVo.java
index 337b451..7fe02b1 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderStateVo.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderStateVo.java
@@ -16,16 +16,20 @@ public class OrderStateVo {
     @ApiModelProperty(value = "总数")
     private java.lang.String totalNum;
     /**未付款*/
+    @Excel(name = "未确认", width = 15)
+    @ApiModelProperty(value = "未确认")
+    private java.lang.String unconfirmed;
+    /**未付款*/
     @Excel(name = "未付款", width = 15)
     @ApiModelProperty(value = "未付款")
     private java.lang.String unpaid;
     /**未发货*/
-    @Excel(name = "未发货", width = 15)
-    @ApiModelProperty(value = "未发货")
+    @Excel(name = "未提货", width = 15)
+    @ApiModelProperty(value = "未提货")
     private java.lang.String notSend;
     /**已发货*/
-    @Excel(name = "已发货", width = 15)
-    @ApiModelProperty(value = "已发货")
+    @Excel(name = "已提货", width = 15)
+    @ApiModelProperty(value = "已提货")
     private java.lang.String send;
     /**完结*/
     @Excel(name = "完结", width = 15)