1、分析模块excel导入

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

+package pwc.taxtech.atms;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import pwc.taxtech.atms.common.message.ErrorMessage;
+import pwc.taxtech.atms.controller.BaseController;
+import pwc.taxtech.atms.dto.ApiResultDto;
+import pwc.taxtech.atms.dto.OperationResultDto;
+import pwc.taxtech.atms.dto.analysis.AnalysisInternationlParam;
+import pwc.taxtech.atms.exception.ServiceException;
+import pwc.taxtech.atms.service.impl.AnalysisServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:29
+ * @Description:
+ */
+@RestController
+@RequestMapping("/api/v1/Analysis/")
+public class AnalysisController extends BaseController {
+
+    @Autowired
+    private AnalysisServiceImpl analysisServiceImpl;
+
+    @ResponseBody
+    @RequestMapping(value = "displayAnalysisImportData", method = RequestMethod.GET)
+    public ApiResultDto displayAnalysisImportData(@RequestParam Integer type, @RequestParam String period) {
+        try{
+            return ApiResultDto.success(analysisServiceImpl.displayAnalysisImportData(type,period));
+        }catch (Exception e){
+            return ApiResultDto.fail();
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "displayAnalysisInternationalImportData", method = RequestMethod.POST)
+    public ApiResultDto displayAnalysisInternationalImportData(@RequestBody AnalysisInternationlParam param) {
+        try{
+            return ApiResultDto.success(analysisServiceImpl.displayAnalysisInternationalImportData(param));
+        }catch (Exception e){
+            return ApiResultDto.fail();
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "getAnalysisInternationalCompanyList", method = RequestMethod.GET)
+    public List<String> getAnalysisInternationalCompanyList(@RequestParam Integer type, @RequestParam String period) {
+        return analysisServiceImpl.getAnalysisInternationalCompanyList(type,period);
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "getAnalysisInternationalCountryList", method = RequestMethod.GET)
+    public List<String> getAnalysisInternationalCountryList(@RequestParam Integer type, @RequestParam String period) {
+        return analysisServiceImpl.getAnalysisInternationalCountryList(type,period);
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "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 analysisServiceImpl.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,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/constant/enums/EnumAnalysisImportType.java

 package pwc.taxtech.atms.constant.enums;
 
 public enum EnumAnalysisImportType {
-    DriverNum(4,"司機人數_所属期间_模版"),
+    TaxData(0,"各税种税额 _所属期间_模版"),
+    ReturnTaxData(1,"实际返还税额 _所属期间_模版"),
     GMVSubsidy(2,"業務線_所属期间_模版"),
     EmployeeNum(3,"职工人数_所属期间_模版"),
+    DriverNum(4,"司機人數_所属期间_模版"),
 
     InternationalBuData(100,"国际税业务数据_国家_公司_所属期间_模版"),
     InternationalTaxData(101,"国际税税务数据_国家_公司_所属期间_模版");

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

@@ -7,6 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
 import pwc.taxtech.atms.common.message.ErrorMessage;
 import pwc.taxtech.atms.dpo.PagingDto;
 import pwc.taxtech.atms.dto.*;
+import pwc.taxtech.atms.dto.analysis.AnalysisInternationlParam;
 import pwc.taxtech.atms.dto.dataimport.DataImportParam;
 import pwc.taxtech.atms.dto.dataimport.DataProcessParam;
 import pwc.taxtech.atms.dto.input.CamelPagingResultDto;
@@ -253,33 +254,6 @@ 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;
@@ -293,16 +267,4 @@ 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/dto/analysis/AnalysisActualTaxReturnDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 12:50
+ * @Description:
+ */
+public class AnalysisActualTaxReturnDto {
+
+    private String companyName;
+
+    private BigDecimal segment1;
+
+    private BigDecimal segment2;
+
+    private BigDecimal segment3;
+
+    private BigDecimal segment4;
+
+    private BigDecimal segment5;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public BigDecimal getSegment1() {
+        return segment1;
+    }
+
+    public void setSegment1(BigDecimal segment1) {
+        this.segment1 = segment1;
+    }
+
+    public BigDecimal getSegment2() {
+        return segment2;
+    }
+
+    public void setSegment2(BigDecimal segment2) {
+        this.segment2 = segment2;
+    }
+
+    public BigDecimal getSegment3() {
+        return segment3;
+    }
+
+    public void setSegment3(BigDecimal segment3) {
+        this.segment3 = segment3;
+    }
+
+    public BigDecimal getSegment4() {
+        return segment4;
+    }
+
+    public void setSegment4(BigDecimal segment4) {
+        this.segment4 = segment4;
+    }
+
+    public BigDecimal getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(BigDecimal segment5) {
+        this.segment5 = segment5;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisGMVSubsidyDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 15:37
+ * @Description:
+ */
+public class AnalysisGMVSubsidyDto {
+
+    private String businessLine;
+
+    private String segment1;
+
+    private String segment2;
+
+    private String segment3;
+
+    private String segment4;
+
+    private String segment5;
+
+    private String segment6;
+
+    public String getBusinessLine() {
+        return businessLine;
+    }
+
+    public void setBusinessLine(String businessLine) {
+        this.businessLine = businessLine;
+    }
+
+    public String getSegment1() {
+        return segment1;
+    }
+
+    public void setSegment1(String segment1) {
+        this.segment1 = segment1;
+    }
+
+    public String getSegment2() {
+        return segment2;
+    }
+
+    public void setSegment2(String segment2) {
+        this.segment2 = segment2;
+    }
+
+    public String getSegment3() {
+        return segment3;
+    }
+
+    public void setSegment3(String segment3) {
+        this.segment3 = segment3;
+    }
+
+    public String getSegment4() {
+        return segment4;
+    }
+
+    public void setSegment4(String segment4) {
+        this.segment4 = segment4;
+    }
+
+    public String getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(String segment5) {
+        this.segment5 = segment5;
+    }
+
+    public String getSegment6() {
+        return segment6;
+    }
+
+    public void setSegment6(String segment6) {
+        this.segment6 = segment6;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisInternationalBUDataDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:25
+ * @Description:
+ */
+public class AnalysisInternationalBUDataDto {
+
+    private String category;
+
+    private String name;
+
+    private BigDecimal amount;
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisInternationalTaxDataDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:25
+ * @Description:
+ */
+public class AnalysisInternationalTaxDataDto {
+
+    private String taxCategory;
+
+    private String taxType;
+
+    private BigDecimal taxAmount;
+
+    public String getTaxCategory() {
+        return taxCategory;
+    }
+
+    public void setTaxCategory(String taxCategory) {
+        this.taxCategory = taxCategory;
+    }
+
+    public String getTaxType() {
+        return taxType;
+    }
+
+    public void setTaxType(String taxType) {
+        this.taxType = taxType;
+    }
+
+    public BigDecimal getTaxAmount() {
+        return taxAmount;
+    }
+
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.taxAmount = taxAmount;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisInternationlParam.java

+package pwc.taxtech.atms.dto.analysis;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 11:28
+ * @Description:
+ */
+public class AnalysisInternationlParam {
+
+    private Integer type;
+
+    private String period;
+
+    private String country;
+
+    private String companyName;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getPeriod() {
+        return period;
+    }
+
+    public void setPeriod(String period) {
+        this.period = period;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/analysis/AnalysisTaxDto.java

+package pwc.taxtech.atms.dto.analysis;
+
+import java.math.BigDecimal;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 14/03/2019 12:48
+ * @Description:
+ */
+public class AnalysisTaxDto {
+
+    private String companyName;
+
+    private BigDecimal segment1;
+
+    private BigDecimal segment2;
+
+    private BigDecimal segment3;
+
+    private BigDecimal segment4;
+
+    private BigDecimal segment5;
+
+    private BigDecimal segment6;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public BigDecimal getSegment1() {
+        return segment1;
+    }
+
+    public void setSegment1(BigDecimal segment1) {
+        this.segment1 = segment1;
+    }
+
+    public BigDecimal getSegment2() {
+        return segment2;
+    }
+
+    public void setSegment2(BigDecimal segment2) {
+        this.segment2 = segment2;
+    }
+
+    public BigDecimal getSegment3() {
+        return segment3;
+    }
+
+    public void setSegment3(BigDecimal segment3) {
+        this.segment3 = segment3;
+    }
+
+    public BigDecimal getSegment4() {
+        return segment4;
+    }
+
+    public void setSegment4(BigDecimal segment4) {
+        this.segment4 = segment4;
+    }
+
+    public BigDecimal getSegment5() {
+        return segment5;
+    }
+
+    public void setSegment5(BigDecimal segment5) {
+        this.segment5 = segment5;
+    }
+
+    public BigDecimal getSegment6() {
+        return segment6;
+    }
+
+    public void setSegment6(BigDecimal segment6) {
+        this.segment6 = segment6;
+    }
+}

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

@@ -92,6 +92,8 @@ public class DataImportService extends BaseService {
     @Resource
     private AnalysisExpectedTaxReturnMapper analysisExpectedTaxReturnMapper;
     @Resource
+    private AnalysisActualTaxReturnMapper analysisActualTaxReturnMapper;
+    @Resource
     private AnalysisFeeMapper analysisFeeMapper;
     @Resource
     private AnalysisFileManagementMapper analysisFileManagementMapper;
@@ -1765,147 +1767,4 @@ 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-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisActualTaxReturnMapper.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.AnalysisActualTaxReturn;
+import pwc.taxtech.atms.analysis.entity.AnalysisActualTaxReturnExample;
+
+@Mapper
+public interface AnalysisActualTaxReturnMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisActualTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisActualTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    List<AnalysisActualTaxReturn> selectByExampleWithRowbounds(AnalysisActualTaxReturnExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    List<AnalysisActualTaxReturn> selectByExample(AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    AnalysisActualTaxReturn selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisActualTaxReturn record, @Param("example") AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisActualTaxReturn record, @Param("example") AnalysisActualTaxReturnExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisActualTaxReturn record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_actual_tax_return
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisActualTaxReturn record);
+}
\ No newline at end of file

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

@@ -105,4 +105,8 @@ public interface AnalysisInternationalBusinessDataMapper extends MyAnalysisMappe
      * @mbg.generated
      */
     int updateByPrimaryKey(AnalysisInternationalBusinessData record);
+
+    List<String> selectCompanyList(@Param("period") Integer period);
+
+    List<String> selectCountryList(@Param("period") Integer period);
 }
\ No newline at end of file

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

@@ -105,4 +105,8 @@ public interface AnalysisInternationalTaxDataMapper extends MyAnalysisMapper {
      * @mbg.generated
      */
     int updateByPrimaryKey(AnalysisInternationalTaxData record);
+
+    List<String> selectCompanyList(@Param("period") Integer period);
+
+    List<String> selectCountryList(@Param("period") Integer period);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisEmployeeNum.java

@@ -68,6 +68,17 @@ public class AnalysisEmployeeNum extends BaseEntity implements Serializable {
      */
     private BigDecimal vendorAmount;
 
+    /**
+     * Database Column Remarks:
+     *   总计
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_employee_num.total_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal totalAmount;
+
     /**
      * Database Column Remarks:
      *   创建时间 
@@ -251,6 +262,30 @@ public class AnalysisEmployeeNum extends BaseEntity implements Serializable {
         this.vendorAmount = vendorAmount;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_employee_num.total_amount
+     *
+     * @return the value of analysis_employee_num.total_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTotalAmount() {
+        return totalAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_employee_num.total_amount
+     *
+     * @param totalAmount the value for analysis_employee_num.total_amount
+     *
+     * @mbg.generated
+     */
+    public void setTotalAmount(BigDecimal totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column analysis_employee_num.create_time
@@ -388,6 +423,7 @@ public class AnalysisEmployeeNum extends BaseEntity implements Serializable {
         sb.append(", fullTimeAmount=").append(fullTimeAmount);
         sb.append(", internAmount=").append(internAmount);
         sb.append(", vendorAmount=").append(vendorAmount);
+        sb.append(", totalAmount=").append(totalAmount);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", organizationId=").append(organizationId);

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisEmployeeNumExample.java

@@ -506,6 +506,66 @@ public class AnalysisEmployeeNumExample {
             return (Criteria) this;
         }
 
+        public Criteria andTotalAmountIsNull() {
+            addCriterion("total_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountIsNotNull() {
+            addCriterion("total_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountEqualTo(BigDecimal value) {
+            addCriterion("total_amount =", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountNotEqualTo(BigDecimal value) {
+            addCriterion("total_amount <>", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountGreaterThan(BigDecimal value) {
+            addCriterion("total_amount >", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("total_amount >=", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountLessThan(BigDecimal value) {
+            addCriterion("total_amount <", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("total_amount <=", value, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountIn(List<BigDecimal> values) {
+            addCriterion("total_amount in", values, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountNotIn(List<BigDecimal> values) {
+            addCriterion("total_amount not in", values, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("total_amount between", value1, value2, "totalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("total_amount not between", value1, value2, "totalAmount");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalBusinessData.java

@@ -101,6 +101,15 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
      */
     private BigDecimal profit;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.exchange_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal exchangeRate;
+
     /**
      * Database Column Remarks:
      *   创建时间 
@@ -156,6 +165,17 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
      */
     private Integer period;
 
+    /**
+     * Database Column Remarks:
+     *   国家
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_business_data.country
+     *
+     * @mbg.generated
+     */
+    private String country;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table analysis_international_business_data
@@ -356,6 +376,30 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
         this.profit = profit;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.exchange_rate
+     *
+     * @return the value of analysis_international_business_data.exchange_rate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getExchangeRate() {
+        return exchangeRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.exchange_rate
+     *
+     * @param exchangeRate the value for analysis_international_business_data.exchange_rate
+     *
+     * @mbg.generated
+     */
+    public void setExchangeRate(BigDecimal exchangeRate) {
+        this.exchangeRate = exchangeRate;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column analysis_international_business_data.create_time
@@ -476,6 +520,30 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
         this.period = period;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_business_data.country
+     *
+     * @return the value of analysis_international_business_data.country
+     *
+     * @mbg.generated
+     */
+    public String getCountry() {
+        return country;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_business_data.country
+     *
+     * @param country the value for analysis_international_business_data.country
+     *
+     * @mbg.generated
+     */
+    public void setCountry(String country) {
+        this.country = country == null ? null : country.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table analysis_international_business_data
@@ -496,11 +564,13 @@ public class AnalysisInternationalBusinessData extends BaseEntity implements Ser
         sb.append(", subsidyC=").append(subsidyC);
         sb.append(", revenue=").append(revenue);
         sb.append(", profit=").append(profit);
+        sb.append(", exchangeRate=").append(exchangeRate);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", organizationId=").append(organizationId);
         sb.append(", companyName=").append(companyName);
         sb.append(", period=").append(period);
+        sb.append(", country=").append(country);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalBusinessDataExample.java

@@ -686,6 +686,66 @@ public class AnalysisInternationalBusinessDataExample {
             return (Criteria) this;
         }
 
+        public Criteria andExchangeRateIsNull() {
+            addCriterion("exchange_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateIsNotNull() {
+            addCriterion("exchange_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateEqualTo(BigDecimal value) {
+            addCriterion("exchange_rate =", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateNotEqualTo(BigDecimal value) {
+            addCriterion("exchange_rate <>", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateGreaterThan(BigDecimal value) {
+            addCriterion("exchange_rate >", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("exchange_rate >=", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateLessThan(BigDecimal value) {
+            addCriterion("exchange_rate <", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("exchange_rate <=", value, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateIn(List<BigDecimal> values) {
+            addCriterion("exchange_rate in", values, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateNotIn(List<BigDecimal> values) {
+            addCriterion("exchange_rate not in", values, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("exchange_rate between", value1, value2, "exchangeRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andExchangeRateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("exchange_rate not between", value1, value2, "exchangeRate");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;
@@ -1005,6 +1065,76 @@ public class AnalysisInternationalBusinessDataExample {
             addCriterion("period not between", value1, value2, "period");
             return (Criteria) this;
         }
+
+        public Criteria andCountryIsNull() {
+            addCriterion("country is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIsNotNull() {
+            addCriterion("country is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryEqualTo(String value) {
+            addCriterion("country =", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotEqualTo(String value) {
+            addCriterion("country <>", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThan(String value) {
+            addCriterion("country >", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThanOrEqualTo(String value) {
+            addCriterion("country >=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThan(String value) {
+            addCriterion("country <", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThanOrEqualTo(String value) {
+            addCriterion("country <=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLike(String value) {
+            addCriterion("country like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotLike(String value) {
+            addCriterion("country not like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIn(List<String> values) {
+            addCriterion("country in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotIn(List<String> values) {
+            addCriterion("country not in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryBetween(String value1, String value2) {
+            addCriterion("country between", value1, value2, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotBetween(String value1, String value2) {
+            addCriterion("country not between", value1, value2, "country");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalTaxData.java

@@ -123,6 +123,17 @@ public class AnalysisInternationalTaxData extends BaseEntity implements Serializ
      */
     private Integer period;
 
+    /**
+     * Database Column Remarks:
+     *   国家
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_international_tax_data.country
+     *
+     * @mbg.generated
+     */
+    private String country;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table analysis_international_tax_data
@@ -371,6 +382,30 @@ public class AnalysisInternationalTaxData extends BaseEntity implements Serializ
         this.period = period;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_international_tax_data.country
+     *
+     * @return the value of analysis_international_tax_data.country
+     *
+     * @mbg.generated
+     */
+    public String getCountry() {
+        return country;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_international_tax_data.country
+     *
+     * @param country the value for analysis_international_tax_data.country
+     *
+     * @mbg.generated
+     */
+    public void setCountry(String country) {
+        this.country = country == null ? null : country.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table analysis_international_tax_data
@@ -393,6 +428,7 @@ public class AnalysisInternationalTaxData extends BaseEntity implements Serializ
         sb.append(", organizationId=").append(organizationId);
         sb.append(", companyName=").append(companyName);
         sb.append(", period=").append(period);
+        sb.append(", country=").append(country);
         sb.append("]");
         return sb.toString();
     }

atms-dao/src/main/java/pwc/taxtech/atms/analysis/entity/AnalysisInternationalTaxDataExample.java

@@ -845,6 +845,76 @@ public class AnalysisInternationalTaxDataExample {
             addCriterion("period not between", value1, value2, "period");
             return (Criteria) this;
         }
+
+        public Criteria andCountryIsNull() {
+            addCriterion("country is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIsNotNull() {
+            addCriterion("country is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryEqualTo(String value) {
+            addCriterion("country =", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotEqualTo(String value) {
+            addCriterion("country <>", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThan(String value) {
+            addCriterion("country >", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryGreaterThanOrEqualTo(String value) {
+            addCriterion("country >=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThan(String value) {
+            addCriterion("country <", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLessThanOrEqualTo(String value) {
+            addCriterion("country <=", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryLike(String value) {
+            addCriterion("country like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotLike(String value) {
+            addCriterion("country not like", value, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryIn(List<String> values) {
+            addCriterion("country in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotIn(List<String> values) {
+            addCriterion("country not in", values, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryBetween(String value1, String value2) {
+            addCriterion("country between", value1, value2, "country");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountryNotBetween(String value1, String value2) {
+            addCriterion("country not between", value1, value2, "country");
+            return (Criteria) this;
+        }
     }
 
     /**

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisEmployeeNumMapper.xml

@@ -11,6 +11,7 @@
     <result column="full_time_amount" jdbcType="DECIMAL" property="fullTimeAmount" />
     <result column="intern_amount" jdbcType="DECIMAL" property="internAmount" />
     <result column="vendor_amount" jdbcType="DECIMAL" property="vendorAmount" />
+    <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
@@ -88,8 +89,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, seq_no, full_time_amount, intern_amount, vendor_amount, create_time, update_time, 
-    organization_id, company_name, period
+    id, seq_no, full_time_amount, intern_amount, vendor_amount, total_amount, create_time, 
+    update_time, organization_id, company_name, period
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisEmployeeNumExample" resultMap="BaseResultMap">
     <!--
@@ -143,13 +144,13 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into analysis_employee_num (id, seq_no, full_time_amount, 
-      intern_amount, vendor_amount, create_time, 
-      update_time, organization_id, company_name, 
-      period)
+      intern_amount, vendor_amount, total_amount, 
+      create_time, update_time, organization_id, 
+      company_name, period)
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{fullTimeAmount,jdbcType=DECIMAL}, 
-      #{internAmount,jdbcType=DECIMAL}, #{vendorAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{period,jdbcType=INTEGER})
+      #{internAmount,jdbcType=DECIMAL}, #{vendorAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, 
+      #{companyName,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisEmployeeNum">
     <!--
@@ -173,6 +174,9 @@
       <if test="vendorAmount != null">
         vendor_amount,
       </if>
+      <if test="totalAmount != null">
+        total_amount,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -205,6 +209,9 @@
       <if test="vendorAmount != null">
         #{vendorAmount,jdbcType=DECIMAL},
       </if>
+      <if test="totalAmount != null">
+        #{totalAmount,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -254,6 +261,9 @@
       <if test="record.vendorAmount != null">
         vendor_amount = #{record.vendorAmount,jdbcType=DECIMAL},
       </if>
+      <if test="record.totalAmount != null">
+        total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -285,6 +295,7 @@
       full_time_amount = #{record.fullTimeAmount,jdbcType=DECIMAL},
       intern_amount = #{record.internAmount,jdbcType=DECIMAL},
       vendor_amount = #{record.vendorAmount,jdbcType=DECIMAL},
+      total_amount = #{record.totalAmount,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
@@ -313,6 +324,9 @@
       <if test="vendorAmount != null">
         vendor_amount = #{vendorAmount,jdbcType=DECIMAL},
       </if>
+      <if test="totalAmount != null">
+        total_amount = #{totalAmount,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -341,6 +355,7 @@
       full_time_amount = #{fullTimeAmount,jdbcType=DECIMAL},
       intern_amount = #{internAmount,jdbcType=DECIMAL},
       vendor_amount = #{vendorAmount,jdbcType=DECIMAL},
+      total_amount = #{totalAmount,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       organization_id = #{organizationId,jdbcType=VARCHAR},

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisInternationalBusinessDataMapper.xml

@@ -14,11 +14,13 @@
     <result column="subsidy_c" jdbcType="DECIMAL" property="subsidyC" />
     <result column="revenue" jdbcType="DECIMAL" property="revenue" />
     <result column="profit" jdbcType="DECIMAL" property="profit" />
+    <result column="exchange_rate" jdbcType="DECIMAL" property="exchangeRate" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -91,8 +93,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, seq_no, gmv, trips, subsidy_b, subsidy_c, revenue, profit, create_time, update_time, 
-    organization_id, company_name, period
+    id, seq_no, gmv, trips, subsidy_b, subsidy_c, revenue, profit, exchange_rate, create_time, 
+    update_time, organization_id, company_name, period, country
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample" resultMap="BaseResultMap">
     <!--
@@ -147,14 +149,16 @@
     -->
     insert into analysis_international_business_data (id, seq_no, gmv, 
       trips, subsidy_b, subsidy_c, 
-      revenue, profit, create_time, 
-      update_time, organization_id, company_name, 
-      period)
+      revenue, profit, exchange_rate, 
+      create_time, update_time, organization_id, 
+      company_name, period, country
+      )
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{gmv,jdbcType=DECIMAL}, 
       #{trips,jdbcType=DECIMAL}, #{subsidyB,jdbcType=DECIMAL}, #{subsidyC,jdbcType=DECIMAL}, 
-      #{revenue,jdbcType=DECIMAL}, #{profit,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{period,jdbcType=INTEGER})
+      #{revenue,jdbcType=DECIMAL}, #{profit,jdbcType=DECIMAL}, #{exchangeRate,jdbcType=DECIMAL}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, 
+      #{companyName,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, #{country,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessData">
     <!--
@@ -187,6 +191,9 @@
       <if test="profit != null">
         profit,
       </if>
+      <if test="exchangeRate != null">
+        exchange_rate,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -202,6 +209,9 @@
       <if test="period != null">
         period,
       </if>
+      <if test="country != null">
+        country,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -228,6 +238,9 @@
       <if test="profit != null">
         #{profit,jdbcType=DECIMAL},
       </if>
+      <if test="exchangeRate != null">
+        #{exchangeRate,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -243,6 +256,9 @@
       <if test="period != null">
         #{period,jdbcType=INTEGER},
       </if>
+      <if test="country != null">
+        #{country,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample" resultType="java.lang.Long">
@@ -286,6 +302,9 @@
       <if test="record.profit != null">
         profit = #{record.profit,jdbcType=DECIMAL},
       </if>
+      <if test="record.exchangeRate != null">
+        exchange_rate = #{record.exchangeRate,jdbcType=DECIMAL},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -301,6 +320,9 @@
       <if test="record.period != null">
         period = #{record.period,jdbcType=INTEGER},
       </if>
+      <if test="record.country != null">
+        country = #{record.country,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -320,11 +342,13 @@
       subsidy_c = #{record.subsidyC,jdbcType=DECIMAL},
       revenue = #{record.revenue,jdbcType=DECIMAL},
       profit = #{record.profit,jdbcType=DECIMAL},
+      exchange_rate = #{record.exchangeRate,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       company_name = #{record.companyName,jdbcType=VARCHAR},
-      period = #{record.period,jdbcType=INTEGER}
+      period = #{record.period,jdbcType=INTEGER},
+      country = #{record.country,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -357,6 +381,9 @@
       <if test="profit != null">
         profit = #{profit,jdbcType=DECIMAL},
       </if>
+      <if test="exchangeRate != null">
+        exchange_rate = #{exchangeRate,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -372,6 +399,9 @@
       <if test="period != null">
         period = #{period,jdbcType=INTEGER},
       </if>
+      <if test="country != null">
+        country = #{country,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -388,11 +418,13 @@
       subsidy_c = #{subsidyC,jdbcType=DECIMAL},
       revenue = #{revenue,jdbcType=DECIMAL},
       profit = #{profit,jdbcType=DECIMAL},
+      exchange_rate = #{exchangeRate,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       organization_id = #{organizationId,jdbcType=VARCHAR},
       company_name = #{companyName,jdbcType=VARCHAR},
-      period = #{period,jdbcType=INTEGER}
+      period = #{period,jdbcType=INTEGER},
+      country = #{country,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalBusinessDataExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/AnalysisInternationalTaxDataMapper.xml

@@ -16,6 +16,7 @@
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="country" jdbcType="VARCHAR" property="country" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -89,7 +90,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, seq_no, tax_category, tax_type, tax_amount, create_time, update_time, organization_id, 
-    company_name, period
+    company_name, period, country
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxDataExample" resultMap="BaseResultMap">
     <!--
@@ -145,11 +146,11 @@
     insert into analysis_international_tax_data (id, seq_no, tax_category, 
       tax_type, tax_amount, create_time, 
       update_time, organization_id, company_name, 
-      period)
+      period, country)
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{taxCategory,jdbcType=VARCHAR}, 
       #{taxType,jdbcType=VARCHAR}, #{taxAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
-      #{period,jdbcType=INTEGER})
+      #{period,jdbcType=INTEGER}, #{country,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxData">
     <!--
@@ -188,6 +189,9 @@
       <if test="period != null">
         period,
       </if>
+      <if test="country != null">
+        country,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -220,6 +224,9 @@
       <if test="period != null">
         #{period,jdbcType=INTEGER},
       </if>
+      <if test="country != null">
+        #{country,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxDataExample" resultType="java.lang.Long">
@@ -269,6 +276,9 @@
       <if test="record.period != null">
         period = #{record.period,jdbcType=INTEGER},
       </if>
+      <if test="record.country != null">
+        country = #{record.country,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -289,7 +299,8 @@
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
       company_name = #{record.companyName,jdbcType=VARCHAR},
-      period = #{record.period,jdbcType=INTEGER}
+      period = #{record.period,jdbcType=INTEGER},
+      country = #{record.country,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -328,6 +339,9 @@
       <if test="period != null">
         period = #{period,jdbcType=INTEGER},
       </if>
+      <if test="country != null">
+        country = #{country,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -345,7 +359,8 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       organization_id = #{organizationId,jdbcType=VARCHAR},
       company_name = #{companyName,jdbcType=VARCHAR},
-      period = #{period,jdbcType=INTEGER}
+      period = #{period,jdbcType=INTEGER},
+      country = #{country,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisInternationalTaxDataExample" resultMap="BaseResultMap">

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/extends/AnalysisInternationalBusinessDataMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="pwc.taxtech.atms.analysis.dao.AnalysisInternationalBusinessDataMapper">
+
+    <select id="selectCompanyList" parameterType="java.lang.Integer" resultType="java.lang.String">
+      select DISTINCT company_name
+      FROM analysis_international_business_data aibd
+      WHERE
+      period = #{period,jdbcType=INTEGER}
+  </select>
+
+    <select id="selectCountryList" parameterType="java.lang.Integer" resultType="java.lang.String">
+       select DISTINCT country
+       FROM analysis_international_business_data aibd
+       WHERE
+       period = #{period,jdbcType=INTEGER}
+  </select>
+</mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/analysis/dao/extends/AnalysisInternationalTaxDataMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="pwc.taxtech.atms.analysis.dao.AnalysisInternationalTaxDataMapper">
+
+  <select id="selectCompanyList" parameterType="java.lang.Integer" resultType="java.lang.String">
+      select DISTINCT company_name
+      FROM analysis_international_tax_data aitd
+      WHERE
+      aitd.period = #{period,jdbcType=INTEGER}
+  </select>
+
+  <select id="selectCountryList" parameterType="java.lang.Integer" resultType="java.lang.String">
+       select DISTINCT country
+       FROM analysis_international_tax_data aitd
+       WHERE
+       aitd.period = #{period,jdbcType=INTEGER}
+  </select>
+
+</mapper>
\ No newline at end of file

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

@@ -1901,6 +1901,39 @@
     "GMVSubsidy": "GMV and Subsidy",
     "EmployeeNum": "Employee Num",
     "DriverNum": "Driver Num",
+    "BUData": "业务数据",
+    "TaxData": "税务数据",
+
+    "FullTimeAmount": "Full Time Amount",
+    "InternAmount": "Intern Amount",
+    "VendorAmount": "Vendor Amount",
+    "EmployeeTotalAmount": "Total Amount",
+
+    "BusinessLine": "Business Line",
+    "OrderChainRatio": "Order Chain Ratio",
+    "GmvChainRatio": "GMV Chain Ratio",
+    "BSubsidyRate": "B Subsidy Rate",
+    "BEndLinkRatio": "B End Link Ratio",
+    "CSubsidyRate": "C Subsidy Rate",
+    "CEndLinkRatio": "C End Link Ratio",
+
+    "BuildingTax": "Building Tax",
+    "EducationSurcharge": "Education Surcharge",
+    "UrbanEducationSurcharge": "Urban Education Surcharge",
+    "EmployeeTax": "Employee Tax",
+    "DriverTax": "Driver Tax",
+    "StampDuty": "Stamp Duty",
+
+    "VATRefund": "VAT Refund",
+    "UrbanConstructionTaxRefund": "UrbanConstruction Tax Refund",
+    "EducationFeeSurcharge": "Education Fee Surcharge",
+    "LocalEducationFeeSurcharge": "Local Education Fee Surcharge",
+    "PersonalIncomeTaxReturn": "Personal Income Tax Return",
+
+    "Country": "Country",
+    "Company": "Company",
+    "CompanySimpleName": "Company Simple Name",
+
 
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }
\ No newline at end of file

atms-web/src/main/webapp/app-resources/i18n/zh-CN/vat.json

@@ -2237,6 +2237,39 @@
     "GMVSubsidy": "业务线GMV及补贴统计",
     "EmployeeNum": "职工人数",
     "DriverNum": "司机人数",
+    "BUData": "业务数据",
+    "TaxData": "税务数据",
+
+    "FullTimeAmount": "正式员工",
+    "InternAmount": "实习生",
+    "VendorAmount": "外包",
+    "EmployeeTotalAmount": "合计",
+
+    "BusinessLine": "业务线",
+    "OrderChainRatio": "订单环比",
+    "GmvChainRatio": "GMV环比",
+    "BSubsidyRate": "B端补贴率",
+    "BEndLinkRatio": "B端环比",
+    "CSubsidyRate": "C端补贴率",
+    "CEndLinkRatio": "C端环比",
+
+    "BuildingTax": "城建税",
+    "EducationSurcharge": "教育费附加",
+    "UrbanEducationSurcharge": "城市教育费附加",
+    "EmployeeTax": "员工个税",
+    "DriverTax": "司机个税",
+    "StampDuty": "印花税",
+
+    "VATRefund": "增值税返还",
+    "UrbanConstructionTaxRefund": "城建税返还",
+    "EducationFeeSurcharge": "教育费附加返还",
+    "LocalEducationFeeSurcharge": "地方教育费附加返还",
+    "PersonalIncomeTaxReturn": "个人所得税返还",
+
+    "Country": "国家",
+    "Company": "公司",
+    "CompanySimpleName": "公司简称",
+
 
     "~MustBeEndOneApp": "我必须是最后一个！"
 }

atms-web/src/main/webapp/app/analysis/data-import/domestic-data-import/domestic-data-import.html

@@ -27,7 +27,7 @@
                             </li>
                         </ul>
                     </div>
-                    <span class="text-bold" translate="InvoiceQJ"></span>:
+                    <span class="text-bold" translate="Period"></span>:
                     <div class="period-picker" style="margin-left:10px">
                         <input type="text" id="periodDatepicker" class="datepicker imp-subheader" style="width:120px;"
                                readonly="readonly" ng-model="UploadPeriodTime"/>

atms-web/src/main/webapp/app/analysis/data-import/international-data-import/international-data-import.less

@@ -187,17 +187,6 @@
                     color: #F85550;
                 }
             }
-
-            .importPLStatusGridContainer {
-                height: calc(~'100% - 30px');
-                overflow: hidden;
-                position: absolute;
-                top: 0;
-                bottom: 136px; /* 130 + 6 */
-                left: 0;
-                right: 0;
-                background-color: #FFF;
-            }
         }
 
         .error-info-wrapper {

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -1491,8 +1491,8 @@ constant.domesticDataList = [
 ];
 
 constant.internationalDataList = [
-    {code:100,type:"业务数据"},
-    {code:101,type:"税务数据"}
+    {code:100,type:"BUData"},
+    {code:101,type:"TaxData"}
 ];
 
 constant.NationalEconomicIndustryList =[
@@ -1529,7 +1529,15 @@ constant.exportExcelFileName = {
 };
 
 
-
+constant.anlTemplateNameList = [
+    {code:0,name:"各税种税额 _所属期间_模版"},
+    {code:1,name:"实际返还税额 _所属期间_模版"},
+    {code:2,name:"業務線_所属期间_模版"},
+    {code:3,name:"职工人数_所属期间_模版"},
+    {code:4,name:"司機人數_所属期间_模版"},
+    {code:100,name:"国际税业务数据_国家_公司_所属期间_模版"},
+    {code:101,name:"国际税税务数据_国家_公司_所属期间_模版"}
+];