|
|
|
@ -297,7 +297,7 @@ public class BaseInvoiceController extends AbstractController { |
|
|
|
|
return ResponseEntity.ok(R.error("认证开始日期不能为空!")); |
|
|
|
|
} |
|
|
|
|
if (!StringHelper.isBlank(rzjsrq)) { |
|
|
|
|
rzjsrq = DateUtils.getMorning(DateUtils.strToDate(rzjsrq)); |
|
|
|
|
rzjsrq = DateUtils.getNight(DateUtils.strToDate(rzjsrq)); |
|
|
|
|
pramsMap.put("rzjsrq", rzjsrq); |
|
|
|
|
} else { |
|
|
|
|
return ResponseEntity.ok(R.error("认证结束日期不能为空!")); |
|
|
|
@ -642,13 +642,14 @@ public class BaseInvoiceController extends AbstractController { |
|
|
|
|
if ("1".equals(qsflag)) { |
|
|
|
|
pramsMap.put("qszt", "1"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (!StringUtils.isBlank(kpksrq)) { |
|
|
|
|
pramsMap.put("kpksrq", kpksrq); |
|
|
|
|
pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kpksrq").toString()))); |
|
|
|
|
} else { |
|
|
|
|
return ResponseEntity.ok(R.error("开票开始日期不能为空!")); |
|
|
|
|
} |
|
|
|
|
if (!StringUtils.isBlank(kpjsrq)) { |
|
|
|
|
pramsMap.put("kpjsrq", kpjsrq); |
|
|
|
|
pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(pramsMap.get("kpjsrq").toString()))); |
|
|
|
|
} else { |
|
|
|
|
return ResponseEntity.ok(R.error("开票结束日期不能为空!")); |
|
|
|
|
} |
|
|
|
|