add report validation function code --frank

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

@@ -23,7 +23,10 @@ import org.springframework.web.multipart.MultipartFile;
 import pwc.taxtech.atms.common.CommonUtils;
 import pwc.taxtech.atms.common.POIUtil;
 import pwc.taxtech.atms.common.message.ErrorMessage;
-import pwc.taxtech.atms.common.util.*;
+import pwc.taxtech.atms.common.util.DataUtil;
+import pwc.taxtech.atms.common.util.FileUploadUtil;
+import pwc.taxtech.atms.common.util.MyAsserts;
+import pwc.taxtech.atms.common.util.SpringContextUtil;
 import pwc.taxtech.atms.constant.Constant;
 import pwc.taxtech.atms.constant.enums.*;
 import pwc.taxtech.atms.dao.*;
@@ -1196,20 +1199,20 @@ public class ReportServiceImpl extends BaseService {
         OperationResultDto<ReportDataDto> operationResultDto1 = loadEbitDataFirst(orgId, period, operationResultDto);//从数据库中加载ebit数据
         if (operationResultDto1.getData().getEbitData() != null && operationResultDto1.getData().getCellData() != null) {
             return operationResultDto1;
-        } elseif (operationResultDto1.getData().getEbitData() == null && operationResultDto1.getData().getCellData() == null) {
-            OperationResultDto<ReportDataDto>cellData= getCellData(reportId, getProjId(orgId, period));
-        ReportDataDto reportDataDto = new ReportDataDto();
+        } else if (operationResultDto1.getData().getEbitData() == null && operationResultDto1.getData().getCellData() == null) {
+            OperationResultDto<ReportDataDto> cellData = getCellData(reportId, getProjId(orgId, period));
+            ReportDataDto reportDataDto = new ReportDataDto();
             //特殊因素考虑 默认为0 rate 默认为1%
             EbitDataDto ebitDataDto1 = loadEbitData(orgId, period, specialConsideration, ebitRate);
-                if(cellData.getData() != null){
-                    cellData.getData().setEbitData(ebitDataDto1);
-                }else{
+            if (cellData.getData() != null) {
+                cellData.getData().setEbitData(ebitDataDto1);
+            } else {
 
-                    reportDataDto.setEbitData(ebitDataDto1);
-                    cellData.setData(reportDataDto);
-                    return  cellData;
-                }
-        }else if (operationResultDto1.getData().getEbitData() == null && operationResultDto1.getData().getCellData() != null) {
+                reportDataDto.setEbitData(ebitDataDto1);
+                cellData.setData(reportDataDto);
+                return cellData;
+            }
+        } else if (operationResultDto1.getData().getEbitData() == null && operationResultDto1.getData().getCellData() != null) {
             EbitDataDto ebitDataDto1 = loadEbitData(orgId, period, specialConsideration, ebitRate);
             operationResultDto1.getData().setEbitData(ebitDataDto1);
         } else {