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 db646e47..bc3f143e 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 @@ -454,8 +454,14 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("settlementNo", map.get("settlementNo")); pramsMap.put("voucherNumber", map.get("voucherNumber")); pramsMap.put("snVoucherNumber", map.get("snVoucherNumber")); - pramsMap.put("postingTime", map.get("postingTime")); + pramsMap.put("postingTimeEnd", map.get("postingTimeEnd")); + pramsMap.put("postingTimeStart", map.get("postingTimeStart")); pramsMap.put("imageId", map.get("imageNumber")); + if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { + String accountPeriod = map.get("accountPeriod").toString().substring(0,7); + pramsMap.put("accountPeriod", accountPeriod); + log.info("accountPeriod:{}",accountPeriod); + } pramsMap.put("accountPeriod", map.get("accountPeriod")); String inAccountStatus = (String)map.get("inAccountStatus"); diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 7ed4d290..cf7ba4ca 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -161,7 +161,7 @@ and t.sn_voucher_number = #{snVoucherNumber} - and posting_time between #{postingTimeStart} and #{postingTimeEnd} + and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} and t.image_id = #{imageId} diff --git a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml index 53f73cfa..42af06c2 100644 --- a/dxhy-extend/src/main/resources/mapper/TicketMapper.xml +++ b/dxhy-extend/src/main/resources/mapper/TicketMapper.xml @@ -74,12 +74,10 @@ select * from t_dx_invoice_reimburse t where 1=1 - + and t.invoice_date between #{kpksrq} and #{kpjsrq} - + and t.create_date between #{cjksyf} and #{cjjsyf} @@ -117,11 +115,14 @@ and t.sn_voucher_number = #{snVoucherNumber} - - and t.posting_time = #{postingTime} + + and t.posting_time between #{postingTimeStart} and #{postingTimeEnd} and t.image_id = #{imageNumber} + + and t.account_period = #{accountPeriod} +