Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-api/src/main/java/pwc/taxtech/atms/controller/AtmsExceptionHandler.java

@@ -68,6 +68,7 @@ public class AtmsExceptionHandler extends ResponseEntityExceptionHandler {
     @ExceptionHandler(value = Throwable.class)
     public void handle(Throwable throwable, HttpServletResponse response) {
         throwable.printStackTrace();
+        logger.error("handle : ", throwable);
         //noinspection Duplicates
         try {
             response.setCharacterEncoding("UTF-8");
@@ -81,6 +82,7 @@ public class AtmsExceptionHandler extends ResponseEntityExceptionHandler {
     @ExceptionHandler(value = ServiceException.class)
     public void customHandle(pwc.taxtech.atms.common.ServiceException exception, HttpServletResponse response) {
         //noinspection Duplicates
+        logger.error(exception);
         try {
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application/json; charset=UTF-8");

atms-api/src/main/java/pwc/taxtech/atms/controller/OutputInvoiceController.java

@@ -124,7 +124,7 @@ public class OutputInvoiceController {
                 new pwc.taxtech.atms.dto.vatdto.OutputVATInvoiceInfoDto();
                 d = beanUtil.copyProperties(x,d);
                 d.setInvoiceTypeName(d.getInvoiceTypeName());
-                d.setTaxRateS(x.getTaxRate().toString() + "%");
+                d.setTaxRateS(x.getTaxRate().doubleValue() * 100  + "%");
                 list2.add(d);
         });
         list2.add(black);