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;