diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java index f6422611..7f0aa28f 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseFpcjController.java @@ -128,7 +128,7 @@ public class BaseFpcjController extends AbstractController { return ResponseEntity.ok(R.error("购方信息不能为空!")); } if (StringUtils.isNotBlank(cjrq)) { - cjrq = DateUtils.getNight(DateUtils.strToDate(cjrq)); +// cjrq = DateUtils.getNight(DateUtils.strToDate(cjrq)); pramsMap.put("cjrq", cjrq); } else { return ResponseEntity.ok(R.error("采集日期不能为空!")); diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java index 6df45393..ec38c406 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/tdxrecordinvoice/BaseFpdrrzServiceImpl.java @@ -146,7 +146,7 @@ public class BaseFpdrrzServiceImpl extends MpBaseServiceImpl queryRecord = new QueryWrapper<>(); queryRecord.eq("uuid", uuid); BaseTDxRecordInvoice rdxRecordInvoice = baseTDxRecordInvoiceDao.selectOne(queryRecord); - if (rdxRecordInvoice.getDkTaxAmount() != null && StringUtils.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ + if (rdxRecordInvoice != null && rdxRecordInvoice.getDkTaxAmount() != null && StringUtils.isNotBlank(rdxRecordInvoice.getDkTaxAmount().toPlainString())){ rzlb.setDkse(rdxRecordInvoice.getDkTaxAmount().toPlainString()); } if (rdxRecordInvoice != null) { diff --git a/dxhy-common/src/main/java/com/dxhy/common/constant/TransferContant.java b/dxhy-common/src/main/java/com/dxhy/common/constant/TransferContant.java new file mode 100644 index 00000000..3ebe73ec --- /dev/null +++ b/dxhy-common/src/main/java/com/dxhy/common/constant/TransferContant.java @@ -0,0 +1,15 @@ +package com.dxhy.common.constant; + +public class TransferContant { + + public static final String SUCCESS = "SUCCESS"; + + public static final String INVOICE_NO_NOT_EXIT = "INVOICE_NO_NOT_EXIT"; + + public static final String INVOICE_NOT_EXIT = "INVOICE_NOT_EXIT"; + + public static final String NOT_RZ = "NOT_RZ"; + + public static final String CANCEL_SUCCESS = "CANCEL_SUCCESS"; + +} diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java index db47982d..dd44c898 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/SupplierRiskServiceImpl.java @@ -172,7 +172,7 @@ public class SupplierRiskServiceImpl extends MpBaseServiceImpl risks = new ArrayList<>(); diff --git a/dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml b/dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml index 119d1721..7c14a18b 100644 --- a/dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml +++ b/dxhy-core/src/main/resources/mapper/job/ViolationTaxnoDao.xml @@ -15,6 +15,8 @@ where company = #{company} and org_type = '5' and del_flag = '0' + and taxno != '' + and taxno is not null