From cc85aa46c981e80abbc3400a3b5b51b235d1754c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Fri, 15 Sep 2023 09:53:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java   | 2 +-
 dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java
index 20ef4c5b..0b43b17d 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/RecordToQueryServiceImpl.java
@@ -54,7 +54,7 @@ public class RecordToQueryServiceImpl extends ServiceImpl<RecordToQueryDao, Vouc
         }
         boolean flag2 = this.insertXxDataToQuery();
         if (flag2){
-            queryDetailDataService.insertJxDataToQueryDetail();
+            queryDetailDataService.insertXxDataToQueryDetail();
         }
         boolean flag3 = this.insertZyDataToQuery();
         if (flag3){
diff --git a/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml b/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
index 4e65e378..0cadc99b 100644
--- a/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
+++ b/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml
@@ -134,6 +134,7 @@
 		ON v.id = i.relation_id
 		where i.racct like CONCAT(#{kjkmbh},'%')
 		and DATE_FORMAT(v.create_time,'%Y-%m-%d %H:%i:%s') between #{start} and #{end}
+        and v.zbzdh != '
 		group by v.zbzdh,i.racct
     </select>
 </mapper>