Skip to content

T
traffic-front
Commit f983e538 authored by gary's avatar gary
Browse files
Options

1、fixbug

parent 7d81c160
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ f983e538
...@@ -310,7 +310,7 @@ public class DataImportService extends BaseService { ...@@ -310,7 +310,7 @@ public class DataImportService extends BaseService {
} }
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期 // 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12; boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) { if (!tmsPeriod.equals(period) && !isThirteenPeriod) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError); dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
dataImportLogs.add(dataImportLog); dataImportLogs.add(dataImportLog);
...@@ -483,7 +483,7 @@ public class DataImportService extends BaseService { ...@@ -483,7 +483,7 @@ public class DataImportService extends BaseService {
} }
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期 // 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12; boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) { if (!tmsPeriod.equals(period) && !isThirteenPeriod) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError); dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
dataImportLogs.add(dataImportLog); dataImportLogs.add(dataImportLog);
...@@ -631,7 +631,7 @@ public class DataImportService extends BaseService { ...@@ -631,7 +631,7 @@ public class DataImportService extends BaseService {
} }
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期 // 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12; boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) { if (!tmsPeriod.equals(period) && !isThirteenPeriod) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError); dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
dataImportLogs.add(dataImportLog); dataImportLogs.add(dataImportLog);
...@@ -781,7 +781,7 @@ public class DataImportService extends BaseService { ...@@ -781,7 +781,7 @@ public class DataImportService extends BaseService {
} }
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期 // 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12; boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) { if (!tmsPeriod.equals(period) && !isThirteenPeriod) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError); dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
dataImportLogs.add(dataImportLog); dataImportLogs.add(dataImportLog);
...@@ -1301,7 +1301,7 @@ public class DataImportService extends BaseService { ...@@ -1301,7 +1301,7 @@ public class DataImportService extends BaseService {
dataImportLog.setCompanyName(companyName); dataImportLog.setCompanyName(companyName);
// 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期 // 所选期间与导入文件期间不相等 且非 所选期间12期导入文件为13期
boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12; boolean isThirteenPeriod = period % 100 == 13 && tmsPeriod % 100 == 12;
if (!tmsPeriod.equals(period) && isThirteenPeriod) { if (!tmsPeriod.equals(period) && !isThirteenPeriod) {
dataImportLog.setImportResult(false); dataImportLog.setImportResult(false);
dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError); dataImportLog.setErrorMsg(ErrorMessageCN.ExistDataPeriodsError);
dataImportLogs.add(dataImportLog); dataImportLogs.add(dataImportLog);
......
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