From a1206ca269be265696b6455b585bd75243a1f6c8 Mon Sep 17 00:00:00 2001
From: NH-LHG <lhg0612@126.com>
Date: Mon, 19 Jun 2023 09:51:30 +0800
Subject: [PATCH] =?UTF-8?q?[update]=E8=AE=A2=E5=8D=95=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/erp/controller/OrderController.java       |  4 +---
 .../modules/demo/erp/mapper/xml/OrderMapper.xml    |  2 +-
 .../org/jeecg/modules/demo/erp/vo/OrderPage.java   | 14 ++++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/OrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/OrderController.java
index 3885048..c310812 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/OrderController.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/controller/OrderController.java
@@ -108,9 +108,7 @@ public class OrderController {
 	 @ApiOperation(value="订单状态统计", notes="订单状态统计")
 	 @GetMapping(value = "/queryState")
 	 public Result<OrderStateVo> queryState(@RequestParam(name="userId",required=true) String userId){
-		 OrderStateVo orderStateVo = new OrderStateVo();
-		 orderStateVo =  orderService.queryState(userId);
-		 return Result.OK(orderStateVo);
+		 return Result.OK(orderService.queryState(userId));
 	 }
 	/**
 	 *   添加
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 ee5e75b..2eb1f3c 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,7 +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 6 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/OrderPage.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderPage.java
index 0a51c5e..0212a97 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderPage.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/erp/vo/OrderPage.java
@@ -76,6 +76,12 @@ public class OrderPage {
 	@Excel(name = "物控员备注", width = 15)
 	@ApiModelProperty(value = "物控员备注")
 	private java.lang.String materialRemark;
+	/**物控审核时间*/
+	@Excel(name = "物控审核时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "物控审核时间")
+	private java.util.Date materialTime;
 	/**审核人id*/
 	@Excel(name = "审核人id", width = 15)
 	@ApiModelProperty(value = "审核人id")
@@ -90,10 +96,6 @@ public class OrderPage {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "审核时间")
     private java.util.Date financeTime;
-	/**派单人Id*/
-	@Excel(name = "派单人Id", width = 15)
-	@ApiModelProperty(value = "派单人Id")
-	private java.lang.String dispacherId;
 	/**审核意见*/
 	@Excel(name = "审核意见", width = 15)
 	@ApiModelProperty(value = "审核意见")
@@ -102,6 +104,10 @@ public class OrderPage {
 	@Excel(name = "付款回执url", width = 15)
 	@ApiModelProperty(value = "付款回执url")
 	private java.lang.String financeUrl;
+	/**派单人Id*/
+	@Excel(name = "派单人Id", width = 15)
+	@ApiModelProperty(value = "派单人Id")
+	private java.lang.String dispacherId;
 	/**派单人*/
 	@Excel(name = "派单人", width = 15)
 	@ApiModelProperty(value = "派单人")