From e322866b62d637d911e62a5eb65428a10e707d23 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:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/core/service/frJob/QueryDetailDataServiceImpl.java | 6 ++++++ .../dxhy/core/service/frJob/RecordToQueryServiceImpl.java | 6 ++++++ .../core/service/frJob/VoucherRecordItemServiceImpl.java | 3 +++ .../src/main/resources/mapper/frJob/QueryDetailDataDao.xml | 3 +++ .../src/main/resources/mapper/frJob/RecordToQueryDao.xml | 2 ++ 5 files changed, 20 insertions(+) diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataServiceImpl.java index d531d038..9bfd8996 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/QueryDetailDataServiceImpl.java @@ -3,6 +3,8 @@ package com.dxhy.core.service.frJob; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dxhy.common.constant.DbConstant; +import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.core.dao.frTask.QueryDetailDataDao; import com.dxhy.core.enmu.FplxEnmu; import com.dxhy.core.entity.frJob.VoucherRecordQueryDetail; @@ -33,6 +35,7 @@ public class QueryDetailDataServiceImpl extends ServiceImpl dataFromRecordItems = queryDetailDataDao.getDataFromRecord(time[0], time[1],JXZZS); @@ -47,6 +50,7 @@ public class QueryDetailDataServiceImpl extends ServiceImpl dataFromRecordItems = queryDetailDataDao.getDataFromRecordXx(time[0], time[1],XXZZS); @@ -61,6 +65,7 @@ public class QueryDetailDataServiceImpl extends ServiceImpl dataFromRecordItems = queryDetailDataDao.getDataFromRecordJe(time[0], time[1],ZYYWSR); @@ -75,6 +80,7 @@ public class QueryDetailDataServiceImpl extends ServiceImpl dataFromRecordItems = recordToQueryDao.getDataFromRecordItems(time[0], time[1], JXSZC); diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java index 9a3d1390..398cf43d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/service/frJob/VoucherRecordItemServiceImpl.java @@ -1,6 +1,8 @@ package com.dxhy.core.service.frJob; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dxhy.common.constant.DbConstant; +import com.dxhy.common.datasource.config.DynamicContextHolder; import com.dxhy.core.dao.frTask.VoucherRecordItemDao; import com.dxhy.core.enmu.KjkmTaxEnmu; import com.dxhy.core.entity.frJob.VoucherRecordItemEntity; @@ -30,6 +32,7 @@ public class VoucherRecordItemServiceImpl extends ServiceImpl jxVoucherRecordItems = voucherRecordItemDao.getByTime(jxTime[0], jxTime[1], JXZZS); diff --git a/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml b/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml index 74d38a5f..3cbd9faf 100644 --- a/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml +++ b/dxhy-core/src/main/resources/mapper/frJob/QueryDetailDataDao.xml @@ -60,6 +60,7 @@ on i.relation_id = r.id where i.racct like CONCAT(#{kjkmbh},'%') and r.create_time between #{beginTime} and #{endTime} + and r.zbzdh != '' group by r.zbzdh,i.racct ) v on t.bzdh = v.zbzdh where d.tax_rate = v.sl @@ -130,6 +131,7 @@ on i.relation_id = r.id where i.racct like CONCAT(#{kjkmbh},'%') and r.create_time between #{beginTime} and #{endTime} + and r.zbzdh != '' group by r.zbzdh,i.racct ) v on t.bzdh = v.zbzdh where d.tax_rate = v.sl @@ -176,6 +178,7 @@ on i.relation_id = r.id where i.racct like CONCAT(#{kjkmbh},'%') and r.create_time between #{beginTime} and #{endTime} + and r.zbzdh != '' group by r.zbzdh,i.racct ) v on t.bzdh = v.zbzdh where d.tax_rate = v.sl diff --git a/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml b/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml index 434d88f8..4e65e378 100644 --- a/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml +++ b/dxhy-core/src/main/resources/mapper/frJob/RecordToQueryDao.xml @@ -37,6 +37,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 @@ -96,6 +97,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