From 7fca390474592b00058df512aadd360f5c50040d Mon Sep 17 00:00:00 2001 From: yefei Date: Mon, 9 Oct 2023 16:12:16 +0800 Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=89=8B=E5=B7=A5=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E6=9C=9F=EF=BC=8C=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=97=B6=E9=97=B4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseInvoiceController.java | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) 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 a04caafa..008717b7 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 @@ -287,24 +287,22 @@ public class BaseInvoiceController extends AbstractController { } if (!StringHelper.isBlank(rzzt)) { // 已认证传 认证起止日期和税款所属期做判断 - if (!"99".equals(rzzt)) { - pramsMap.put("rzzt", rzzt); - if (!"0".equals(rzzt)) { - if (!StringHelper.isBlank(rzksrq)) { - rzksrq = DateUtils.getMorning(DateUtils.strToDate(rzksrq)); - pramsMap.put("rzksrq", rzksrq); - } else { - return ResponseEntity.ok(R.error("认证开始日期不能为空!")); - } - if (!StringHelper.isBlank(rzjsrq)) { - rzjsrq = DateUtils.getNight(DateUtils.strToDate(rzjsrq)); - pramsMap.put("rzjsrq", rzjsrq); - } else { - return ResponseEntity.ok(R.error("认证结束日期不能为空!")); - } - if (!StringHelper.isBlank(skssq)) { - pramsMap.put("skssq", skssq); - } + pramsMap.put("rzzt", rzzt); + if (!"0".equals(rzzt)) { + if (!StringHelper.isBlank(rzksrq)) { + rzksrq = DateUtils.getMorning(DateUtils.strToDate(rzksrq)); + pramsMap.put("rzksrq", rzksrq); + } else { + return ResponseEntity.ok(R.error("认证开始日期不能为空!")); + } + if (!StringHelper.isBlank(rzjsrq)) { + rzjsrq = DateUtils.getNight(DateUtils.strToDate(rzjsrq)); + pramsMap.put("rzjsrq", rzjsrq); + } else { + return ResponseEntity.ok(R.error("认证结束日期不能为空!")); + } + if (!StringHelper.isBlank(skssq)) { + pramsMap.put("skssq", skssq); } } } else {