[bugfix] skip compare and change produce mediea type json

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

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.thymeleaf.util.StringUtils;
-import pwc.taxtech.atms.constant.DataImport;
 import pwc.taxtech.atms.constant.VatErpImportValidation;
 import pwc.taxtech.atms.constant.enums.ImportType;
 import pwc.taxtech.atms.dto.OperationResultDto;
@@ -56,7 +55,7 @@ public class FinanceDataImportController {
         return ResponseEntity.ok().body(financeDataImport.getBasicValidationResults(identityService.getIdentityUser().getID()));
     }
 
-    @RequestMapping(value = "importData/financeDataUpload", method = RequestMethod.POST, produces = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @RequestMapping(value = "importData/financeDataUpload", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseEntity FinanceDataUpload(@RequestParam String importMethod, MultipartHttpServletRequest request) {
         if (request.getFileMap().size() == 0) {
             return ResponseEntity.ok(new OperationResultDto(false, "NoFile"));
@@ -115,7 +114,7 @@ public class FinanceDataImportController {
     }
 
 
-    @RequestMapping(value = "importData/importFinancedata", method = RequestMethod.POST, produces = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @RequestMapping(value = "importData/importFinancedata", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseEntity FinanceImportData(@RequestParam String importMethod, @RequestParam String fileName,
                                             @RequestParam String importType, @RequestParam String fileGuid,
                                             @RequestParam Integer period, @RequestParam String fileExtension,

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FinanceDataImportServiceImpl.java

@@ -313,10 +313,10 @@ public class FinanceDataImportServiceImpl {
                 m.setChildren(children);
             });
 
-            parentVouchers.sort(Comparator.comparing(VoucherBalanceDto::getAcctCode));
-            parentVouchers.sort(Comparator.comparing(VoucherBalanceDto::getvID));
-            parentVouchers.sort(Comparator.comparing(VoucherBalanceDto::getGroup));
-            parentVouchers.sort(Comparator.comparing(VoucherBalanceDto::getItemID));
+//            parentVouchers.sort(Comparator.comparing(VoucherBalanceDto::getAcctCode));
+//            parentVouchers.sort(Comparator.comparing(VoucherBalanceDto::getvID));
+//            parentVouchers.sort(Comparator.comparing(VoucherBalanceDto::getGroup));
+//            parentVouchers.sort(Comparator.comparing(VoucherBalanceDto::getItemID));
 
             return parentVouchers;
         }