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 74c4d2fa..e80b0e81 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 @@ -423,6 +423,10 @@ public class BaseInvoiceController extends AbstractController { pramsMap.put("paymentDateEnd", map.get("paymentDateEnd")); 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("imageId", map.get("imageId")); + pramsMap.put("accountPeriod", map.get("accountPeriod")); String inAccountStatus = (String)map.get("inAccountStatus"); if (sfkrz != null) { @@ -628,6 +632,7 @@ public class BaseInvoiceController extends AbstractController { return ResponseEntity.ok(R.error("签收状态不能为空!")); } String qsflag = getUserInfo().getQsStatus(); + log.info("签收开关qsflag:{}",qsflag); if ("1".equals(qsflag)) { pramsMap.put("qszt", "1"); } diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java index 4574ac2a..a95d93f5 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java +++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java @@ -467,6 +467,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController { pramsMap.put("gfsh", gfshList); String qsflag = getUserInfo().getQsStatus(); pramsMap.put("qsflag", qsflag); + log.info("签收认证状态为:{}",qsflag); if (!StringHelper.isBlank(datalist)) { pramsMap.put("datalist", datalist); diff --git a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java index d20e2ef6..d53bd613 100644 --- a/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java +++ b/dxhy-base/src/main/java/com/dxhy/base/service/receipt/BaseReceiptOutServiceImpl.java @@ -199,7 +199,8 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl query = new QueryWrapper<>(); query.eq("reason_code", record.getOutReason()); BaseTDxOutReason reason = baseTDxOutReasonDao.selectOne(query); - vo.setReason(reason.getOutReason()); + if (reason != null) + vo.setReason(reason.getOutReason()); return vo; } @@ -651,7 +652,8 @@ public class BaseReceiptOutServiceImpl extends MpBaseServiceImpl query = new QueryWrapper<>(); query.eq("reason_code", record.getOutReason()); BaseTDxOutReason reason = baseTDxOutReasonDao.selectOne(query); - vo.setReason(reason.getOutReason()); + if (reason != null) + vo.setReason(reason.getOutReason()); // 认证日期 string类型的长日期转为string类型的短日期 String certDate = record.getCertDate(); Date date = new Date(); diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml index 6dfa02e8..a0e772f9 100644 --- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml +++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml @@ -64,7 +64,7 @@ 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 WHERE date_format(t.invoice_date,'%Y-%m-%d') between #{kpksrq} and #{kpjsrq} - and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) + and t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08') and t.rzh_yesorno = '0' and t.auth_status in('0','5','6') and t.export_mark = '0' @@ -171,6 +171,18 @@ order by t.invoice_date desc + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.postingTime = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} +