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

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

@@ -1070,7 +1070,7 @@ public class DataImportService extends BaseService {
             addDataImportLog(dataImportLogs);
             int isSuccess = (int) dataImportLogs.stream().filter(di -> Boolean.TRUE.equals(di.getImportResult())).count();
             if (isSuccess < 1) {
-                return OperationResultDto.error(ErrorMessage.NoData);
+                return OperationResultDto.error(ErrorMessage.ImportNotMatch);
             }
             return OperationResultDto.success();
         } catch (ServiceException e) {
@@ -1740,7 +1740,6 @@ public class DataImportService extends BaseService {
             cpr.setCurrency(getCellStringValue(row.getCell(12)));
             String billNum = getCellStringValue(row.getCell(13));
             cpr.setBillNum(billNum);
-            cpr.setCompanyCode(StringUtils.isNotEmpty(billNum) ? billNum.substring(0, 6) : "");
             cpr.setPaid(getCellBolleanValue(row.getCell(14)));
             cpr.setAmortization(getCellBolleanValue(row.getCell(15)));
             cpr.setPrepayments(getCellBolleanValue(row.getCell(16)));