Merge branch 'sam_p1' into 'dev_mysql'

Sam p1

See merge request root/atms!417

atms-api/src/main/java/pwc/taxtech/atms/common/schedule/AnalysisJob.java

@@ -62,6 +62,8 @@ public class AnalysisJob extends QuartzJobBean {
         logger.info(String.format("开始分析%s税种税金计算数据",period));
         analysisJobService.analysisTax(orgs,period, EnumTbImportType.CoverImport.getCode());
 
+        logger.info(String.format("开始分析%税金计算表数据",period));
+        analysisJobService.analysisTaxCalculation(orgs,period,EnumTbImportType.CoverImport.getCode());
     }
 
 }

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

@@ -10,19 +10,15 @@ import pwc.taxtech.atms.analysis.dao.*;
 import pwc.taxtech.atms.analysis.entity.*;
 import pwc.taxtech.atms.common.util.DateUtils;
 import pwc.taxtech.atms.constant.enums.EnumTbImportType;
+import pwc.taxtech.atms.constant.enums.RevenueConfEnum;
 import pwc.taxtech.atms.dao.*;
+import pwc.taxtech.atms.dpo.AnalysisBusinessValueDto;
 import pwc.taxtech.atms.dpo.AnalysisSalesValueDto;
 import pwc.taxtech.atms.dpo.ProjectAnaylsisDto;
 import pwc.taxtech.atms.dto.vatdto.CellDataDto;
 import pwc.taxtech.atms.entity.*;
-import pwc.taxtech.atms.vat.dao.EbitSpreadDataMapper;
-import pwc.taxtech.atms.vat.dao.PeriodCellDataMapper;
-import pwc.taxtech.atms.vat.dao.ProfitLossStatementFinalMapper;
-import pwc.taxtech.atms.vat.dao.TrialBalanceFinalMapper;
-import pwc.taxtech.atms.vat.entity.ProfitLossStatement;
-import pwc.taxtech.atms.vat.entity.ProfitLossStatementExample;
-import pwc.taxtech.atms.vat.entity.TrialBalanceFinal;
-import pwc.taxtech.atms.vat.entity.TrialBalanceFinalExample;
+import pwc.taxtech.atms.vat.dao.*;
+import pwc.taxtech.atms.vat.entity.*;
 import pwc.taxtech.atms.vat.service.impl.ReportServiceImpl;
 
 import javax.annotation.Resource;
@@ -89,6 +85,12 @@ public class AnalysisJobServiceImpl extends BaseService {
     private TaxDocumentMapper taxDocumentMapper;
     @Resource
     private OrganizationTaxRuleMapper organizationTaxRuleMapper;
+    @Resource
+    private RevenueConfigMapper revenueConfigMapper;
+    @Resource
+    private AnalysisTaxMainBusinessMapper analysisTaxMainBusinessMapper;
+    @Resource
+    private AnalysisTaxMainBusinessSortMapper analysisTaxMainBusinessSortMapper;
 
 
     private final static List<Integer> MONTH_LIST = Lists.newArrayList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
@@ -100,6 +102,7 @@ public class AnalysisJobServiceImpl extends BaseService {
     private static final String ZZSNSSBB = "增值税纳税申报表";//增值税申报表（一般纳税人） todo 模板名称改的话这里也要改
     private static final String QYSDSYJB = "预缴纳税申报表";//企业所得税预缴表 todo 模板名称改的话这里也要改
 
+    private static final String SJJSB = "VAT020";
     private String gzzscode = null;//一般纳税人
     private String szzscode = null;//小规模纳税人
 
@@ -198,14 +201,14 @@ public class AnalysisJobServiceImpl extends BaseService {
                 regionMs = Arrays.asList(regionMeg.split(","));
             }
             if (!regionMs.isEmpty()) {
-                if(regionMs.size() == 4){
+                if (regionMs.size() == 4) {
                     am.setProvince(regionMs.get(1) != null ? regionMs.get(1) : "");
                     am.setCity(regionMs.get(2) != null ? regionMs.get(2) : "");
                     am.setDistrict(regionMs.get(3) != null ? regionMs.get(3) : "");
-                }else if(regionMs.size() == 3){
+                } else if (regionMs.size() == 3) {
                     am.setProvince(regionMs.get(1) != null ? regionMs.get(1) : "");
                     am.setCity(regionMs.get(2) != null ? regionMs.get(2) : "");
-                }else if(regionMs.size() == 2){
+                } else if (regionMs.size() == 2) {
                     am.setProvince(regionMs.get(1) != null ? regionMs.get(1) : "");
                 }
             }
@@ -438,6 +441,10 @@ public class AnalysisJobServiceImpl extends BaseService {
         return vMap.get(row + ":" + column) != null ? new BigDecimal(vMap.get(row + ":" + column)) : BigDecimal.ZERO;
     }
 
+    private BigDecimal getSegmentAmountByColumnIndex(Map<Integer, String> vMap, int column) {
+        return vMap.get(column) != null ? new BigDecimal(vMap.get(column)) : BigDecimal.ZERO;
+    }
+
     /**
      * 19/03/2019 15:56
      * 计算返还后各税种税额  tax - actualReturn
@@ -932,6 +939,127 @@ public class AnalysisJobServiceImpl extends BaseService {
 
     }
 
+    //税金计算表分析
+    public void analysisTaxCalculation(List<Organization> orgs, Integer period, Integer type) {
+        List<String> orgIds = orgs.stream().map(Organization::getId).collect(Collectors.toList());
+
+        List<ProjectAnaylsisDto> vatDtos = projectMapper.getTemlateWithServiceType(orgIds, period / 100, period % 100, SJJSB);
+        Map<String, Organization> orgMap = orgs.stream().collect(Collectors.toMap(Organization::getId, Function.identity()));
+
+
+        vatDtos.forEach(vatDto -> {
+            Organization organization = orgMap.get(vatDto.getOrgId());
+            //先删除
+            String seqNo = getSeqNoByPeriod(vatDto.getOrgId(), period);
+            AnalysisTaxMainBusinessExample analysisTaxMainBusinessExample = new AnalysisTaxMainBusinessExample();
+            analysisTaxMainBusinessExample.createCriteria().andSeqNoEqualTo(seqNo);
+            analysisTaxMainBusinessMapper.deleteByExample(analysisTaxMainBusinessExample);
+            try {
+                //取区间时间
+                String date = String.valueOf(period).substring(0, 4) + "-" + String.valueOf(period).substring(4);
+                RevenueConfigExample configExample = new RevenueConfigExample();
+                configExample.createCriteria().andStatusEqualTo(0).andOrgIdEqualTo(vatDto.getOrgId()).
+                        andStartDateLessThanOrEqualTo(date).andEndDateGreaterThanOrEqualTo(date);
+                //数据库查到的
+                List<RevenueConfig> configs = revenueConfigMapper.selectByExample(configExample);
+
+                //这个是要取出来的,过滤
+                List<RevenueConfig> useConfigs = configs.stream().filter(e -> e.getName().indexOf("主营业务收入-") > -1).collect(Collectors.toList());
+
+                useConfigs.forEach(e -> {
+                            AnalysisTaxMainBusiness analysisTaxMainBusiness = new AnalysisTaxMainBusiness();
+
+                            //通过rowname去查询税金计算表数据
+                            List<AnalysisBusinessValueDto> analysisBusinessValueDtos = periodCellDataMapper.selectReportDataByRowname(e.getName() + "\"", vatDto.getProjectId(), period % 100);
+
+                            Map<Integer, String> vMap = new HashMap<>();
+
+                            //数据存入
+                            analysisBusinessValueDtos.forEach(v -> {
+                                vMap.put(v.getColumnIndex(), v.getData());
+                            });
+
+                            analysisTaxMainBusiness.setId(idService.nextId());
+                            //序列
+                            analysisTaxMainBusiness.setSeqNo(getSeqNoByPeriod(vatDto.getOrgId(), period));
+                            //税金项目
+                            analysisTaxMainBusiness.setTaxProject(e.getName());
+                            //账载明细收入
+                            analysisTaxMainBusiness.setAccountIncomeDetails(getSegmentAmountByColumnIndex(vMap, 8));
+                            //专票
+                            analysisTaxMainBusiness.setIncomeFromCancellationSpecialInvoice(getSegmentAmountByColumnIndex(vMap, 4));
+                            //普票
+                            analysisTaxMainBusiness.setIncomeFromCancellationGeneralInvoice(getSegmentAmountByColumnIndex(vMap, 6));
+                            //计税基数
+                            analysisTaxMainBusiness.setTaxBaseTaxableIncome(getSegmentAmountByColumnIndex(vMap, 8));
+                            //税率
+                            analysisTaxMainBusiness.setTaxRate(e.getTaxRate());
+                            //税额
+                            analysisTaxMainBusiness.setTaxAmount(getSegmentAmountByColumnIndex(vMap, 10));
+                            //收入类别
+                            analysisTaxMainBusiness.setIncomeCategory(RevenueConfEnum.RevenueType.MAPPING.get(e.getAccountType()));
+                            analysisTaxMainBusiness.setCompanyName(organization.getName());
+                            analysisTaxMainBusiness.setCreateTime(new Date());
+                            analysisTaxMainBusiness.setPeriod(period);
+
+                            analysisTaxMainBusinessMapper.insertSelective(analysisTaxMainBusiness);
+                        }
+                );
+
+            } catch (Exception e) {
+                logger.error(String.format("公司:[%s]生成税金计算表分析数据失败!", organization.getName()), e);
+            }
+
+        });
+        //查询所有的
+        AnalysisTaxMainBusinessExample analysisTaxMainBusinessExample = new AnalysisTaxMainBusinessExample();
+        analysisTaxMainBusinessExample.createCriteria().andPeriodEqualTo(period);
+        List<AnalysisTaxMainBusiness> analysisTaxMainBusinesses = analysisTaxMainBusinessMapper.selectByExample(analysisTaxMainBusinessExample);
+
+        //删除当前期间排序过的
+        AnalysisTaxMainBusinessSortExample analysisTaxMainBusinessSortExample = new AnalysisTaxMainBusinessSortExample();
+        analysisTaxMainBusinessSortExample.createCriteria().andPeriodEqualTo(period);
+        analysisTaxMainBusinessSortMapper.deleteByExample(analysisTaxMainBusinessSortExample);
+        Map<String, List<AnalysisTaxMainBusiness>> anaGroupMap = analysisTaxMainBusinesses.stream().collect(Collectors.groupingBy(AnalysisTaxMainBusiness::getSeqNo));
+        anaGroupMap.forEach((key, lists) -> {
+                    List<AnalysisTaxMainBusiness> sortLists = lists.stream().sorted(Comparator.comparing(AnalysisTaxMainBusiness::getTaxAmount).reversed()).collect(Collectors.toList());
+
+                    //截取
+                    List<AnalysisTaxMainBusiness> newSortLists = subList(sortLists);
+                    AnalysisTaxMainBusinessSort analysisTaxMainBusinessSort = new AnalysisTaxMainBusinessSort();
+                    analysisTaxMainBusinessSort.setId(idService.nextId());
+                    analysisTaxMainBusinessSort.setSeqNo(newSortLists.get(0).getSeqNo());
+                    analysisTaxMainBusinessSort.setCompanyName(newSortLists.get(0).getCompanyName());
+                    analysisTaxMainBusinessSort.setCreateTime(new Date());
+                    analysisTaxMainBusinessSort.setPeriod(period);
+                    for (int i = 0; i < newSortLists.size(); i++) {
+
+                        switch (i) {
+                            case 0:
+                                analysisTaxMainBusinessSort.setIncomeType1(newSortLists.get(i).getTaxProject().substring(7));
+                                break;
+                            case 1:
+                                analysisTaxMainBusinessSort.setIncomeType2(newSortLists.get(i).getTaxProject().substring(7));
+                                break;
+                            case 2:
+                                analysisTaxMainBusinessSort.setIncomeType3(newSortLists.get(i).getTaxProject().substring(7));
+                                break;
+                            case 3:
+                                analysisTaxMainBusinessSort.setIncomeType4(newSortLists.get(i).getTaxProject().substring(7));
+                                break;
+                            case 4:
+                                analysisTaxMainBusinessSort.setIncomeType5(newSortLists.get(i).getTaxProject().substring(7));
+                                break;
+
+                        }
+
+                    }
+                    analysisTaxMainBusinessSortMapper.insertSelective(analysisTaxMainBusinessSort);
+                }
+
+        );
+
+    }
 
     public class ComparatorDate implements Comparator {
 
@@ -948,4 +1076,14 @@ public class AnalysisJobServiceImpl extends BaseService {
             }
         }
     }
+
+    public List subList(List list) {
+
+        if (list.size() > 5) {//判断list长度
+            List newList = list.subList(0, 5);//取前五条数据
+            return newList;//返回新的list
+        } else {
+            return list;
+        }
+    }
 }

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

@@ -1226,6 +1226,10 @@ public class AnalysisServiceImpl extends BaseService {
 
             logger.info(String.format("开始分析%s税种税金计算数据", period));
             analysisJobService.analysisTax(orgs, period, EnumTbImportType.CoverImport.getCode());
+            logger.info(String.format("开始分析%s税金计算表数据",period));
+            analysisJobService.analysisTaxCalculation(orgs,type,EnumTbImportType.CoverImport.getCode());
+
+
         } catch (Exception ex) {
             ex.printStackTrace();
             operationResultDto.setResult(false);

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

@@ -164,7 +164,7 @@ public class ReportUploadService extends BaseService {
         FileTypesExample fileTypesExample = new FileTypesExample();
         fileTypesExample.createCriteria().andFileTypeEqualTo("增值税及附加税费计算底稿");
         List<FileTypes> fileTypesList = fileTypesMapper.selectByExample(fileTypesExample);
-        if(CollectionUtils.isNotEmpty(dataList)){
+        if(CollectionUtils.isNotEmpty(fileTypesList)){
             taxDocument.setFileAttr(fileTypesList.get(0).getFileAttr());
             taxDocument.setFileTypeId(fileTypesList.get(0).getId());
         }

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

@@ -1484,6 +1484,7 @@ public class ReportServiceImpl extends BaseService {
                 return resultDto;
             }
 
+            //公司和年份生成的project
             Project project = projectMapper.selectByPrimaryKey(report.getProjectId());
             if (project == null) {
                 resultDto.setResult(false);

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

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

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

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

atms-dao/src/main/java/pwc/taxtech/atms/dpo/AnalysisBusinessValueDto.java

+package pwc.taxtech.atms.dpo;
+
+/**
+ * @Auther: sam
+ * @Date: 30/05/2019 16:28
+ * @Description:
+ */
+public class AnalysisBusinessValueDto {
+
+    private String data;
+
+    private String rowName;
+
+    private Integer rowIndex;
+
+    private Integer columnIndex;
+
+    public String getRowName() {
+        return rowName;
+    }
+
+    public void setRowName(String rowName) {
+        this.rowName = rowName;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public Integer getRowIndex() {
+        return rowIndex;
+    }
+
+    public void setRowIndex(Integer rowIndex) {
+        this.rowIndex = rowIndex;
+    }
+
+    public Integer getColumnIndex() {
+        return columnIndex;
+    }
+
+    public void setColumnIndex(Integer columnIndex) {
+        this.columnIndex = columnIndex;
+    }
+}

atms-dao/src/main/java/pwc/taxtech/atms/entity/AnalysisTaxMainBusiness.java

+package pwc.taxtech.atms.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table analysis_tax_main_business
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class AnalysisTaxMainBusiness extends BaseEntity implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   唯一编号 系统唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   序号 系统生成 主键，由所属期间及公司组成。 122
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.seq_no
+     *
+     * @mbg.generated
+     */
+    private String seqNo;
+
+    /**
+     * Database Column Remarks:
+     *   税金项目
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.tax_project
+     *
+     * @mbg.generated
+     */
+    private String taxProject;
+
+    /**
+     * Database Column Remarks:
+     *   账载收入-明细
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.account_income_details
+     *
+     * @mbg.generated
+     */
+    private BigDecimal accountIncomeDetails;
+
+    /**
+     * Database Column Remarks:
+     *   销项开票收入数-专票
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.income_from_cancellation_special_invoice
+     *
+     * @mbg.generated
+     */
+    private BigDecimal incomeFromCancellationSpecialInvoice;
+
+    /**
+     * Database Column Remarks:
+     *   销项开票收入数-普票
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.income_from_cancellation_general_invoice
+     *
+     * @mbg.generated
+     */
+    private BigDecimal incomeFromCancellationGeneralInvoice;
+
+    /**
+     * Database Column Remarks:
+     *   计税基数(应税收入)
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.tax_base_taxable_income
+     *
+     * @mbg.generated
+     */
+    private BigDecimal taxBaseTaxableIncome;
+
+    /**
+     * Database Column Remarks:
+     *   税率
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.tax_rate
+     *
+     * @mbg.generated
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * Database Column Remarks:
+     *   税额(元)
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.tax_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal taxAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.company_name
+     *
+     * @mbg.generated
+     */
+    private String companyName;
+
+    /**
+     * Database Column Remarks:
+     *   收入类别
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.income_category
+     *
+     * @mbg.generated
+     */
+    private String incomeCategory;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间 
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间 
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * Database Column Remarks:
+     *   期间yyyymm
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.id
+     *
+     * @return the value of analysis_tax_main_business.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.id
+     *
+     * @param id the value for analysis_tax_main_business.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.seq_no
+     *
+     * @return the value of analysis_tax_main_business.seq_no
+     *
+     * @mbg.generated
+     */
+    public String getSeqNo() {
+        return seqNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.seq_no
+     *
+     * @param seqNo the value for analysis_tax_main_business.seq_no
+     *
+     * @mbg.generated
+     */
+    public void setSeqNo(String seqNo) {
+        this.seqNo = seqNo == null ? null : seqNo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.tax_project
+     *
+     * @return the value of analysis_tax_main_business.tax_project
+     *
+     * @mbg.generated
+     */
+    public String getTaxProject() {
+        return taxProject;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.tax_project
+     *
+     * @param taxProject the value for analysis_tax_main_business.tax_project
+     *
+     * @mbg.generated
+     */
+    public void setTaxProject(String taxProject) {
+        this.taxProject = taxProject == null ? null : taxProject.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.account_income_details
+     *
+     * @return the value of analysis_tax_main_business.account_income_details
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getAccountIncomeDetails() {
+        return accountIncomeDetails;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.account_income_details
+     *
+     * @param accountIncomeDetails the value for analysis_tax_main_business.account_income_details
+     *
+     * @mbg.generated
+     */
+    public void setAccountIncomeDetails(BigDecimal accountIncomeDetails) {
+        this.accountIncomeDetails = accountIncomeDetails;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.income_from_cancellation_special_invoice
+     *
+     * @return the value of analysis_tax_main_business.income_from_cancellation_special_invoice
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getIncomeFromCancellationSpecialInvoice() {
+        return incomeFromCancellationSpecialInvoice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.income_from_cancellation_special_invoice
+     *
+     * @param incomeFromCancellationSpecialInvoice the value for analysis_tax_main_business.income_from_cancellation_special_invoice
+     *
+     * @mbg.generated
+     */
+    public void setIncomeFromCancellationSpecialInvoice(BigDecimal incomeFromCancellationSpecialInvoice) {
+        this.incomeFromCancellationSpecialInvoice = incomeFromCancellationSpecialInvoice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.income_from_cancellation_general_invoice
+     *
+     * @return the value of analysis_tax_main_business.income_from_cancellation_general_invoice
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getIncomeFromCancellationGeneralInvoice() {
+        return incomeFromCancellationGeneralInvoice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.income_from_cancellation_general_invoice
+     *
+     * @param incomeFromCancellationGeneralInvoice the value for analysis_tax_main_business.income_from_cancellation_general_invoice
+     *
+     * @mbg.generated
+     */
+    public void setIncomeFromCancellationGeneralInvoice(BigDecimal incomeFromCancellationGeneralInvoice) {
+        this.incomeFromCancellationGeneralInvoice = incomeFromCancellationGeneralInvoice;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.tax_base_taxable_income
+     *
+     * @return the value of analysis_tax_main_business.tax_base_taxable_income
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTaxBaseTaxableIncome() {
+        return taxBaseTaxableIncome;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.tax_base_taxable_income
+     *
+     * @param taxBaseTaxableIncome the value for analysis_tax_main_business.tax_base_taxable_income
+     *
+     * @mbg.generated
+     */
+    public void setTaxBaseTaxableIncome(BigDecimal taxBaseTaxableIncome) {
+        this.taxBaseTaxableIncome = taxBaseTaxableIncome;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.tax_rate
+     *
+     * @return the value of analysis_tax_main_business.tax_rate
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTaxRate() {
+        return taxRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.tax_rate
+     *
+     * @param taxRate the value for analysis_tax_main_business.tax_rate
+     *
+     * @mbg.generated
+     */
+    public void setTaxRate(BigDecimal taxRate) {
+        this.taxRate = taxRate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.tax_amount
+     *
+     * @return the value of analysis_tax_main_business.tax_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTaxAmount() {
+        return taxAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.tax_amount
+     *
+     * @param taxAmount the value for analysis_tax_main_business.tax_amount
+     *
+     * @mbg.generated
+     */
+    public void setTaxAmount(BigDecimal taxAmount) {
+        this.taxAmount = taxAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.company_name
+     *
+     * @return the value of analysis_tax_main_business.company_name
+     *
+     * @mbg.generated
+     */
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.company_name
+     *
+     * @param companyName the value for analysis_tax_main_business.company_name
+     *
+     * @mbg.generated
+     */
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName == null ? null : companyName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.income_category
+     *
+     * @return the value of analysis_tax_main_business.income_category
+     *
+     * @mbg.generated
+     */
+    public String getIncomeCategory() {
+        return incomeCategory;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.income_category
+     *
+     * @param incomeCategory the value for analysis_tax_main_business.income_category
+     *
+     * @mbg.generated
+     */
+    public void setIncomeCategory(String incomeCategory) {
+        this.incomeCategory = incomeCategory == null ? null : incomeCategory.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.create_time
+     *
+     * @return the value of analysis_tax_main_business.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.create_time
+     *
+     * @param createTime the value for analysis_tax_main_business.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.update_time
+     *
+     * @return the value of analysis_tax_main_business.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.update_time
+     *
+     * @param updateTime the value for analysis_tax_main_business.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business.period
+     *
+     * @return the value of analysis_tax_main_business.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business.period
+     *
+     * @param period the value for analysis_tax_main_business.period
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", seqNo=").append(seqNo);
+        sb.append(", taxProject=").append(taxProject);
+        sb.append(", accountIncomeDetails=").append(accountIncomeDetails);
+        sb.append(", incomeFromCancellationSpecialInvoice=").append(incomeFromCancellationSpecialInvoice);
+        sb.append(", incomeFromCancellationGeneralInvoice=").append(incomeFromCancellationGeneralInvoice);
+        sb.append(", taxBaseTaxableIncome=").append(taxBaseTaxableIncome);
+        sb.append(", taxRate=").append(taxRate);
+        sb.append(", taxAmount=").append(taxAmount);
+        sb.append(", companyName=").append(companyName);
+        sb.append(", incomeCategory=").append(incomeCategory);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", period=").append(period);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/entity/AnalysisTaxMainBusinessExample.java

+package pwc.taxtech.atms.entity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class AnalysisTaxMainBusinessExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public AnalysisTaxMainBusinessExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoIsNull() {
+            addCriterion("seq_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoIsNotNull() {
+            addCriterion("seq_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoEqualTo(String value) {
+            addCriterion("seq_no =", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoNotEqualTo(String value) {
+            addCriterion("seq_no <>", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoGreaterThan(String value) {
+            addCriterion("seq_no >", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoGreaterThanOrEqualTo(String value) {
+            addCriterion("seq_no >=", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoLessThan(String value) {
+            addCriterion("seq_no <", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoLessThanOrEqualTo(String value) {
+            addCriterion("seq_no <=", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoLike(String value) {
+            addCriterion("seq_no like", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoNotLike(String value) {
+            addCriterion("seq_no not like", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoIn(List<String> values) {
+            addCriterion("seq_no in", values, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoNotIn(List<String> values) {
+            addCriterion("seq_no not in", values, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoBetween(String value1, String value2) {
+            addCriterion("seq_no between", value1, value2, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoNotBetween(String value1, String value2) {
+            addCriterion("seq_no not between", value1, value2, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectIsNull() {
+            addCriterion("tax_project is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectIsNotNull() {
+            addCriterion("tax_project is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectEqualTo(String value) {
+            addCriterion("tax_project =", value, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectNotEqualTo(String value) {
+            addCriterion("tax_project <>", value, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectGreaterThan(String value) {
+            addCriterion("tax_project >", value, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectGreaterThanOrEqualTo(String value) {
+            addCriterion("tax_project >=", value, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectLessThan(String value) {
+            addCriterion("tax_project <", value, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectLessThanOrEqualTo(String value) {
+            addCriterion("tax_project <=", value, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectLike(String value) {
+            addCriterion("tax_project like", value, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectNotLike(String value) {
+            addCriterion("tax_project not like", value, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectIn(List<String> values) {
+            addCriterion("tax_project in", values, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectNotIn(List<String> values) {
+            addCriterion("tax_project not in", values, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectBetween(String value1, String value2) {
+            addCriterion("tax_project between", value1, value2, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxProjectNotBetween(String value1, String value2) {
+            addCriterion("tax_project not between", value1, value2, "taxProject");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsIsNull() {
+            addCriterion("account_income_details is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsIsNotNull() {
+            addCriterion("account_income_details is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsEqualTo(BigDecimal value) {
+            addCriterion("account_income_details =", value, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsNotEqualTo(BigDecimal value) {
+            addCriterion("account_income_details <>", value, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsGreaterThan(BigDecimal value) {
+            addCriterion("account_income_details >", value, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("account_income_details >=", value, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsLessThan(BigDecimal value) {
+            addCriterion("account_income_details <", value, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("account_income_details <=", value, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsIn(List<BigDecimal> values) {
+            addCriterion("account_income_details in", values, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsNotIn(List<BigDecimal> values) {
+            addCriterion("account_income_details not in", values, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("account_income_details between", value1, value2, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andAccountIncomeDetailsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("account_income_details not between", value1, value2, "accountIncomeDetails");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceIsNull() {
+            addCriterion("income_from_cancellation_special_invoice is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceIsNotNull() {
+            addCriterion("income_from_cancellation_special_invoice is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceEqualTo(BigDecimal value) {
+            addCriterion("income_from_cancellation_special_invoice =", value, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceNotEqualTo(BigDecimal value) {
+            addCriterion("income_from_cancellation_special_invoice <>", value, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceGreaterThan(BigDecimal value) {
+            addCriterion("income_from_cancellation_special_invoice >", value, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("income_from_cancellation_special_invoice >=", value, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceLessThan(BigDecimal value) {
+            addCriterion("income_from_cancellation_special_invoice <", value, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("income_from_cancellation_special_invoice <=", value, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceIn(List<BigDecimal> values) {
+            addCriterion("income_from_cancellation_special_invoice in", values, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceNotIn(List<BigDecimal> values) {
+            addCriterion("income_from_cancellation_special_invoice not in", values, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("income_from_cancellation_special_invoice between", value1, value2, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationSpecialInvoiceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("income_from_cancellation_special_invoice not between", value1, value2, "incomeFromCancellationSpecialInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceIsNull() {
+            addCriterion("income_from_cancellation_general_invoice is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceIsNotNull() {
+            addCriterion("income_from_cancellation_general_invoice is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceEqualTo(BigDecimal value) {
+            addCriterion("income_from_cancellation_general_invoice =", value, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceNotEqualTo(BigDecimal value) {
+            addCriterion("income_from_cancellation_general_invoice <>", value, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceGreaterThan(BigDecimal value) {
+            addCriterion("income_from_cancellation_general_invoice >", value, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("income_from_cancellation_general_invoice >=", value, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceLessThan(BigDecimal value) {
+            addCriterion("income_from_cancellation_general_invoice <", value, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("income_from_cancellation_general_invoice <=", value, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceIn(List<BigDecimal> values) {
+            addCriterion("income_from_cancellation_general_invoice in", values, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceNotIn(List<BigDecimal> values) {
+            addCriterion("income_from_cancellation_general_invoice not in", values, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("income_from_cancellation_general_invoice between", value1, value2, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeFromCancellationGeneralInvoiceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("income_from_cancellation_general_invoice not between", value1, value2, "incomeFromCancellationGeneralInvoice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeIsNull() {
+            addCriterion("tax_base_taxable_income is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeIsNotNull() {
+            addCriterion("tax_base_taxable_income is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeEqualTo(BigDecimal value) {
+            addCriterion("tax_base_taxable_income =", value, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeNotEqualTo(BigDecimal value) {
+            addCriterion("tax_base_taxable_income <>", value, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeGreaterThan(BigDecimal value) {
+            addCriterion("tax_base_taxable_income >", value, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_base_taxable_income >=", value, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeLessThan(BigDecimal value) {
+            addCriterion("tax_base_taxable_income <", value, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_base_taxable_income <=", value, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeIn(List<BigDecimal> values) {
+            addCriterion("tax_base_taxable_income in", values, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeNotIn(List<BigDecimal> values) {
+            addCriterion("tax_base_taxable_income not in", values, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_base_taxable_income between", value1, value2, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxBaseTaxableIncomeNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_base_taxable_income not between", value1, value2, "taxBaseTaxableIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIsNull() {
+            addCriterion("tax_rate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIsNotNull() {
+            addCriterion("tax_rate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateEqualTo(BigDecimal value) {
+            addCriterion("tax_rate =", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotEqualTo(BigDecimal value) {
+            addCriterion("tax_rate <>", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateGreaterThan(BigDecimal value) {
+            addCriterion("tax_rate >", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_rate >=", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateLessThan(BigDecimal value) {
+            addCriterion("tax_rate <", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_rate <=", value, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateIn(List<BigDecimal> values) {
+            addCriterion("tax_rate in", values, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotIn(List<BigDecimal> values) {
+            addCriterion("tax_rate not in", values, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_rate between", value1, value2, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxRateNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_rate not between", value1, value2, "taxRate");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountIsNull() {
+            addCriterion("tax_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountIsNotNull() {
+            addCriterion("tax_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountEqualTo(BigDecimal value) {
+            addCriterion("tax_amount =", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountNotEqualTo(BigDecimal value) {
+            addCriterion("tax_amount <>", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountGreaterThan(BigDecimal value) {
+            addCriterion("tax_amount >", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_amount >=", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountLessThan(BigDecimal value) {
+            addCriterion("tax_amount <", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("tax_amount <=", value, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountIn(List<BigDecimal> values) {
+            addCriterion("tax_amount in", values, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountNotIn(List<BigDecimal> values) {
+            addCriterion("tax_amount not in", values, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_amount between", value1, value2, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("tax_amount not between", value1, value2, "taxAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNull() {
+            addCriterion("company_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNotNull() {
+            addCriterion("company_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameEqualTo(String value) {
+            addCriterion("company_name =", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotEqualTo(String value) {
+            addCriterion("company_name <>", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThan(String value) {
+            addCriterion("company_name >", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
+            addCriterion("company_name >=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThan(String value) {
+            addCriterion("company_name <", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThanOrEqualTo(String value) {
+            addCriterion("company_name <=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLike(String value) {
+            addCriterion("company_name like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotLike(String value) {
+            addCriterion("company_name not like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIn(List<String> values) {
+            addCriterion("company_name in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotIn(List<String> values) {
+            addCriterion("company_name not in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameBetween(String value1, String value2) {
+            addCriterion("company_name between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotBetween(String value1, String value2) {
+            addCriterion("company_name not between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryIsNull() {
+            addCriterion("income_category is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryIsNotNull() {
+            addCriterion("income_category is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryEqualTo(String value) {
+            addCriterion("income_category =", value, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryNotEqualTo(String value) {
+            addCriterion("income_category <>", value, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryGreaterThan(String value) {
+            addCriterion("income_category >", value, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryGreaterThanOrEqualTo(String value) {
+            addCriterion("income_category >=", value, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryLessThan(String value) {
+            addCriterion("income_category <", value, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryLessThanOrEqualTo(String value) {
+            addCriterion("income_category <=", value, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryLike(String value) {
+            addCriterion("income_category like", value, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryNotLike(String value) {
+            addCriterion("income_category not like", value, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryIn(List<String> values) {
+            addCriterion("income_category in", values, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryNotIn(List<String> values) {
+            addCriterion("income_category not in", values, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryBetween(String value1, String value2) {
+            addCriterion("income_category between", value1, value2, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeCategoryNotBetween(String value1, String value2) {
+            addCriterion("income_category not between", value1, value2, "incomeCategory");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNull() {
+            addCriterion("period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNotNull() {
+            addCriterion("period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodEqualTo(Integer value) {
+            addCriterion("period =", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotEqualTo(Integer value) {
+            addCriterion("period <>", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThan(Integer value) {
+            addCriterion("period >", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("period >=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThan(Integer value) {
+            addCriterion("period <", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("period <=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIn(List<Integer> values) {
+            addCriterion("period in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotIn(List<Integer> values) {
+            addCriterion("period not in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("period between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("period not between", value1, value2, "period");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table analysis_tax_main_business
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/entity/AnalysisTaxMainBusinessSort.java

+package pwc.taxtech.atms.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * This class was generated by MyBatis Generator.
+ * This class corresponds to the database table analysis_tax_main_business_sort
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class AnalysisTaxMainBusinessSort extends BaseEntity implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   唯一编号 系统唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   序号 系统生成 主键，由所属期间及公司组成
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.seq_no
+     *
+     * @mbg.generated
+     */
+    private String seqNo;
+
+    /**
+     * Database Column Remarks:
+     *   收入类型1
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.income_type1
+     *
+     * @mbg.generated
+     */
+    private String incomeType1;
+
+    /**
+     * Database Column Remarks:
+     *   收入类型2
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.income_type2
+     *
+     * @mbg.generated
+     */
+    private String incomeType2;
+
+    /**
+     * Database Column Remarks:
+     *   收入类型3
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.income_type3
+     *
+     * @mbg.generated
+     */
+    private String incomeType3;
+
+    /**
+     * Database Column Remarks:
+     *   收入类型4
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.income_type4
+     *
+     * @mbg.generated
+     */
+    private String incomeType4;
+
+    /**
+     * Database Column Remarks:
+     *   收入类型5
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.income_type5
+     *
+     * @mbg.generated
+     */
+    private String incomeType5;
+
+    /**
+     * Database Column Remarks:
+     *   公司名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.company_name
+     *
+     * @mbg.generated
+     */
+    private String companyName;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间 
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间 
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * Database Column Remarks:
+     *   期间yyyymm
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_tax_main_business_sort.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.id
+     *
+     * @return the value of analysis_tax_main_business_sort.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.id
+     *
+     * @param id the value for analysis_tax_main_business_sort.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.seq_no
+     *
+     * @return the value of analysis_tax_main_business_sort.seq_no
+     *
+     * @mbg.generated
+     */
+    public String getSeqNo() {
+        return seqNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.seq_no
+     *
+     * @param seqNo the value for analysis_tax_main_business_sort.seq_no
+     *
+     * @mbg.generated
+     */
+    public void setSeqNo(String seqNo) {
+        this.seqNo = seqNo == null ? null : seqNo.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.income_type1
+     *
+     * @return the value of analysis_tax_main_business_sort.income_type1
+     *
+     * @mbg.generated
+     */
+    public String getIncomeType1() {
+        return incomeType1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.income_type1
+     *
+     * @param incomeType1 the value for analysis_tax_main_business_sort.income_type1
+     *
+     * @mbg.generated
+     */
+    public void setIncomeType1(String incomeType1) {
+        this.incomeType1 = incomeType1 == null ? null : incomeType1.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.income_type2
+     *
+     * @return the value of analysis_tax_main_business_sort.income_type2
+     *
+     * @mbg.generated
+     */
+    public String getIncomeType2() {
+        return incomeType2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.income_type2
+     *
+     * @param incomeType2 the value for analysis_tax_main_business_sort.income_type2
+     *
+     * @mbg.generated
+     */
+    public void setIncomeType2(String incomeType2) {
+        this.incomeType2 = incomeType2 == null ? null : incomeType2.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.income_type3
+     *
+     * @return the value of analysis_tax_main_business_sort.income_type3
+     *
+     * @mbg.generated
+     */
+    public String getIncomeType3() {
+        return incomeType3;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.income_type3
+     *
+     * @param incomeType3 the value for analysis_tax_main_business_sort.income_type3
+     *
+     * @mbg.generated
+     */
+    public void setIncomeType3(String incomeType3) {
+        this.incomeType3 = incomeType3 == null ? null : incomeType3.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.income_type4
+     *
+     * @return the value of analysis_tax_main_business_sort.income_type4
+     *
+     * @mbg.generated
+     */
+    public String getIncomeType4() {
+        return incomeType4;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.income_type4
+     *
+     * @param incomeType4 the value for analysis_tax_main_business_sort.income_type4
+     *
+     * @mbg.generated
+     */
+    public void setIncomeType4(String incomeType4) {
+        this.incomeType4 = incomeType4 == null ? null : incomeType4.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.income_type5
+     *
+     * @return the value of analysis_tax_main_business_sort.income_type5
+     *
+     * @mbg.generated
+     */
+    public String getIncomeType5() {
+        return incomeType5;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.income_type5
+     *
+     * @param incomeType5 the value for analysis_tax_main_business_sort.income_type5
+     *
+     * @mbg.generated
+     */
+    public void setIncomeType5(String incomeType5) {
+        this.incomeType5 = incomeType5 == null ? null : incomeType5.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.company_name
+     *
+     * @return the value of analysis_tax_main_business_sort.company_name
+     *
+     * @mbg.generated
+     */
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.company_name
+     *
+     * @param companyName the value for analysis_tax_main_business_sort.company_name
+     *
+     * @mbg.generated
+     */
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName == null ? null : companyName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.create_time
+     *
+     * @return the value of analysis_tax_main_business_sort.create_time
+     *
+     * @mbg.generated
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.create_time
+     *
+     * @param createTime the value for analysis_tax_main_business_sort.create_time
+     *
+     * @mbg.generated
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.update_time
+     *
+     * @return the value of analysis_tax_main_business_sort.update_time
+     *
+     * @mbg.generated
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.update_time
+     *
+     * @param updateTime the value for analysis_tax_main_business_sort.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_tax_main_business_sort.period
+     *
+     * @return the value of analysis_tax_main_business_sort.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_tax_main_business_sort.period
+     *
+     * @param period the value for analysis_tax_main_business_sort.period
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", seqNo=").append(seqNo);
+        sb.append(", incomeType1=").append(incomeType1);
+        sb.append(", incomeType2=").append(incomeType2);
+        sb.append(", incomeType3=").append(incomeType3);
+        sb.append(", incomeType4=").append(incomeType4);
+        sb.append(", incomeType5=").append(incomeType5);
+        sb.append(", companyName=").append(companyName);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", period=").append(period);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/entity/AnalysisTaxMainBusinessSortExample.java

+package pwc.taxtech.atms.entity;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class AnalysisTaxMainBusinessSortExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public AnalysisTaxMainBusinessSortExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoIsNull() {
+            addCriterion("seq_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoIsNotNull() {
+            addCriterion("seq_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoEqualTo(String value) {
+            addCriterion("seq_no =", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoNotEqualTo(String value) {
+            addCriterion("seq_no <>", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoGreaterThan(String value) {
+            addCriterion("seq_no >", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoGreaterThanOrEqualTo(String value) {
+            addCriterion("seq_no >=", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoLessThan(String value) {
+            addCriterion("seq_no <", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoLessThanOrEqualTo(String value) {
+            addCriterion("seq_no <=", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoLike(String value) {
+            addCriterion("seq_no like", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoNotLike(String value) {
+            addCriterion("seq_no not like", value, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoIn(List<String> values) {
+            addCriterion("seq_no in", values, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoNotIn(List<String> values) {
+            addCriterion("seq_no not in", values, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoBetween(String value1, String value2) {
+            addCriterion("seq_no between", value1, value2, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andSeqNoNotBetween(String value1, String value2) {
+            addCriterion("seq_no not between", value1, value2, "seqNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1IsNull() {
+            addCriterion("income_type1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1IsNotNull() {
+            addCriterion("income_type1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1EqualTo(String value) {
+            addCriterion("income_type1 =", value, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1NotEqualTo(String value) {
+            addCriterion("income_type1 <>", value, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1GreaterThan(String value) {
+            addCriterion("income_type1 >", value, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1GreaterThanOrEqualTo(String value) {
+            addCriterion("income_type1 >=", value, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1LessThan(String value) {
+            addCriterion("income_type1 <", value, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1LessThanOrEqualTo(String value) {
+            addCriterion("income_type1 <=", value, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1Like(String value) {
+            addCriterion("income_type1 like", value, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1NotLike(String value) {
+            addCriterion("income_type1 not like", value, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1In(List<String> values) {
+            addCriterion("income_type1 in", values, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1NotIn(List<String> values) {
+            addCriterion("income_type1 not in", values, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1Between(String value1, String value2) {
+            addCriterion("income_type1 between", value1, value2, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType1NotBetween(String value1, String value2) {
+            addCriterion("income_type1 not between", value1, value2, "incomeType1");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2IsNull() {
+            addCriterion("income_type2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2IsNotNull() {
+            addCriterion("income_type2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2EqualTo(String value) {
+            addCriterion("income_type2 =", value, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2NotEqualTo(String value) {
+            addCriterion("income_type2 <>", value, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2GreaterThan(String value) {
+            addCriterion("income_type2 >", value, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2GreaterThanOrEqualTo(String value) {
+            addCriterion("income_type2 >=", value, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2LessThan(String value) {
+            addCriterion("income_type2 <", value, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2LessThanOrEqualTo(String value) {
+            addCriterion("income_type2 <=", value, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2Like(String value) {
+            addCriterion("income_type2 like", value, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2NotLike(String value) {
+            addCriterion("income_type2 not like", value, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2In(List<String> values) {
+            addCriterion("income_type2 in", values, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2NotIn(List<String> values) {
+            addCriterion("income_type2 not in", values, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2Between(String value1, String value2) {
+            addCriterion("income_type2 between", value1, value2, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType2NotBetween(String value1, String value2) {
+            addCriterion("income_type2 not between", value1, value2, "incomeType2");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3IsNull() {
+            addCriterion("income_type3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3IsNotNull() {
+            addCriterion("income_type3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3EqualTo(String value) {
+            addCriterion("income_type3 =", value, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3NotEqualTo(String value) {
+            addCriterion("income_type3 <>", value, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3GreaterThan(String value) {
+            addCriterion("income_type3 >", value, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3GreaterThanOrEqualTo(String value) {
+            addCriterion("income_type3 >=", value, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3LessThan(String value) {
+            addCriterion("income_type3 <", value, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3LessThanOrEqualTo(String value) {
+            addCriterion("income_type3 <=", value, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3Like(String value) {
+            addCriterion("income_type3 like", value, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3NotLike(String value) {
+            addCriterion("income_type3 not like", value, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3In(List<String> values) {
+            addCriterion("income_type3 in", values, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3NotIn(List<String> values) {
+            addCriterion("income_type3 not in", values, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3Between(String value1, String value2) {
+            addCriterion("income_type3 between", value1, value2, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType3NotBetween(String value1, String value2) {
+            addCriterion("income_type3 not between", value1, value2, "incomeType3");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4IsNull() {
+            addCriterion("income_type4 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4IsNotNull() {
+            addCriterion("income_type4 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4EqualTo(String value) {
+            addCriterion("income_type4 =", value, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4NotEqualTo(String value) {
+            addCriterion("income_type4 <>", value, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4GreaterThan(String value) {
+            addCriterion("income_type4 >", value, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4GreaterThanOrEqualTo(String value) {
+            addCriterion("income_type4 >=", value, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4LessThan(String value) {
+            addCriterion("income_type4 <", value, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4LessThanOrEqualTo(String value) {
+            addCriterion("income_type4 <=", value, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4Like(String value) {
+            addCriterion("income_type4 like", value, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4NotLike(String value) {
+            addCriterion("income_type4 not like", value, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4In(List<String> values) {
+            addCriterion("income_type4 in", values, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4NotIn(List<String> values) {
+            addCriterion("income_type4 not in", values, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4Between(String value1, String value2) {
+            addCriterion("income_type4 between", value1, value2, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType4NotBetween(String value1, String value2) {
+            addCriterion("income_type4 not between", value1, value2, "incomeType4");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5IsNull() {
+            addCriterion("income_type5 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5IsNotNull() {
+            addCriterion("income_type5 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5EqualTo(String value) {
+            addCriterion("income_type5 =", value, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5NotEqualTo(String value) {
+            addCriterion("income_type5 <>", value, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5GreaterThan(String value) {
+            addCriterion("income_type5 >", value, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5GreaterThanOrEqualTo(String value) {
+            addCriterion("income_type5 >=", value, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5LessThan(String value) {
+            addCriterion("income_type5 <", value, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5LessThanOrEqualTo(String value) {
+            addCriterion("income_type5 <=", value, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5Like(String value) {
+            addCriterion("income_type5 like", value, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5NotLike(String value) {
+            addCriterion("income_type5 not like", value, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5In(List<String> values) {
+            addCriterion("income_type5 in", values, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5NotIn(List<String> values) {
+            addCriterion("income_type5 not in", values, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5Between(String value1, String value2) {
+            addCriterion("income_type5 between", value1, value2, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andIncomeType5NotBetween(String value1, String value2) {
+            addCriterion("income_type5 not between", value1, value2, "incomeType5");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNull() {
+            addCriterion("company_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNotNull() {
+            addCriterion("company_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameEqualTo(String value) {
+            addCriterion("company_name =", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotEqualTo(String value) {
+            addCriterion("company_name <>", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThan(String value) {
+            addCriterion("company_name >", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
+            addCriterion("company_name >=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThan(String value) {
+            addCriterion("company_name <", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThanOrEqualTo(String value) {
+            addCriterion("company_name <=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLike(String value) {
+            addCriterion("company_name like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotLike(String value) {
+            addCriterion("company_name not like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIn(List<String> values) {
+            addCriterion("company_name in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotIn(List<String> values) {
+            addCriterion("company_name not in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameBetween(String value1, String value2) {
+            addCriterion("company_name between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotBetween(String value1, String value2) {
+            addCriterion("company_name not between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNull() {
+            addCriterion("period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIsNotNull() {
+            addCriterion("period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodEqualTo(Integer value) {
+            addCriterion("period =", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotEqualTo(Integer value) {
+            addCriterion("period <>", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThan(Integer value) {
+            addCriterion("period >", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("period >=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThan(Integer value) {
+            addCriterion("period <", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("period <=", value, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodIn(List<Integer> values) {
+            addCriterion("period in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotIn(List<Integer> values) {
+            addCriterion("period not in", values, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("period between", value1, value2, "period");
+            return (Criteria) this;
+        }
+
+        public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("period not between", value1, value2, "period");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table analysis_tax_main_business_sort
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodCellDataMapper.java

@@ -4,6 +4,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.dpo.AnalysisBusinessValueDto;
 import pwc.taxtech.atms.dpo.AnalysisSalesValueDto;
 import pwc.taxtech.atms.vat.entity.PeriodCellData;
 import pwc.taxtech.atms.vat.entity.PeriodCellDataExample;
@@ -117,4 +118,9 @@ public interface PeriodCellDataMapper extends MyVatMapper {
     List<AnalysisSalesValueDto> selectReportData(@Param("reportId") Long reportId,
                      @Param("projectId") String projectId,
                      @Param("period") Integer period);
+
+
+    List<AnalysisBusinessValueDto>selectReportDataByRowname(@Param("rowName") String rowName,
+                                                            @Param("projectId") String projectId,
+                                                            @Param("period") Integer period);
 }
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/AnalysisTaxMainBusinessMapper.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.dao.AnalysisTaxMainBusinessMapper">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.entity.AnalysisTaxMainBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="seq_no" jdbcType="VARCHAR" property="seqNo" />
+    <result column="tax_project" jdbcType="VARCHAR" property="taxProject" />
+    <result column="account_income_details" jdbcType="DECIMAL" property="accountIncomeDetails" />
+    <result column="income_from_cancellation_special_invoice" jdbcType="DECIMAL" property="incomeFromCancellationSpecialInvoice" />
+    <result column="income_from_cancellation_general_invoice" jdbcType="DECIMAL" property="incomeFromCancellationGeneralInvoice" />
+    <result column="tax_base_taxable_income" jdbcType="DECIMAL" property="taxBaseTaxableIncome" />
+    <result column="tax_rate" jdbcType="DECIMAL" property="taxRate" />
+    <result column="tax_amount" jdbcType="DECIMAL" property="taxAmount" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="income_category" jdbcType="VARCHAR" property="incomeCategory" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="period" jdbcType="INTEGER" property="period" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, seq_no, tax_project, account_income_details, income_from_cancellation_special_invoice, 
+    income_from_cancellation_general_invoice, tax_base_taxable_income, tax_rate, tax_amount, 
+    company_name, income_category, create_time, update_time, period
+  </sql>
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from analysis_tax_main_business
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from analysis_tax_main_business
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from analysis_tax_main_business
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from analysis_tax_main_business
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into analysis_tax_main_business (id, seq_no, tax_project, 
+      account_income_details, income_from_cancellation_special_invoice, 
+      income_from_cancellation_general_invoice, tax_base_taxable_income, 
+      tax_rate, tax_amount, company_name, 
+      income_category, create_time, update_time, 
+      period)
+    values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{taxProject,jdbcType=VARCHAR}, 
+      #{accountIncomeDetails,jdbcType=DECIMAL}, #{incomeFromCancellationSpecialInvoice,jdbcType=DECIMAL}, 
+      #{incomeFromCancellationGeneralInvoice,jdbcType=DECIMAL}, #{taxBaseTaxableIncome,jdbcType=DECIMAL}, 
+      #{taxRate,jdbcType=DECIMAL}, #{taxAmount,jdbcType=DECIMAL}, #{companyName,jdbcType=VARCHAR}, 
+      #{incomeCategory,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{period,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into analysis_tax_main_business
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="seqNo != null">
+        seq_no,
+      </if>
+      <if test="taxProject != null">
+        tax_project,
+      </if>
+      <if test="accountIncomeDetails != null">
+        account_income_details,
+      </if>
+      <if test="incomeFromCancellationSpecialInvoice != null">
+        income_from_cancellation_special_invoice,
+      </if>
+      <if test="incomeFromCancellationGeneralInvoice != null">
+        income_from_cancellation_general_invoice,
+      </if>
+      <if test="taxBaseTaxableIncome != null">
+        tax_base_taxable_income,
+      </if>
+      <if test="taxRate != null">
+        tax_rate,
+      </if>
+      <if test="taxAmount != null">
+        tax_amount,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="incomeCategory != null">
+        income_category,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="period != null">
+        period,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="seqNo != null">
+        #{seqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="taxProject != null">
+        #{taxProject,jdbcType=VARCHAR},
+      </if>
+      <if test="accountIncomeDetails != null">
+        #{accountIncomeDetails,jdbcType=DECIMAL},
+      </if>
+      <if test="incomeFromCancellationSpecialInvoice != null">
+        #{incomeFromCancellationSpecialInvoice,jdbcType=DECIMAL},
+      </if>
+      <if test="incomeFromCancellationGeneralInvoice != null">
+        #{incomeFromCancellationGeneralInvoice,jdbcType=DECIMAL},
+      </if>
+      <if test="taxBaseTaxableIncome != null">
+        #{taxBaseTaxableIncome,jdbcType=DECIMAL},
+      </if>
+      <if test="taxRate != null">
+        #{taxRate,jdbcType=DECIMAL},
+      </if>
+      <if test="taxAmount != null">
+        #{taxAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeCategory != null">
+        #{incomeCategory,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="period != null">
+        #{period,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from analysis_tax_main_business
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update analysis_tax_main_business
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.seqNo != null">
+        seq_no = #{record.seqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taxProject != null">
+        tax_project = #{record.taxProject,jdbcType=VARCHAR},
+      </if>
+      <if test="record.accountIncomeDetails != null">
+        account_income_details = #{record.accountIncomeDetails,jdbcType=DECIMAL},
+      </if>
+      <if test="record.incomeFromCancellationSpecialInvoice != null">
+        income_from_cancellation_special_invoice = #{record.incomeFromCancellationSpecialInvoice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.incomeFromCancellationGeneralInvoice != null">
+        income_from_cancellation_general_invoice = #{record.incomeFromCancellationGeneralInvoice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.taxBaseTaxableIncome != null">
+        tax_base_taxable_income = #{record.taxBaseTaxableIncome,jdbcType=DECIMAL},
+      </if>
+      <if test="record.taxRate != null">
+        tax_rate = #{record.taxRate,jdbcType=DECIMAL},
+      </if>
+      <if test="record.taxAmount != null">
+        tax_amount = #{record.taxAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.companyName != null">
+        company_name = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.incomeCategory != null">
+        income_category = #{record.incomeCategory,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.period != null">
+        period = #{record.period,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update analysis_tax_main_business
+    set id = #{record.id,jdbcType=BIGINT},
+      seq_no = #{record.seqNo,jdbcType=VARCHAR},
+      tax_project = #{record.taxProject,jdbcType=VARCHAR},
+      account_income_details = #{record.accountIncomeDetails,jdbcType=DECIMAL},
+      income_from_cancellation_special_invoice = #{record.incomeFromCancellationSpecialInvoice,jdbcType=DECIMAL},
+      income_from_cancellation_general_invoice = #{record.incomeFromCancellationGeneralInvoice,jdbcType=DECIMAL},
+      tax_base_taxable_income = #{record.taxBaseTaxableIncome,jdbcType=DECIMAL},
+      tax_rate = #{record.taxRate,jdbcType=DECIMAL},
+      tax_amount = #{record.taxAmount,jdbcType=DECIMAL},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      income_category = #{record.incomeCategory,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      period = #{record.period,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update analysis_tax_main_business
+    <set>
+      <if test="seqNo != null">
+        seq_no = #{seqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="taxProject != null">
+        tax_project = #{taxProject,jdbcType=VARCHAR},
+      </if>
+      <if test="accountIncomeDetails != null">
+        account_income_details = #{accountIncomeDetails,jdbcType=DECIMAL},
+      </if>
+      <if test="incomeFromCancellationSpecialInvoice != null">
+        income_from_cancellation_special_invoice = #{incomeFromCancellationSpecialInvoice,jdbcType=DECIMAL},
+      </if>
+      <if test="incomeFromCancellationGeneralInvoice != null">
+        income_from_cancellation_general_invoice = #{incomeFromCancellationGeneralInvoice,jdbcType=DECIMAL},
+      </if>
+      <if test="taxBaseTaxableIncome != null">
+        tax_base_taxable_income = #{taxBaseTaxableIncome,jdbcType=DECIMAL},
+      </if>
+      <if test="taxRate != null">
+        tax_rate = #{taxRate,jdbcType=DECIMAL},
+      </if>
+      <if test="taxAmount != null">
+        tax_amount = #{taxAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="companyName != null">
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeCategory != null">
+        income_category = #{incomeCategory,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="period != null">
+        period = #{period,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusiness">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update analysis_tax_main_business
+    set seq_no = #{seqNo,jdbcType=VARCHAR},
+      tax_project = #{taxProject,jdbcType=VARCHAR},
+      account_income_details = #{accountIncomeDetails,jdbcType=DECIMAL},
+      income_from_cancellation_special_invoice = #{incomeFromCancellationSpecialInvoice,jdbcType=DECIMAL},
+      income_from_cancellation_general_invoice = #{incomeFromCancellationGeneralInvoice,jdbcType=DECIMAL},
+      tax_base_taxable_income = #{taxBaseTaxableIncome,jdbcType=DECIMAL},
+      tax_rate = #{taxRate,jdbcType=DECIMAL},
+      tax_amount = #{taxAmount,jdbcType=DECIMAL},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      income_category = #{incomeCategory,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      period = #{period,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/dao/AnalysisTaxMainBusinessSortMapper.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.dao.AnalysisTaxMainBusinessSortMapper">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSort">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="seq_no" jdbcType="VARCHAR" property="seqNo" />
+    <result column="income_type1" jdbcType="VARCHAR" property="incomeType1" />
+    <result column="income_type2" jdbcType="VARCHAR" property="incomeType2" />
+    <result column="income_type3" jdbcType="VARCHAR" property="incomeType3" />
+    <result column="income_type4" jdbcType="VARCHAR" property="incomeType4" />
+    <result column="income_type5" jdbcType="VARCHAR" property="incomeType5" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="period" jdbcType="INTEGER" property="period" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, seq_no, income_type1, income_type2, income_type3, income_type4, income_type5, 
+    company_name, create_time, update_time, period
+  </sql>
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSortExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from analysis_tax_main_business_sort
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from analysis_tax_main_business_sort
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from analysis_tax_main_business_sort
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSortExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from analysis_tax_main_business_sort
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSort">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into analysis_tax_main_business_sort (id, seq_no, income_type1, 
+      income_type2, income_type3, income_type4, 
+      income_type5, company_name, create_time, 
+      update_time, period)
+    values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{incomeType1,jdbcType=VARCHAR}, 
+      #{incomeType2,jdbcType=VARCHAR}, #{incomeType3,jdbcType=VARCHAR}, #{incomeType4,jdbcType=VARCHAR}, 
+      #{incomeType5,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{period,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSort">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into analysis_tax_main_business_sort
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="seqNo != null">
+        seq_no,
+      </if>
+      <if test="incomeType1 != null">
+        income_type1,
+      </if>
+      <if test="incomeType2 != null">
+        income_type2,
+      </if>
+      <if test="incomeType3 != null">
+        income_type3,
+      </if>
+      <if test="incomeType4 != null">
+        income_type4,
+      </if>
+      <if test="incomeType5 != null">
+        income_type5,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+      <if test="period != null">
+        period,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="seqNo != null">
+        #{seqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType1 != null">
+        #{incomeType1,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType2 != null">
+        #{incomeType2,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType3 != null">
+        #{incomeType3,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType4 != null">
+        #{incomeType4,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType5 != null">
+        #{incomeType5,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="period != null">
+        #{period,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSortExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from analysis_tax_main_business_sort
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update analysis_tax_main_business_sort
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.seqNo != null">
+        seq_no = #{record.seqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.incomeType1 != null">
+        income_type1 = #{record.incomeType1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.incomeType2 != null">
+        income_type2 = #{record.incomeType2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.incomeType3 != null">
+        income_type3 = #{record.incomeType3,jdbcType=VARCHAR},
+      </if>
+      <if test="record.incomeType4 != null">
+        income_type4 = #{record.incomeType4,jdbcType=VARCHAR},
+      </if>
+      <if test="record.incomeType5 != null">
+        income_type5 = #{record.incomeType5,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyName != null">
+        company_name = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateTime != null">
+        update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.period != null">
+        period = #{record.period,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update analysis_tax_main_business_sort
+    set id = #{record.id,jdbcType=BIGINT},
+      seq_no = #{record.seqNo,jdbcType=VARCHAR},
+      income_type1 = #{record.incomeType1,jdbcType=VARCHAR},
+      income_type2 = #{record.incomeType2,jdbcType=VARCHAR},
+      income_type3 = #{record.incomeType3,jdbcType=VARCHAR},
+      income_type4 = #{record.incomeType4,jdbcType=VARCHAR},
+      income_type5 = #{record.incomeType5,jdbcType=VARCHAR},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP},
+      period = #{record.period,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSort">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update analysis_tax_main_business_sort
+    <set>
+      <if test="seqNo != null">
+        seq_no = #{seqNo,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType1 != null">
+        income_type1 = #{incomeType1,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType2 != null">
+        income_type2 = #{incomeType2,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType3 != null">
+        income_type3 = #{incomeType3,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType4 != null">
+        income_type4 = #{incomeType4,jdbcType=VARCHAR},
+      </if>
+      <if test="incomeType5 != null">
+        income_type5 = #{incomeType5,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null">
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="period != null">
+        period = #{period,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.entity.AnalysisTaxMainBusinessSort">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update analysis_tax_main_business_sort
+    set seq_no = #{seqNo,jdbcType=VARCHAR},
+      income_type1 = #{incomeType1,jdbcType=VARCHAR},
+      income_type2 = #{incomeType2,jdbcType=VARCHAR},
+      income_type3 = #{incomeType3,jdbcType=VARCHAR},
+      income_type4 = #{incomeType4,jdbcType=VARCHAR},
+      income_type5 = #{incomeType5,jdbcType=VARCHAR},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP},
+      period = #{period,jdbcType=INTEGER}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellDataExtendsMapper.xml

@@ -139,4 +139,15 @@
           and cell_template.period = #{period}
           and cell_template.report_template_id = #{reportId}
     </select>
+
+    <select id= "selectReportDataByRowname" resultType="pwc.taxtech.atms.dpo.AnalysisBusinessValueDto">
+    select t.row_name rowName,d.`data` data,t.column_index columnIndex,t.row_index rowIndex from
+    period_cell_data  d ,
+    period_cell_template t
+    where d.cell_template_id=t.cell_template_id
+    and t.project_id=#{projectId,jdbcType=VARCHAR}
+    and t.period =#{period,jdbcType=INTEGER}
+    and t.row_name like concat ("%",#{rowName,jdbcType=VARCHAR},"%")
+    </select>
+
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow-manual/vat-preview-cash-flow-manual.ctrl.js

@@ -82,7 +82,7 @@
                         $scope.ledgerCurrencyCodeFirst = itemFirst.ledgerCurrencyCode;
                         $scope.ledgerStatusFirst = itemFirst.status;
                         //TODO
-                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
+                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd HH:mm:ss");
                     }
                     $scope.gridOptions.data = data.list;
                     $scope.queryIncomeInvoiceItemResult.pageInfo = data;

atms-web/src/main/webapp/app/vat/preview/vat-preview-profit-loss-prc-manual/vat-preview-profit-loss-prc-manual.ctrl.js

@@ -105,7 +105,7 @@
                     if(data.size>0){
                         $scope.currencyCode = data.list[0].ledgerCurrencyCode;
                         $scope.status = data.list[0].status;
-                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd hh:mm:ss");
+                        $scope.importDate = $filter('date')(data.list[0].updateTime, "yyyy-MM-dd HH:mm:ss");
                     }
                 }
             });

atms-web/src/main/webapp/ping.html

-Server is Running
\ No newline at end of file
+Server is  Running
\ No newline at end of file