|
|
|
@ -172,9 +172,15 @@ public class BaseInvoiceController extends AbstractController { |
|
|
|
|
pramsMap.put("snVoucherNumber", map.get("snVoucherNumber")); |
|
|
|
|
pramsMap.put("company", map.get("company")); |
|
|
|
|
pramsMap.put("menuId", map.get("menuId")); |
|
|
|
|
pramsMap.put("sortPzbh",sortPzbh); |
|
|
|
|
pramsMap.put("sortBzdh",sortBzdh); |
|
|
|
|
pramsMap.put("sortKprq",sortKprq); |
|
|
|
|
if(StringUtils.isNotEmpty(sortPzbh)) { |
|
|
|
|
pramsMap.put("sortPzbh", sortPzbh); |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotEmpty(sortBzdh)) { |
|
|
|
|
pramsMap.put("sortBzdh", sortBzdh); |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotEmpty(sortKprq)) { |
|
|
|
|
pramsMap.put("sortKprq", sortKprq); |
|
|
|
|
} |
|
|
|
|
pramsMap.put("xfmc", xfmc); |
|
|
|
|
pramsMap.put("qsr", qsr); |
|
|
|
|
if (StringUtils.isNotBlank(rzhr)) { |
|
|
|
@ -504,6 +510,9 @@ public class BaseInvoiceController extends AbstractController { |
|
|
|
|
String qsksrq = (String)map.get("qsksrq"); |
|
|
|
|
String qsjsrq = (String)map.get("qsjsrq"); |
|
|
|
|
String xfmc = (String)map.get("xfmc"); |
|
|
|
|
String sortPzbh = String.valueOf(map.get("sortPzbh")); |
|
|
|
|
String sortBzdh = String.valueOf(map.get("sortBzdh")); |
|
|
|
|
String sortKprq = String.valueOf(map.get("sortKprq")); |
|
|
|
|
String position = (String)map.get("position"); |
|
|
|
|
String fpzt = (String)map.get("invoiceStatus"); |
|
|
|
|
String sfkrz = (String)map.get("sfkrz"); |
|
|
|
@ -561,6 +570,16 @@ public class BaseInvoiceController extends AbstractController { |
|
|
|
|
pramsMap.put("suspendStatus",suspendStatus); |
|
|
|
|
pramsMap.put("suspendDate",suspendDate); |
|
|
|
|
pramsMap.put("bzr",bzr); |
|
|
|
|
if(StringUtils.isNotEmpty(sortPzbh)) { |
|
|
|
|
pramsMap.put("sortPzbh", sortPzbh); |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotEmpty(sortBzdh)) { |
|
|
|
|
pramsMap.put("sortBzdh", sortBzdh); |
|
|
|
|
} |
|
|
|
|
if(StringUtils.isNotEmpty(sortKprq)) { |
|
|
|
|
pramsMap.put("sortKprq", sortKprq); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) { |
|
|
|
|
String accountPeriod = map.get("accountPeriod").toString().substring(0,7); |
|
|
|
|
pramsMap.put("accountPeriod", accountPeriod); |
|
|
|
|