From bf2765c8989d701198c4b05404a6255e92375892 Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 9 Oct 2023 09:59:35 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=B8=80=E9=94=AE=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=85=A5=E8=B4=A6=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 1 + .../main/java/com/dxhy/core/controller/ExcelController.java | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index a8ec9d0c..1652c681 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -1255,6 +1255,7 @@ and t.rzh_yesorno = '0' and t.invoice_status in ('0','7') and t.auth_status in('0','5','6') + and t.inaccount_status = '1' and t.export_mark = '0' and t.invoice_amount>0 and t.tax_amount>=0 diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java index c28d4ccd..4ab83c66 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java +++ b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java @@ -7,7 +7,6 @@ import java.util.Map; import javax.annotation.Resource; -import com.dxhy.core.dao.ExtMessageControlDao; import com.dxhy.core.entity.ExtSysMessagecontrolVo; import com.dxhy.core.feign.IFeginWebsocket; import com.dxhy.core.service.ExtMessageControlService; @@ -52,9 +51,6 @@ public class ExcelController extends AbstractController { @Resource private ExtMessageControlService messageControlService; - @Resource - private ExtMessageControlDao extMessageControlDao; - @Resource private Sender sender;