1、分析模块部分提交

2、admin fix

atms-api/src/main/java/pwc/taxtech/atms/MyAnalysisMapper.java

+package pwc.taxtech.atms;
+
+public interface MyAnalysisMapper {
+}

atms-api/src/main/java/pwc/taxtech/atms/MybatisConfig.java

@@ -36,4 +36,13 @@ public class MybatisConfig implements InitializingBean {
         return bean;
     }
 
+    @Bean
+    public static MapperScannerConfigurer analysisMapperConfigurer() {
+        MapperScannerConfigurer bean = new MapperScannerConfigurer();
+        bean.setMarkerInterface(MyAnalysisMapper.class);
+        bean.setBasePackage(BASE_PACKAGE);
+        bean.setSqlSessionTemplateBeanName("sqlSessionTemplate");
+        return bean;
+    }
+
 }

atms-api/src/main/java/pwc/taxtech/atms/common/message/ErrorMessage.java

@@ -8,6 +8,7 @@ public class ErrorMessage {
     public static final String  NoFile = "NoFile";
     public static final String  DidntSelectedCompany = "Didn't Selected Company";
     public static final String  DidntSelectedPeriod = "Didn't Selected period";
+    public static final String  DidntSelectedImportType = "Didn't Selected Import type";
 
     public static final String  NoSelectSheet = "NoSelectSheet";
     public static final String  DIDNOTSELECTPERIOD = "You should select period!";

atms-api/src/main/java/pwc/taxtech/atms/common/util/DateUtils.java

@@ -131,7 +131,12 @@ public class DateUtils {
      */
     public static Integer strToPeriod(String dateStr) {
         dateStr = dateStr.replace(" ","");
-        Integer period = Integer.valueOf(dateStr.substring(0, 4) + dateStr.substring(5, 7));
+        Integer period = null;
+        if(dateStr.length()<7){
+            period = Integer.valueOf(dateStr.substring(0, 4) +"0"+ dateStr.substring(5, 6));
+        }else{
+            period = Integer.valueOf(dateStr.substring(0, 4) + dateStr.substring(5, 7));
+        }
         return period;
     }
 

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumAnalysisImportType.java

+package pwc.taxtech.atms.constant.enums;
+
+public enum EnumAnalysisImportType {
+    DriverNum(4,"司機人數_所属期间_模版"),
+    GMVSubsidy(2,"業務線_所属期间_模版"),
+    EmployeeNum(3,"职工人数_所属期间_模版"),
+
+    InternationalBuData(100,"国际税业务数据_国家_公司_所属期间_模版"),
+    InternationalTaxData(101,"国际税税务数据_国家_公司_所属期间_模版");
+
+    private Integer code;
+
+    private String file;
+
+    EnumAnalysisImportType(Integer code,String file) {
+        this.code = code;
+        this.file = file;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getFile() {
+        return file;
+    }
+
+    public static String getNameByCode(Integer code){
+        for(EnumAnalysisImportType enumImportType : EnumAnalysisImportType.values()){
+            if(Integer.compare(code, enumImportType.getCode())==0){
+                return enumImportType.getFile();
+            }
+        }
+        return null;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/EnumImportType.java

@@ -24,4 +24,13 @@ public enum EnumImportType {
     public Integer getCode() {
         return code;
     }
+
+    public static String getNameByCode(Integer code){
+        for(EnumImportType enumImportType : EnumImportType.values()){
+            if(Integer.compare(code, enumImportType.getCode())==0){
+                return enumImportType.name();
+            }
+        }
+        return null;
+    }
 }

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

@@ -253,6 +253,33 @@ public class DataImportController extends BaseController {
         }
     }
 
+    @ResponseBody
+    @RequestMapping(value = "displayAnalysisImportData", method = RequestMethod.GET)
+    public ApiResultDto displayAnalysisImportData(@RequestParam Integer type,@RequestParam String period) {
+        try{
+            return ApiResultDto.success(dataImportService.displayAnalysisImportData(type,period));
+        }catch (Exception e){
+            return ApiResultDto.fail();
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "Analysis/DomesitcExcelFile", method = RequestMethod.POST)
+    public OperationResultDto importDomesitcExcelFile(@RequestParam MultipartFile file,@RequestParam String period,@RequestParam Integer type) {
+        try {
+            String valMsg = valParameter(file,period,type);
+            if(StringUtils.isNotEmpty(valMsg)){
+                return OperationResultDto.error(valMsg);
+            }
+            return dataImportService.importDomesitcExcelFile(file,period, type);
+        } catch (ServiceException e) {
+            return OperationResultDto.error(e.getMessage());
+        } catch (Exception e) {
+            logger.error("importDomesitcExcelFile error.", e);
+            return OperationResultDto.error(ErrorMessage.SystemError);
+        }
+    }
+
     private String valParameter(MultipartFile file,List<String> orgList,String periodDate){
         if (null == file) {
             return ErrorMessage.NoFile;
@@ -265,4 +292,17 @@ public class DataImportController extends BaseController {
         }
         return null;
     }
+
+    private String valParameter(MultipartFile file,String periodDate,Integer type){
+        if (null == file) {
+            return ErrorMessage.NoFile;
+        }
+        if(StringUtils.isEmpty(periodDate)){
+            return ErrorMessage.DidntSelectedPeriod;
+        }
+        if(null==type){
+            return ErrorMessage.DidntSelectedImportType;
+        }
+        return null;
+    }
 }

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

@@ -14,7 +14,9 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import pwc.taxtech.atms.common.message.ErrorMessage;
+import pwc.taxtech.atms.common.message.ErrorMessageCN;
 import pwc.taxtech.atms.common.util.MyAsserts;
+import pwc.taxtech.atms.constant.enums.EnumAnalysisImportType;
 import pwc.taxtech.atms.constant.enums.EnumCitImportType;
 import pwc.taxtech.atms.constant.enums.EnumImportType;
 import pwc.taxtech.atms.dpo.TemplateUniqDto;
@@ -241,7 +243,7 @@ public class TemplateController extends BaseController {
         //获取网站部署路径(通过ServletContext对象)，用于确定下载文件位置，从而实现下载
         String fileName = "";
         if (serviceType == null) {
-            fileName = getFileName(fileType);
+            fileName = EnumImportType.getNameByCode(fileType);
         } else {
             fileName = getCitFileName(fileType);
         }
@@ -261,7 +263,37 @@ public class TemplateController extends BaseController {
             out.close();
             out.flush();
         } catch (Exception e) {
-            logger.error(String.format("下载模板异常:%s", e.getMessage()));
+            logger.error(String.format("下载批量导入模板异常:%s", e.getMessage()));
+            throw new ServiceException(ErrorMessage.SystemError);
+        }
+    }
+
+    @RequestMapping(value = "file/downloadAnalysisTemplate", method = RequestMethod.GET)
+    public void analysisFileDownload(@RequestParam Integer fileType, HttpServletResponse response) {
+        //获取网站部署路径(通过ServletContext对象)，用于确定下载文件位置，从而实现下载
+        String fileName = "";
+        fileName = EnumAnalysisImportType.getNameByCode(fileType);
+        if(StringUtils.isEmpty(fileName)){
+            throw new ServiceException(ErrorMessage.SystemError);
+        }
+        response.setContentType("multipart/form-data");
+        response.setHeader("Content-Disposition", "attachment;fileName=" + fileName + ".xlsx");
+        ServletOutputStream out;
+        try {
+            InputStream inputStream = this.getClass().getResourceAsStream("/document/AnalysisImport/" + fileName + ".xlsx");
+            out = response.getOutputStream();
+            int b = 0;
+            byte[] buffer = new byte[512];
+            while (b != -1) {
+                b = inputStream.read(buffer);
+                out.write(buffer, 0, b);
+            }
+            inputStream.close();
+            out.close();
+            out.flush();
+        } catch (Exception e) {
+            logger.error(String.format("下载分析导入模板异常:%s", e.getMessage()));
+            throw new ServiceException(ErrorMessage.SystemError);
         }
     }
 
@@ -282,31 +314,6 @@ public class TemplateController extends BaseController {
         }
     }
 
-    private String getFileName(Integer fileType) {
-        if (EnumImportType.ProfitLoss.getCode().equals(fileType)) {
-            return EnumImportType.ProfitLoss.name();
-        } else if (EnumImportType.BalanceSheet.getCode().equals(fileType)) {
-            return EnumImportType.BalanceSheet.name();
-        } else if (EnumImportType.RedLetterInfoTable.getCode().equals(fileType)) {
-            return EnumImportType.RedLetterInfoTable.name();
-        } else if (EnumImportType.AdjustmentTable.getCode().equals(fileType)) {
-            return EnumImportType.AdjustmentTable.name();
-        } else if (EnumImportType.CashFlow.getCode().equals(fileType)) {
-            return EnumImportType.CashFlow.name();
-        } else if (EnumImportType.CoupaPurchasingReport.getCode().equals(fileType)) {
-            return EnumImportType.CoupaPurchasingReport.name();
-        } else if (EnumImportType.InvoiceData.getCode().equals(fileType)) {
-            return EnumImportType.InvoiceData.name();
-        } else if (EnumImportType.CertifiedInvoicesList.getCode().equals(fileType)) {
-            return EnumImportType.CertifiedInvoicesList.name();
-        } else if (EnumImportType.InvoiceRecord.getCode().equals(fileType)) {
-            return EnumImportType.InvoiceRecord.name();
-        } else if (EnumImportType.Undefined.getCode().equals(fileType)) {
-            return EnumImportType.Undefined.name();
-        }
-        return null;
-    }
-
     private String getCitFileName(Integer fileType) {
         if (EnumCitImportType.JournalAdjust.getCode().equals(fileType)) {
             return EnumCitImportType.JournalAdjust.name();

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

@@ -12,6 +12,8 @@ import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import pwc.taxtech.atms.analysis.dao.*;
+import pwc.taxtech.atms.analysis.entity.*;
 import pwc.taxtech.atms.common.message.ErrorMessage;
 import pwc.taxtech.atms.common.message.ErrorMessageCN;
 import pwc.taxtech.atms.common.util.DateUtils;
@@ -83,6 +85,28 @@ public class DataImportService extends BaseService {
     private InvoiceRecordMapper invoiceRecordMapper;
     @Resource
     private ProjectMapper projectMapper;
+    @Resource
+    private AnalysisDriverNumMapper analysisDriverNumMapper;
+    @Resource
+    private AnalysisEmployeeNumMapper analysisEmployeeNumMapper;
+    @Resource
+    private AnalysisExpectedTaxReturnMapper analysisExpectedTaxReturnMapper;
+    @Resource
+    private AnalysisFeeMapper analysisFeeMapper;
+    @Resource
+    private AnalysisFileManagementMapper analysisFileManagementMapper;
+    @Resource
+    private AnalysisGmvSubsidyMapper analysisGmvSubsidyMapper;
+    @Resource
+    private AnalysisInternationalBusinessDataMapper analysisInternationalBusinessDataMapper;
+    @Resource
+    private AnalysisInternationalTaxDataMapper analysisInternationalTaxDataMapper;
+    @Resource
+    private AnalysisMasterMapper analysisMasterMapper;
+    @Resource
+    private AnalysisSalesMapper analysisSalesMapper;
+    @Resource
+    private AnalysisTaxMapper analysisTaxMapper;
     @Autowired
     private OrganizationServiceImpl organizationService;
 
@@ -1740,4 +1764,148 @@ public class DataImportService extends BaseService {
         }
         return "";
     }
+
+    public List<Object>  displayAnalysisImportData(Integer type, String periodStr) {
+        List<Object> objects = new ArrayList<>();
+        Integer period = DateUtils.strToPeriod(periodStr);
+        switch (type){
+            case 0:
+                AnalysisTaxExample analysisTaxExample = new AnalysisTaxExample();
+                analysisTaxExample.createCriteria().andPeriodEqualTo(period);
+                objects.addAll(analysisTaxMapper.selectByExample(analysisTaxExample));
+                break;
+            case 1:
+                AnalysisExpectedTaxReturnExample analysisExpectedTaxReturnExample = new AnalysisExpectedTaxReturnExample();
+                analysisExpectedTaxReturnExample.createCriteria().andPeriodEqualTo(period);
+                objects.addAll(analysisExpectedTaxReturnMapper.selectByExample(analysisExpectedTaxReturnExample));
+                break;
+            case 2:
+                AnalysisGmvSubsidyExample analysisGmvSubsidyExample = new AnalysisGmvSubsidyExample();
+                analysisGmvSubsidyExample.createCriteria().andPeriodEqualTo(period);
+                objects.addAll(analysisGmvSubsidyMapper.selectByExample(analysisGmvSubsidyExample));
+                break;
+            case 3:
+                AnalysisEmployeeNumExample analysisEmployeeNumExample = new AnalysisEmployeeNumExample();
+                analysisEmployeeNumExample.createCriteria().andPeriodEqualTo(period);
+                objects.addAll(analysisEmployeeNumMapper.selectByExample(analysisEmployeeNumExample));
+                break;
+            case 4:
+                AnalysisDriverNumExample analysisDriverNumExample = new AnalysisDriverNumExample();
+                analysisDriverNumExample.createCriteria().andPeriodEqualTo(period);
+                objects.addAll(analysisDriverNumMapper.selectByExample(analysisDriverNumExample));
+                break;
+            case 100:
+                AnalysisInternationalBusinessDataExample analysisInternationalBusinessDataExample = new AnalysisInternationalBusinessDataExample();
+                analysisInternationalBusinessDataExample.createCriteria().andPeriodEqualTo(period);
+                objects.addAll(analysisInternationalBusinessDataMapper.selectByExample(analysisInternationalBusinessDataExample));
+                break;
+            case 101:
+                AnalysisInternationalTaxDataExample analysisInternationalTaxDataExample = new AnalysisInternationalTaxDataExample();
+                analysisInternationalTaxDataExample.createCriteria().andPeriodEqualTo(period);
+                objects.addAll(analysisInternationalTaxDataMapper.selectByExample(analysisInternationalTaxDataExample));
+                break;
+            default:
+                break;
+        }
+        return objects;
+    }
+
+    public OperationResultDto importDomesitcExcelFile(MultipartFile file, String periodDate, Integer type) {
+        switch (type){
+            case 0:
+//                importAnalysisTaxExcelFile(file,periodDate);
+                break;
+            case 1:
+                importAnalysisreturnTaxExcelFile(file,periodDate);
+                break;
+            case 2:
+                importAnalysisGMVSubsidyExcelFile(file,periodDate);
+                break;
+            case 3:
+                importAnalysisEmployeeNumExcelFile(file,periodDate);
+                break;
+            case 4:
+                importAnalysisDriverNumExcelFile(file,periodDate);
+                break;
+            case 100:
+                importAnalysisInterBuDataExcelFile(file,periodDate);
+                break;
+            case 101:
+                importAnalysisInterTaxDataExcelFile(file,periodDate);
+                break;
+            default:
+                break;
+        }
+        return OperationResultDto.success();
+    }
+
+    private void importAnalysisreturnTaxExcelFile(MultipartFile file, String periodDate) {
+
+    }
+
+    private void importAnalysisEmployeeNumExcelFile(MultipartFile file, String periodDate) {
+
+    }
+
+    private void importAnalysisGMVSubsidyExcelFile(MultipartFile file, String periodDate) {
+
+    }
+
+    private void importAnalysisDriverNumExcelFile(MultipartFile file, String periodDate) {
+        try{
+            InputStream inputStream = file.getInputStream();
+            Workbook workbook = WorkbookFactory.create(inputStream);
+            if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
+                throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
+            }
+            // 文件上的期间
+            String filePeriod = file.getOriginalFilename().split("_")[1];
+            Integer filePer = DateUtils.strToPeriod2(filePeriod);
+            Integer selectedPer = DateUtils.strToPeriod(periodDate);
+            if(!filePer.equals(selectedPer)){
+                throw new ServiceException(ErrorMessageCN.ExistDataPeriodsError);
+            }
+            for (int i = 0; i < workbook.getNumberOfSheets(); i++) {
+                Sheet sheet = workbook.getSheetAt(i);
+                if (isSheetEmpty(sheet)) continue;
+                AnalysisDriverNum model = new AnalysisDriverNum();
+                model.setId(idService.nextId());
+                model.setPeriod(selectedPer);
+                for (int j = 1; j <= sheet.getLastRowNum(); j++) {
+                    Cell cell1 = sheet.getRow(j).getCell(0);
+                    if (null == cell1 || StringUtils.isEmpty(getCellStringValue(cell1))) {
+                        continue;
+                    }
+                    Cell cell2 = sheet.getRow(j).getCell(1);
+                    if("加盟".equals(getCellStringValue(cell1))){
+                        model.setJoinInAmount(getCellBigDecimalValue(cell2));
+                    }else if("自营".equals(getCellStringValue(cell1))){
+                        model.setSelfSupportAmount(getCellBigDecimalValue(cell2));
+                    }else if("直营".equals(getCellStringValue(cell1))){
+                        model.setDirectSaleAmount(getCellBigDecimalValue(cell2));
+                    }else if("对公".equals(getCellStringValue(cell1))){
+                        model.setRightPublicAmount(getCellBigDecimalValue(cell2));
+                    }
+                }
+                AnalysisDriverNumExample example = new AnalysisDriverNumExample();
+                example.createCriteria().andPeriodEqualTo(selectedPer);
+                analysisDriverNumMapper.deleteByExample(example);
+                analysisDriverNumMapper.insertSelective(model);
+            }
+        }catch (ServiceException se){
+            throw se;
+        }catch (Exception e){
+            String errMsg = "分析模块-导入司机人数异常";
+            logger.error(errMsg,e);
+            throw new ServiceException(errMsg);
+        }
+    }
+
+    private void importAnalysisInterTaxDataExcelFile(MultipartFile file, String periodDate) {
+
+    }
+
+    private void importAnalysisInterBuDataExcelFile(MultipartFile file, String periodDate) {
+
+    }
 }

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

@@ -49,7 +49,7 @@ public class MenuServiceImpl {
         }
         List<MenuDisplayDto> menuDisplayDtos = new ArrayList<>();
         List<Menu> menus = findByServiceTypeId(moduleId);
-        List<String> mendIds = getMenuIds(userId);
+        List<String> mendIds = getMenuIds(moduleId,userId);
         List<Menu> rootNodes = menus.stream().filter(oneMenu -> !StringUtils.hasText(oneMenu.getParentId()))
                 .collect(Collectors.toList());
         for (Menu menu : rootNodes) {
@@ -90,7 +90,7 @@ public class MenuServiceImpl {
     }
 
     public List<MenuDto> getFilterMenus(Integer moduleId, String userId){
-        List<String> menuIds = getMenuIds(userId);
+        List<String> menuIds = getMenuIds(moduleId,userId);
         logger.debug("Start to get menus");
         if (moduleId == null) {
             throw new ApplicationException("serviceId for getMenus can't be null");
@@ -111,7 +111,7 @@ public class MenuServiceImpl {
 
     }
 
-    private List<String> getMenuIds(String userId){
+    private List<String> getMenuIds(Integer moduleId,String userId){
         UserRoleExample userRoleExample = new UserRoleExample();
         userRoleExample.createCriteria().andUserIdEqualTo(userId);
         List<String> userRoleIdList = userRoleMapper.selectByExample(userRoleExample).stream().map(UserRole::getRoleId).collect(Collectors.toList());
@@ -122,38 +122,47 @@ public class MenuServiceImpl {
         List<String> menuIds = permissionMapper.selectByExample(permissionExample)
                 .stream().map(Permission::getMenuId).collect(Collectors.toList());
         // admin权限暂时不做控制
-        menuIds.add("91223c21-c15a-4882-89cc-42f3807ec9e3");
-        menuIds.add("9bf855fb-6b44-49cd-b95b-41a6a9a8c098");
-        menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C3");
-        menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C4");
-        menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C7");
-
-        // 这里的权限之后需要在数据库中加上对应的权限数据
-        menuIds.add("6b404066-2200-4d11-9436-d0870dfd3188");
-        menuIds.add("6b404066-2200-4d11-9436-d0870dfd3189");
-        menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eb");
-        menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13ec");
-        menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eg");
-        menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eh");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0813");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0814");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0815");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0816");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0817");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0818");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0819");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0820");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0821");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0822");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0823");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0824");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0825");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0826");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0827");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0828");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0829");
-        menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0830");
-        menuIds.add("b8c74ee9-e5d7-467b-8565-e77efe6a499f");
+        if(moduleId==1){
+            menuIds.add("91223c21-c15a-4882-89cc-42f3807ec9e3");
+            menuIds.add("9bf855fb-6b44-49cd-b95b-41a6a9a8c098");
+            menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C3");
+            menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C4");
+            menuIds.add("F9A18F3A-7E39-4661-BA00-F149710577C7");
+        }else if(moduleId==3){
+            // 这里的权限之后需要在数据库中加上对应的权限数据
+            menuIds.add("6b404066-2200-4d11-9436-d0870dfd3188");
+            menuIds.add("6b404066-2200-4d11-9436-d0870dfd3189");
+            menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eb");
+            menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13ec");
+            menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eg");
+            menuIds.add("5bdbc9a7-197b-43cc-b0e6-3f50e41b13eh");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0813");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0814");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0815");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0816");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0817");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0818");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0819");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0820");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0821");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0822");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0823");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0824");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0825");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0826");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0827");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0828");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0829");
+            menuIds.add("a9b1cd87-89ef-4dae-b798-b19e9bbe0830");
+            menuIds.add("b8c74ee9-e5d7-467b-8565-e77efe6a499f");
+        }else if(moduleId==4){
+            // 这里的权限之后需要在数据库中加上对应的权限数据
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d75047");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d75048");
+            menuIds.add("12776533-9c54-4737-a28c-0cd2a3d75049");
+            menuIds.add("17d6cd83-f5b6-46f2-88e0-58d21957ad29");
+            menuIds.add("17d6cd83-f5b6-46f2-88e0-58d21957ad30");
+        }
         //        List<MenuDto> menus = getMenus(moduleId).stream().filter(x -> permissionNames.contains(x.getName())).collect(Collectors.toList());
         return menuIds;
 

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

@@ -2320,8 +2320,9 @@ public class OrganizationServiceImpl extends BaseService{
     private OperationResultDto checkOrgNameOrOrgCode(OrganizationDto orgDto) {
         OrganizationExample example = new OrganizationExample();
         if (null!=orgDto.getOversea()&&orgDto.getOversea()&&null!=orgDto.getEnglishName()) {
-            example.or().andEnglishNameEqualTo(orgDto.getEnglishName());
-        } else if (orgDto.getId() == null) {
+            return new OperationResultDto(true);
+        }
+        if (orgDto.getId() == null) {
             example.or().andClientCodeEqualTo(orgDto.getClientCode()).andNameEqualTo(orgDto.getName());
             example.or().andClientCodeEqualTo(orgDto.getClientCode()).andCodeEqualTo(orgDto.getCode());
         } else {

atms-dao/etc/generator-mysql/analysisGenerator.properties

+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.connectionURL=jdbc:mysql://10.158.230.16:3306/tax_admin_didi?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+jdbc.userId=root
+jdbc.password=taxadmin2018

atms-dao/etc/generator-mysql/analysisGeneratorConfig.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+    <!-- See: http://www.mybatis.org/generator/configreference/commentGenerator.html -->
+    <properties resource="analysisGenerator.properties" />
+    <!-- <classPathEntry location="../hsqldb/hsqldb-2.3.5.jar" /> -->
+    <context id="contextId" targetRuntime="MyBatis3">
+        <!-- 考虑需要兼容DB2与ORCAL数据库, 大部份字段不需要加双引号，autoDelimitKeywords设置为false -->
+        <property name="autoDelimitKeywords" value="true" />
+        <property name="javaFileEncoding" value="UTF-8" />
+        <!-- beginningDelimiter和endingDelimiter：指明数据库的用于标记数据库对象名的符号，比如ORACLE就是双引号，MYSQL默认是`反引号； -->
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+        <plugin type="org.mybatis.generator.plugins.MapperAnnotationPlugin" />
+        <plugin type="org.mybatis.generator.plugins.RowBoundsPlugin" />
+        <plugin type="org.mybatis.generator.plugins.ToStringPlugin" />
+        <plugin type="org.mybatis.generator.plugins.SerializablePlugin" />
+
+        <commentGenerator>
+            <property name="suppressDate" value="true" />
+            <property name="addRemarkComments" value="true" />
+        </commentGenerator>
+        <jdbcConnection driverClass="${jdbc.driverClass}" connectionURL="${jdbc.connectionURL}" userId="${jdbc.userId}" password="${jdbc.password}">
+        </jdbcConnection>
+
+        <javaTypeResolver>
+            <property name="forceBigDecimals" value="false" />
+        </javaTypeResolver>
+
+        <javaModelGenerator targetPackage="pwc.taxtech.atms.analysis.entity" targetProject="../../src/main/java">
+            <property name="trimStrings" value="true" />
+            <property name="rootClass" value="pwc.taxtech.atms.entity.BaseEntity"/>
+        </javaModelGenerator>
+
+        <sqlMapGenerator targetPackage="pwc.taxtech.atms.analysis.dao" targetProject="../../src/main/resources">
+        </sqlMapGenerator>
+
+        <javaClientGenerator type="XMLMAPPER" targetPackage="pwc.taxtech.atms.analysis.dao" targetProject="../../src/main/java">
+            <property name="rootInterface" value="pwc.taxtech.atms.MyAnalysisMapper" />
+        </javaClientGenerator>
+
+
+        <table tableName="analysis_driver_num" domainObjectName="AnalysisDriverNum">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_employee_num" domainObjectName="AnalysisEmployeeNum">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_fee" domainObjectName="AnalysisFee">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_file_management" domainObjectName="AnalysisFileManagement">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_gmv_subsidy" domainObjectName="AnalysisGmvSubsidy">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_international_business_data" domainObjectName="AnalysisInternationalBusinessData">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_international_tax_data" domainObjectName="AnalysisInternationalTaxData">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_master" domainObjectName="AnalysisMaster">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_sales" domainObjectName="AnalysisSales">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="analysis_tax" domainObjectName="AnalysisTax">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+    </context>
+</generatorConfiguration>
\ No newline at end of file

atms-dao/etc/generator-mysql/analysis_run.bat

+rem see http://www.mybatis.org/generator/running/runningFromCmdLine.html
+cd /d %~dp0
+call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile analysisGeneratorConfig.xml -overwrite
+echo @@@@@@@@@@@ DONE @@@@@@@@@@@
+pause
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/MyAnalysisMapper.java

+package pwc.taxtech.atms;
+
+public interface MyAnalysisMapper {
+}

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisDriverNumMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisDriverNum;
+import pwc.taxtech.atms.analysis.entity.AnalysisDriverNumExample;
+
+@Mapper
+public interface AnalysisDriverNumMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisDriverNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisDriverNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisDriverNum record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisDriverNum record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    List<AnalysisDriverNum> selectByExampleWithRowbounds(AnalysisDriverNumExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    List<AnalysisDriverNum> selectByExample(AnalysisDriverNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    AnalysisDriverNum selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisDriverNum record, @Param("example") AnalysisDriverNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisDriverNum record, @Param("example") AnalysisDriverNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisDriverNum record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_driver_num
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisDriverNum record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisEmployeeNumMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisEmployeeNum;
+import pwc.taxtech.atms.analysis.entity.AnalysisEmployeeNumExample;
+
+@Mapper
+public interface AnalysisEmployeeNumMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisEmployeeNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisEmployeeNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisEmployeeNum record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisEmployeeNum record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    List<AnalysisEmployeeNum> selectByExampleWithRowbounds(AnalysisEmployeeNumExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    List<AnalysisEmployeeNum> selectByExample(AnalysisEmployeeNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    AnalysisEmployeeNum selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisEmployeeNum record, @Param("example") AnalysisEmployeeNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisEmployeeNum record, @Param("example") AnalysisEmployeeNumExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisEmployeeNum record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_employee_num
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisEmployeeNum record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisExpectedTaxReturnMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisExpectedTaxReturn;
+import pwc.taxtech.atms.analysis.entity.AnalysisExpectedTaxReturnExample;
+
+@Mapper
+public interface AnalysisExpectedTaxReturnMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisExpectedTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisExpectedTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisExpectedTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisExpectedTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    List<AnalysisExpectedTaxReturn> selectByExampleWithRowbounds(AnalysisExpectedTaxReturnExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    List<AnalysisExpectedTaxReturn> selectByExample(AnalysisExpectedTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    AnalysisExpectedTaxReturn selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisExpectedTaxReturn record, @Param("example") AnalysisExpectedTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisExpectedTaxReturn record, @Param("example") AnalysisExpectedTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisExpectedTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_expected_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisExpectedTaxReturn record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisFeeMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisFee;
+import pwc.taxtech.atms.analysis.entity.AnalysisFeeExample;
+
+@Mapper
+public interface AnalysisFeeMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisFeeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisFeeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisFee record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisFee record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    List<AnalysisFee> selectByExampleWithRowbounds(AnalysisFeeExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    List<AnalysisFee> selectByExample(AnalysisFeeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    AnalysisFee selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisFee record, @Param("example") AnalysisFeeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisFee record, @Param("example") AnalysisFeeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisFee record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_fee
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisFee record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisFileManagementMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisFileManagement;
+import pwc.taxtech.atms.analysis.entity.AnalysisFileManagementExample;
+
+@Mapper
+public interface AnalysisFileManagementMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisFileManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisFileManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisFileManagement record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisFileManagement record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    List<AnalysisFileManagement> selectByExampleWithRowbounds(AnalysisFileManagementExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    List<AnalysisFileManagement> selectByExample(AnalysisFileManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    AnalysisFileManagement selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisFileManagement record, @Param("example") AnalysisFileManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisFileManagement record, @Param("example") AnalysisFileManagementExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisFileManagement record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_file_management
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisFileManagement record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisGmvSubsidyMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisGmvSubsidy;
+import pwc.taxtech.atms.analysis.entity.AnalysisGmvSubsidyExample;
+
+@Mapper
+public interface AnalysisGmvSubsidyMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisGmvSubsidyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisGmvSubsidyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisGmvSubsidy record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisGmvSubsidy record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    List<AnalysisGmvSubsidy> selectByExampleWithRowbounds(AnalysisGmvSubsidyExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    List<AnalysisGmvSubsidy> selectByExample(AnalysisGmvSubsidyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    AnalysisGmvSubsidy selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisGmvSubsidy record, @Param("example") AnalysisGmvSubsidyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisGmvSubsidy record, @Param("example") AnalysisGmvSubsidyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisGmvSubsidy record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_gmv_subsidy
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisGmvSubsidy record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisInternationalBusinessDataMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessData;
+import pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample;
+
+@Mapper
+public interface AnalysisInternationalBusinessDataMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisInternationalBusinessDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisInternationalBusinessDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisInternationalBusinessData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisInternationalBusinessData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    List<AnalysisInternationalBusinessData> selectByExampleWithRowbounds(AnalysisInternationalBusinessDataExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    List<AnalysisInternationalBusinessData> selectByExample(AnalysisInternationalBusinessDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    AnalysisInternationalBusinessData selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisInternationalBusinessData record, @Param("example") AnalysisInternationalBusinessDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisInternationalBusinessData record, @Param("example") AnalysisInternationalBusinessDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisInternationalBusinessData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_business_data
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisInternationalBusinessData record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisInternationalTaxDataMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxData;
+import pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxDataExample;
+
+@Mapper
+public interface AnalysisInternationalTaxDataMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisInternationalTaxDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisInternationalTaxDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisInternationalTaxData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisInternationalTaxData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    List<AnalysisInternationalTaxData> selectByExampleWithRowbounds(AnalysisInternationalTaxDataExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    List<AnalysisInternationalTaxData> selectByExample(AnalysisInternationalTaxDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    AnalysisInternationalTaxData selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisInternationalTaxData record, @Param("example") AnalysisInternationalTaxDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisInternationalTaxData record, @Param("example") AnalysisInternationalTaxDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisInternationalTaxData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_international_tax_data
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisInternationalTaxData record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisMasterMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisMaster;
+import pwc.taxtech.atms.analysis.entity.AnalysisMasterExample;
+
+@Mapper
+public interface AnalysisMasterMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisMasterExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisMasterExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisMaster record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisMaster record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    List<AnalysisMaster> selectByExampleWithRowbounds(AnalysisMasterExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    List<AnalysisMaster> selectByExample(AnalysisMasterExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    AnalysisMaster selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisMaster record, @Param("example") AnalysisMasterExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisMaster record, @Param("example") AnalysisMasterExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisMaster record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_master
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisMaster record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisSalesMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisSales;
+import pwc.taxtech.atms.analysis.entity.AnalysisSalesExample;
+
+@Mapper
+public interface AnalysisSalesMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisSalesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisSalesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisSales record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisSales record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    List<AnalysisSales> selectByExampleWithRowbounds(AnalysisSalesExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    List<AnalysisSales> selectByExample(AnalysisSalesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    AnalysisSales selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisSales record, @Param("example") AnalysisSalesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisSales record, @Param("example") AnalysisSalesExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisSales record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_sales
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisSales record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisTaxMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisTax;
+import pwc.taxtech.atms.analysis.entity.AnalysisTaxExample;
+
+@Mapper
+public interface AnalysisTaxMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisTaxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisTaxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisTax record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisTax record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    List<AnalysisTax> selectByExampleWithRowbounds(AnalysisTaxExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    List<AnalysisTax> selectByExample(AnalysisTaxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    AnalysisTax selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisTax record, @Param("example") AnalysisTaxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisTax record, @Param("example") AnalysisTaxExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisTax record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisTax record);
+}
\ No newline at end of file

atms-web/src/main/webapp/Scripts/app.js

@@ -5,7 +5,7 @@ var app = angular.module('app', ['ui.tree', 'ui.bootstrap', 'ui.bootstrap.tpls',
     'ngRoute', 'ngCookies', 'ngSanitize', 'ct.ui.router.extras', 'chieffancypants.loadingBar', 'ngDraggable', 'ngFileUpload', 'LocalStorageModule', 'exceptionless',
     'app.config', 'app.common', 'app.webservices', 'app.framework', 'app.vat', 'app.invoice', 'app.cit', "app.dataImport", 'app.assetsManage', 'app.taxDocumentManage',
     'app.taxTaskManage', 'pasvaz.bindonce', 'app.vatDashboard', 'app.vatDongfeng', 'vs-repeat', 'ivh.treeview', 'angular-cache', 'app.cache', 'angularBootstrapNavTree',
-    'ngAnimate', 'cgNotify', 'dx', 'ngNumeraljs', 'app.noPermissionPage','app.dataImp'])
+    'ngAnimate', 'cgNotify', 'dx', 'ngNumeraljs', 'app.noPermissionPage','app.dataImp','app.analysis'])
     //run blocks are executed after the injector is created and are the first
     //methods that are executed in any Angular app.
     .run(['$log', '$http', 'CacheFactory', 'userService', 'loginContext', '$rootScope', 'vatSessionService', '$q', function ($log, $http, CacheFactory, userService, loginContext, $rootScope, vatSessionService, $q) {

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -124,6 +124,7 @@
     "MappingInvoice": "Invoice mapping management",
     "MenuAMVAT": "Asset VAT",
     "MenuCIT": "CIT",
+    "MenuAnalysis": "Analysis",
     "MenuCashFlow": "Cash Flow",
     "MenuDeferredTax": "Deferred Tax",
     "MenuIndexAnalytics": "Tax Index Analysis",
@@ -336,8 +337,11 @@
     "CITPreClassifiedDataSource":"CIT PreClassified",
     "Configuration":"Configuration",
     "RevenueTypeConfiguration":"Revenue Type Config",
-
-
-
+    "DataImport":"Data Import",
+    "Form":"Form",
+    "DomesticDataImport":"Domestic Data Import",
+    "InternationalDataImport":"International Data Import",
+    "TBEBITForm":"TB EBIT Form",
+    "ClickEnsureTip": "Click Ensure Button!",
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }