From 11ca4ebf0be1b63b13151c34f9a641d9486b1279 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Tue, 8 Nov 2022 10:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E7=BB=B4=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1-->=E6=9C=AA=E6=8E=A8=E9=80=81=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/XhpcPileRegularInspectServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/XhpcHistoryOrderMapper.xml      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java
index 32431832..5df2cfa7 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcPileRegularInspectServiceImpl.java
@@ -236,12 +236,12 @@ public class XhpcPileRegularInspectServiceImpl extends BaseService implements IX
                         String chargingStationId = map.get("chargingStationId").toString();
                         Map<String, Object> cachePile = redisService.getCacheMap("pile:" + serialNumber);
                         if(cachePile==null || cachePile.get("rateModelId") ==null){
-                            R r = workOrderService.addNewOrder("14","费率不一致","该桩费率和场站设置的费率不一致","",chargingStationId,"PILE",serialNumber);
+                            R r = workOrderService.addNewOrder("13","费率不一致","该桩费率和场站设置的费率不一致","",chargingStationId,"PILE",serialNumber);
                         }else{
                             String rateModelId = cachePile.get("rateModelId").toString();
                             System.out.println("============rateModelId===================="+rateModelId);
                             if(!modelId.equals(rateModelId)){
-                                R r = workOrderService.addNewOrder("14","费率不一致","该桩费率和场站设置的费率不一致","",chargingStationId,"PILE",serialNumber);
+                                R r = workOrderService.addNewOrder("13","费率不一致","该桩费率和场站设置的费率不一致","",chargingStationId,"PILE",serialNumber);
                             }
                         }
                     }
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index 9f1e20be..cd288e7f 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -1628,7 +1628,7 @@
     <select id="getToday" resultType="int">
         select count(history_order_id) number
         from xhpc_history_order
-        where source =1 and create_time &gt;= #{time}
+        where source =1 and create_time &gt;= #{time} and confirm_Result !=0
         <if test="tenantId !=null and '' !=tenantId">
             and tenant_id=#{tenantId}
         </if>
@@ -1671,7 +1671,7 @@
         FROM xhpc_history_order xho
         LEFT JOIN xhpc_charging_station xcs on xcs.charging_station_id = xho.charging_station_id
         <if test="status==null">
-            where (xho.confirm_Result !=0
+            where ((xho.confirm_Result !=0 and xho.source =1)
             or xho.history_order_id >(select last_push_order from et_auth_sec_token where id=2))
         </if>
         <if test="status==0">