Commit be0c7734 authored by eddie.woo's avatar eddie.woo

merge

parent bcefaafa
...@@ -52,6 +52,7 @@ public class AtmsExceptionHandler extends ResponseEntityExceptionHandler { ...@@ -52,6 +52,7 @@ public class AtmsExceptionHandler extends ResponseEntityExceptionHandler {
@ExceptionHandler(value = Throwable.class) @ExceptionHandler(value = Throwable.class)
public void handle(Throwable throwable, HttpServletResponse response) { public void handle(Throwable throwable, HttpServletResponse response) {
throwable.printStackTrace(); throwable.printStackTrace();
logger.error("handle : ", throwable);
//noinspection Duplicates //noinspection Duplicates
try { try {
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
...@@ -65,6 +66,7 @@ public class AtmsExceptionHandler extends ResponseEntityExceptionHandler { ...@@ -65,6 +66,7 @@ public class AtmsExceptionHandler extends ResponseEntityExceptionHandler {
@ExceptionHandler(value = ServiceException.class) @ExceptionHandler(value = ServiceException.class)
public void customHandle(pwc.taxtech.atms.common.ServiceException exception, HttpServletResponse response) { public void customHandle(pwc.taxtech.atms.common.ServiceException exception, HttpServletResponse response) {
//noinspection Duplicates //noinspection Duplicates
logger.error(exception);
try { try {
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
response.setContentType("application/json; charset=UTF-8"); response.setContentType("application/json; charset=UTF-8");
......
...@@ -124,7 +124,7 @@ public class OutputInvoiceController { ...@@ -124,7 +124,7 @@ public class OutputInvoiceController {
new pwc.taxtech.atms.dto.vatdto.OutputVATInvoiceInfoDto(); new pwc.taxtech.atms.dto.vatdto.OutputVATInvoiceInfoDto();
d = beanUtil.copyProperties(x,d); d = beanUtil.copyProperties(x,d);
d.setInvoiceTypeName(d.getInvoiceTypeName()); d.setInvoiceTypeName(d.getInvoiceTypeName());
d.setTaxRateS(x.getTaxRate().toString() + "%"); d.setTaxRateS(x.getTaxRate().doubleValue() * 100 + "%");
list2.add(d); list2.add(d);
}); });
list2.add(black); list2.add(black);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment