diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java index c4151023..efa7f66a 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java @@ -473,6 +473,12 @@ public class BaseInvoiceController extends AbstractController { String bzdh = (String) map.get("bzdh"); String inAccountStatus = (String) map.get("inAccountStatus"); String companyCode = (String) map.get("companyCode"); + String suspendStatus = (String) map.get("suspendStatus"); + String suspendDate = (String) map.get("suspendDate"); + if (StringUtils.isNotEmpty(suspendDate) && suspendDate.length() >7){ + suspendDate = suspendDate.substring(0,7); + } + // //所属机构列表 // List orgCodes = null; // if (map.get("orgCodes") !=null){ @@ -508,6 +514,8 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("postingTimeEnd", map.get("postingTimeEnd")); pramsMap.put("postingTimeStart", map.get("postingTimeStart")); pramsMap.put("imageNumber", map.get("imageNumber")); + pramsMap.put("suspendStatus",suspendStatus); + pramsMap.put("suspendDate",suspendDate); if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { String accountPeriod = map.get("accountPeriod").toString().substring(0,7); pramsMap.put("accountPeriod", accountPeriod); diff --git a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java index a1acd936..02a65deb 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java +++ b/dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java @@ -516,4 +516,8 @@ public class BaseTDxRecordInvoice implements Serializable { * 组织编码 */ private String compCode; + + private String suspendStatus; + + private String suspendDate; } diff --git a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java index c94734f7..31135a60 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java +++ b/dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java @@ -159,4 +159,8 @@ public class BaseSggxCxRespVO { */ private String compCode; + private String suspendStatus; + + private String suspendDate; + } diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java index 7bf81d05..b8cabc20 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java @@ -12,6 +12,7 @@ import javax.annotation.Resource; import com.dxhy.common.constant.DictConstant; import com.dxhy.common.utils.DateUtils; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; @@ -239,6 +240,12 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl + + @@ -64,7 +66,7 @@ ,t.qs_type,t.qs_status,t.dk_tax_amount,t.qs_name,t.sn_voucher_number,t.posting_time,t.image_id,t.account_period, case date_format(t.invoice_date,'%Y%m%d') between c.select_start_date and c.select_end_date when true then 1 - else 2 end authStatus,t.bzdh, + else 2 end authStatus,t.bzdh,t.suspend_status,t.suspend_date, t.inaccount_status,t.payment_status,DATE_FORMAT(t.payment_date,'%Y-%m-%d')payment_date,t.settlement_no,t.ele_invoice_no from t_dx_record_invoice t left join t_dx_tax_current c on t.gf_tax_no = c.taxno left join t_dx_dk_count d on c.taxno = d.taxno and c.current_tax_period = d.skssq @@ -103,6 +105,15 @@ and (t.comp_code = '' or t.comp_code is null) + + t.suspend_status = '1' + + + t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0' + + + t.suspend_date = #{suspendDate} + and t.qs_status = #{qszt} @@ -407,6 +418,15 @@ and t.qs_status = #{qszt} + + t.suspend_status = '1' + + + t.suspend_status = '' or t.suspend_status is null or t.suspend_status = '0' + + + t.suspend_date = #{suspendDate} + and date_format(t.qs_date,'%Y-%m-%d') between #{qsksrq} and #{qsjsrq}