CIT分配表开发以及导入和预览页面bug修改

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

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

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitDistribution.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 cit_distribution
+ *
+ * @mbg.generated do_not_delete_during_merge
+ */
+public class CitDistribution extends BaseEntity implements Serializable {
+    /**
+     * Database Column Remarks:
+     *   唯一编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     * Database Column Remarks:
+     *   机构编号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
+    /**
+     * Database Column Remarks:
+     *   项目ID
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.project_id
+     *
+     * @mbg.generated
+     */
+    private String projectId;
+
+    /**
+     * Database Column Remarks:
+     *   数据日期
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.date
+     *
+     * @mbg.generated
+     */
+    private Date date;
+
+    /**
+     * Database Column Remarks:
+     *   来源
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.source
+     *
+     * @mbg.generated
+     */
+    private String source;
+
+    /**
+     * Database Column Remarks:
+     *   期间 yyyymm(区分卡片年份的期间，系统设计要求必有字段)
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.period
+     *
+     * @mbg.generated
+     */
+    private Integer period;
+
+    /**
+     * Database Column Remarks:
+     *   季度
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.quarter
+     *
+     * @mbg.generated
+     */
+    private Integer quarter;
+
+    /**
+     * Database Column Remarks:
+     *   纳税人识别号
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.tax_payer_number
+     *
+     * @mbg.generated
+     */
+    private String taxPayerNumber;
+
+    /**
+     * Database Column Remarks:
+     *   机构名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.org_name
+     *
+     * @mbg.generated
+     */
+    private String orgName;
+
+    /**
+     * Database Column Remarks:
+     *   营业收入
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.business_income
+     *
+     * @mbg.generated
+     */
+    private BigDecimal businessIncome;
+
+    /**
+     * Database Column Remarks:
+     *   职工薪酬
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.employee_remuneration
+     *
+     * @mbg.generated
+     */
+    private BigDecimal employeeRemuneration;
+
+    /**
+     * Database Column Remarks:
+     *   资产总额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.total_assets
+     *
+     * @mbg.generated
+     */
+    private BigDecimal totalAssets;
+
+    /**
+     * Database Column Remarks:
+     *   分配比例
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.distribution_ratio
+     *
+     * @mbg.generated
+     */
+    private BigDecimal distributionRatio;
+
+    /**
+     * Database Column Remarks:
+     *   分配比例公式
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.distribution_ratio_formula
+     *
+     * @mbg.generated
+     */
+    private String distributionRatioFormula;
+
+    /**
+     * Database Column Remarks:
+     *   分配所得税额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.distribution_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal distributionAmount;
+
+    /**
+     * Database Column Remarks:
+     *   分配所得税额公式
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.distribution_amount_formula
+     *
+     * @mbg.generated
+     */
+    private String distributionAmountFormula;
+
+    /**
+     * Database Column Remarks:
+     *   创建人
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.create_by
+     *
+     * @mbg.generated
+     */
+    private String createBy;
+
+    /**
+     * Database Column Remarks:
+     *   创建时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.create_time
+     *
+     * @mbg.generated
+     */
+    private Date createTime;
+
+    /**
+     * Database Column Remarks:
+     *   更新时间
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_distribution.update_time
+     *
+     * @mbg.generated
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.id
+     *
+     * @return the value of cit_distribution.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.id
+     *
+     * @param id the value for cit_distribution.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 cit_distribution.organization_id
+     *
+     * @return the value of cit_distribution.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.organization_id
+     *
+     * @param organizationId the value for cit_distribution.organization_id
+     *
+     * @mbg.generated
+     */
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId == null ? null : organizationId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.project_id
+     *
+     * @return the value of cit_distribution.project_id
+     *
+     * @mbg.generated
+     */
+    public String getProjectId() {
+        return projectId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.project_id
+     *
+     * @param projectId the value for cit_distribution.project_id
+     *
+     * @mbg.generated
+     */
+    public void setProjectId(String projectId) {
+        this.projectId = projectId == null ? null : projectId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.date
+     *
+     * @return the value of cit_distribution.date
+     *
+     * @mbg.generated
+     */
+    public Date getDate() {
+        return date;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.date
+     *
+     * @param date the value for cit_distribution.date
+     *
+     * @mbg.generated
+     */
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.source
+     *
+     * @return the value of cit_distribution.source
+     *
+     * @mbg.generated
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.source
+     *
+     * @param source the value for cit_distribution.source
+     *
+     * @mbg.generated
+     */
+    public void setSource(String source) {
+        this.source = source == null ? null : source.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.period
+     *
+     * @return the value of cit_distribution.period
+     *
+     * @mbg.generated
+     */
+    public Integer getPeriod() {
+        return period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.period
+     *
+     * @param period the value for cit_distribution.period
+     *
+     * @mbg.generated
+     */
+    public void setPeriod(Integer period) {
+        this.period = period;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.quarter
+     *
+     * @return the value of cit_distribution.quarter
+     *
+     * @mbg.generated
+     */
+    public Integer getQuarter() {
+        return quarter;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.quarter
+     *
+     * @param quarter the value for cit_distribution.quarter
+     *
+     * @mbg.generated
+     */
+    public void setQuarter(Integer quarter) {
+        this.quarter = quarter;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.tax_payer_number
+     *
+     * @return the value of cit_distribution.tax_payer_number
+     *
+     * @mbg.generated
+     */
+    public String getTaxPayerNumber() {
+        return taxPayerNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.tax_payer_number
+     *
+     * @param taxPayerNumber the value for cit_distribution.tax_payer_number
+     *
+     * @mbg.generated
+     */
+    public void setTaxPayerNumber(String taxPayerNumber) {
+        this.taxPayerNumber = taxPayerNumber == null ? null : taxPayerNumber.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.org_name
+     *
+     * @return the value of cit_distribution.org_name
+     *
+     * @mbg.generated
+     */
+    public String getOrgName() {
+        return orgName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.org_name
+     *
+     * @param orgName the value for cit_distribution.org_name
+     *
+     * @mbg.generated
+     */
+    public void setOrgName(String orgName) {
+        this.orgName = orgName == null ? null : orgName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.business_income
+     *
+     * @return the value of cit_distribution.business_income
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getBusinessIncome() {
+        return businessIncome;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.business_income
+     *
+     * @param businessIncome the value for cit_distribution.business_income
+     *
+     * @mbg.generated
+     */
+    public void setBusinessIncome(BigDecimal businessIncome) {
+        this.businessIncome = businessIncome;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.employee_remuneration
+     *
+     * @return the value of cit_distribution.employee_remuneration
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getEmployeeRemuneration() {
+        return employeeRemuneration;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.employee_remuneration
+     *
+     * @param employeeRemuneration the value for cit_distribution.employee_remuneration
+     *
+     * @mbg.generated
+     */
+    public void setEmployeeRemuneration(BigDecimal employeeRemuneration) {
+        this.employeeRemuneration = employeeRemuneration;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.total_assets
+     *
+     * @return the value of cit_distribution.total_assets
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getTotalAssets() {
+        return totalAssets;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.total_assets
+     *
+     * @param totalAssets the value for cit_distribution.total_assets
+     *
+     * @mbg.generated
+     */
+    public void setTotalAssets(BigDecimal totalAssets) {
+        this.totalAssets = totalAssets;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.distribution_ratio
+     *
+     * @return the value of cit_distribution.distribution_ratio
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDistributionRatio() {
+        return distributionRatio;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.distribution_ratio
+     *
+     * @param distributionRatio the value for cit_distribution.distribution_ratio
+     *
+     * @mbg.generated
+     */
+    public void setDistributionRatio(BigDecimal distributionRatio) {
+        this.distributionRatio = distributionRatio;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.distribution_ratio_formula
+     *
+     * @return the value of cit_distribution.distribution_ratio_formula
+     *
+     * @mbg.generated
+     */
+    public String getDistributionRatioFormula() {
+        return distributionRatioFormula;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.distribution_ratio_formula
+     *
+     * @param distributionRatioFormula the value for cit_distribution.distribution_ratio_formula
+     *
+     * @mbg.generated
+     */
+    public void setDistributionRatioFormula(String distributionRatioFormula) {
+        this.distributionRatioFormula = distributionRatioFormula == null ? null : distributionRatioFormula.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.distribution_amount
+     *
+     * @return the value of cit_distribution.distribution_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDistributionAmount() {
+        return distributionAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.distribution_amount
+     *
+     * @param distributionAmount the value for cit_distribution.distribution_amount
+     *
+     * @mbg.generated
+     */
+    public void setDistributionAmount(BigDecimal distributionAmount) {
+        this.distributionAmount = distributionAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.distribution_amount_formula
+     *
+     * @return the value of cit_distribution.distribution_amount_formula
+     *
+     * @mbg.generated
+     */
+    public String getDistributionAmountFormula() {
+        return distributionAmountFormula;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.distribution_amount_formula
+     *
+     * @param distributionAmountFormula the value for cit_distribution.distribution_amount_formula
+     *
+     * @mbg.generated
+     */
+    public void setDistributionAmountFormula(String distributionAmountFormula) {
+        this.distributionAmountFormula = distributionAmountFormula == null ? null : distributionAmountFormula.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.create_by
+     *
+     * @return the value of cit_distribution.create_by
+     *
+     * @mbg.generated
+     */
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_distribution.create_by
+     *
+     * @param createBy the value for cit_distribution.create_by
+     *
+     * @mbg.generated
+     */
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy == null ? null : createBy.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_distribution.create_time
+     *
+     * @return the value of cit_distribution.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 cit_distribution.create_time
+     *
+     * @param createTime the value for cit_distribution.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 cit_distribution.update_time
+     *
+     * @return the value of cit_distribution.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 cit_distribution.update_time
+     *
+     * @param updateTime the value for cit_distribution.update_time
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @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(", organizationId=").append(organizationId);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", date=").append(date);
+        sb.append(", source=").append(source);
+        sb.append(", period=").append(period);
+        sb.append(", quarter=").append(quarter);
+        sb.append(", taxPayerNumber=").append(taxPayerNumber);
+        sb.append(", orgName=").append(orgName);
+        sb.append(", businessIncome=").append(businessIncome);
+        sb.append(", employeeRemuneration=").append(employeeRemuneration);
+        sb.append(", totalAssets=").append(totalAssets);
+        sb.append(", distributionRatio=").append(distributionRatio);
+        sb.append(", distributionRatioFormula=").append(distributionRatioFormula);
+        sb.append(", distributionAmount=").append(distributionAmount);
+        sb.append(", distributionAmountFormula=").append(distributionAmountFormula);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

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

+package pwc.taxtech.atms.entity;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CitDistributionExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    public CitDistributionExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cit_distribution
+     *
+     * @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 cit_distribution
+     *
+     * @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 cit_distribution
+     *
+     * @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 cit_distribution
+     *
+     * @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 cit_distribution
+     *
+     * @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 andOrganizationIdIsNull() {
+            addCriterion("organization_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIsNotNull() {
+            addCriterion("organization_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdEqualTo(String value) {
+            addCriterion("organization_id =", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotEqualTo(String value) {
+            addCriterion("organization_id <>", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThan(String value) {
+            addCriterion("organization_id >", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
+            addCriterion("organization_id >=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThan(String value) {
+            addCriterion("organization_id <", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
+            addCriterion("organization_id <=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLike(String value) {
+            addCriterion("organization_id like", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotLike(String value) {
+            addCriterion("organization_id not like", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIn(List<String> values) {
+            addCriterion("organization_id in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotIn(List<String> values) {
+            addCriterion("organization_id not in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdBetween(String value1, String value2) {
+            addCriterion("organization_id between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotBetween(String value1, String value2) {
+            addCriterion("organization_id not between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNull() {
+            addCriterion("project_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIsNotNull() {
+            addCriterion("project_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdEqualTo(String value) {
+            addCriterion("project_id =", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotEqualTo(String value) {
+            addCriterion("project_id <>", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThan(String value) {
+            addCriterion("project_id >", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
+            addCriterion("project_id >=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThan(String value) {
+            addCriterion("project_id <", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLessThanOrEqualTo(String value) {
+            addCriterion("project_id <=", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdLike(String value) {
+            addCriterion("project_id like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotLike(String value) {
+            addCriterion("project_id not like", value, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdIn(List<String> values) {
+            addCriterion("project_id in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotIn(List<String> values) {
+            addCriterion("project_id not in", values, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdBetween(String value1, String value2) {
+            addCriterion("project_id between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProjectIdNotBetween(String value1, String value2) {
+            addCriterion("project_id not between", value1, value2, "projectId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateIsNull() {
+            addCriterion("date is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateIsNotNull() {
+            addCriterion("date is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateEqualTo(Date value) {
+            addCriterion("date =", value, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateNotEqualTo(Date value) {
+            addCriterion("date <>", value, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateGreaterThan(Date value) {
+            addCriterion("date >", value, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateGreaterThanOrEqualTo(Date value) {
+            addCriterion("date >=", value, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateLessThan(Date value) {
+            addCriterion("date <", value, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateLessThanOrEqualTo(Date value) {
+            addCriterion("date <=", value, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateIn(List<Date> values) {
+            addCriterion("date in", values, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateNotIn(List<Date> values) {
+            addCriterion("date not in", values, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateBetween(Date value1, Date value2) {
+            addCriterion("date between", value1, value2, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andDateNotBetween(Date value1, Date value2) {
+            addCriterion("date not between", value1, value2, "date");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIsNull() {
+            addCriterion("source is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIsNotNull() {
+            addCriterion("source is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceEqualTo(String value) {
+            addCriterion("source =", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotEqualTo(String value) {
+            addCriterion("source <>", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceGreaterThan(String value) {
+            addCriterion("source >", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceGreaterThanOrEqualTo(String value) {
+            addCriterion("source >=", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLessThan(String value) {
+            addCriterion("source <", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLessThanOrEqualTo(String value) {
+            addCriterion("source <=", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLike(String value) {
+            addCriterion("source like", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotLike(String value) {
+            addCriterion("source not like", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIn(List<String> values) {
+            addCriterion("source in", values, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotIn(List<String> values) {
+            addCriterion("source not in", values, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceBetween(String value1, String value2) {
+            addCriterion("source between", value1, value2, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotBetween(String value1, String value2) {
+            addCriterion("source not between", value1, value2, "source");
+            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;
+        }
+
+        public Criteria andQuarterIsNull() {
+            addCriterion("quarter is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterIsNotNull() {
+            addCriterion("quarter is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterEqualTo(Integer value) {
+            addCriterion("quarter =", value, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterNotEqualTo(Integer value) {
+            addCriterion("quarter <>", value, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterGreaterThan(Integer value) {
+            addCriterion("quarter >", value, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterGreaterThanOrEqualTo(Integer value) {
+            addCriterion("quarter >=", value, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterLessThan(Integer value) {
+            addCriterion("quarter <", value, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterLessThanOrEqualTo(Integer value) {
+            addCriterion("quarter <=", value, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterIn(List<Integer> values) {
+            addCriterion("quarter in", values, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterNotIn(List<Integer> values) {
+            addCriterion("quarter not in", values, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterBetween(Integer value1, Integer value2) {
+            addCriterion("quarter between", value1, value2, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andQuarterNotBetween(Integer value1, Integer value2) {
+            addCriterion("quarter not between", value1, value2, "quarter");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberIsNull() {
+            addCriterion("tax_payer_number is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberIsNotNull() {
+            addCriterion("tax_payer_number is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberEqualTo(String value) {
+            addCriterion("tax_payer_number =", value, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberNotEqualTo(String value) {
+            addCriterion("tax_payer_number <>", value, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberGreaterThan(String value) {
+            addCriterion("tax_payer_number >", value, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("tax_payer_number >=", value, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberLessThan(String value) {
+            addCriterion("tax_payer_number <", value, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberLessThanOrEqualTo(String value) {
+            addCriterion("tax_payer_number <=", value, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberLike(String value) {
+            addCriterion("tax_payer_number like", value, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberNotLike(String value) {
+            addCriterion("tax_payer_number not like", value, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberIn(List<String> values) {
+            addCriterion("tax_payer_number in", values, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberNotIn(List<String> values) {
+            addCriterion("tax_payer_number not in", values, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberBetween(String value1, String value2) {
+            addCriterion("tax_payer_number between", value1, value2, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTaxPayerNumberNotBetween(String value1, String value2) {
+            addCriterion("tax_payer_number not between", value1, value2, "taxPayerNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameIsNull() {
+            addCriterion("org_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameIsNotNull() {
+            addCriterion("org_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameEqualTo(String value) {
+            addCriterion("org_name =", value, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameNotEqualTo(String value) {
+            addCriterion("org_name <>", value, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameGreaterThan(String value) {
+            addCriterion("org_name >", value, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameGreaterThanOrEqualTo(String value) {
+            addCriterion("org_name >=", value, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameLessThan(String value) {
+            addCriterion("org_name <", value, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameLessThanOrEqualTo(String value) {
+            addCriterion("org_name <=", value, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameLike(String value) {
+            addCriterion("org_name like", value, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameNotLike(String value) {
+            addCriterion("org_name not like", value, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameIn(List<String> values) {
+            addCriterion("org_name in", values, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameNotIn(List<String> values) {
+            addCriterion("org_name not in", values, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameBetween(String value1, String value2) {
+            addCriterion("org_name between", value1, value2, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrgNameNotBetween(String value1, String value2) {
+            addCriterion("org_name not between", value1, value2, "orgName");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeIsNull() {
+            addCriterion("business_income is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeIsNotNull() {
+            addCriterion("business_income is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeEqualTo(BigDecimal value) {
+            addCriterion("business_income =", value, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeNotEqualTo(BigDecimal value) {
+            addCriterion("business_income <>", value, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeGreaterThan(BigDecimal value) {
+            addCriterion("business_income >", value, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("business_income >=", value, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeLessThan(BigDecimal value) {
+            addCriterion("business_income <", value, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("business_income <=", value, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeIn(List<BigDecimal> values) {
+            addCriterion("business_income in", values, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeNotIn(List<BigDecimal> values) {
+            addCriterion("business_income not in", values, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("business_income between", value1, value2, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessIncomeNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("business_income not between", value1, value2, "businessIncome");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationIsNull() {
+            addCriterion("employee_remuneration is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationIsNotNull() {
+            addCriterion("employee_remuneration is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationEqualTo(BigDecimal value) {
+            addCriterion("employee_remuneration =", value, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationNotEqualTo(BigDecimal value) {
+            addCriterion("employee_remuneration <>", value, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationGreaterThan(BigDecimal value) {
+            addCriterion("employee_remuneration >", value, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("employee_remuneration >=", value, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationLessThan(BigDecimal value) {
+            addCriterion("employee_remuneration <", value, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("employee_remuneration <=", value, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationIn(List<BigDecimal> values) {
+            addCriterion("employee_remuneration in", values, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationNotIn(List<BigDecimal> values) {
+            addCriterion("employee_remuneration not in", values, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("employee_remuneration between", value1, value2, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmployeeRemunerationNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("employee_remuneration not between", value1, value2, "employeeRemuneration");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsIsNull() {
+            addCriterion("total_assets is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsIsNotNull() {
+            addCriterion("total_assets is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsEqualTo(BigDecimal value) {
+            addCriterion("total_assets =", value, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsNotEqualTo(BigDecimal value) {
+            addCriterion("total_assets <>", value, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsGreaterThan(BigDecimal value) {
+            addCriterion("total_assets >", value, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("total_assets >=", value, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsLessThan(BigDecimal value) {
+            addCriterion("total_assets <", value, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("total_assets <=", value, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsIn(List<BigDecimal> values) {
+            addCriterion("total_assets in", values, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsNotIn(List<BigDecimal> values) {
+            addCriterion("total_assets not in", values, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("total_assets between", value1, value2, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotalAssetsNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("total_assets not between", value1, value2, "totalAssets");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioIsNull() {
+            addCriterion("distribution_ratio is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioIsNotNull() {
+            addCriterion("distribution_ratio is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioEqualTo(BigDecimal value) {
+            addCriterion("distribution_ratio =", value, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioNotEqualTo(BigDecimal value) {
+            addCriterion("distribution_ratio <>", value, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioGreaterThan(BigDecimal value) {
+            addCriterion("distribution_ratio >", value, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("distribution_ratio >=", value, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioLessThan(BigDecimal value) {
+            addCriterion("distribution_ratio <", value, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("distribution_ratio <=", value, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioIn(List<BigDecimal> values) {
+            addCriterion("distribution_ratio in", values, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioNotIn(List<BigDecimal> values) {
+            addCriterion("distribution_ratio not in", values, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("distribution_ratio between", value1, value2, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("distribution_ratio not between", value1, value2, "distributionRatio");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaIsNull() {
+            addCriterion("distribution_ratio_formula is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaIsNotNull() {
+            addCriterion("distribution_ratio_formula is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaEqualTo(String value) {
+            addCriterion("distribution_ratio_formula =", value, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaNotEqualTo(String value) {
+            addCriterion("distribution_ratio_formula <>", value, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaGreaterThan(String value) {
+            addCriterion("distribution_ratio_formula >", value, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaGreaterThanOrEqualTo(String value) {
+            addCriterion("distribution_ratio_formula >=", value, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaLessThan(String value) {
+            addCriterion("distribution_ratio_formula <", value, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaLessThanOrEqualTo(String value) {
+            addCriterion("distribution_ratio_formula <=", value, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaLike(String value) {
+            addCriterion("distribution_ratio_formula like", value, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaNotLike(String value) {
+            addCriterion("distribution_ratio_formula not like", value, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaIn(List<String> values) {
+            addCriterion("distribution_ratio_formula in", values, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaNotIn(List<String> values) {
+            addCriterion("distribution_ratio_formula not in", values, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaBetween(String value1, String value2) {
+            addCriterion("distribution_ratio_formula between", value1, value2, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionRatioFormulaNotBetween(String value1, String value2) {
+            addCriterion("distribution_ratio_formula not between", value1, value2, "distributionRatioFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountIsNull() {
+            addCriterion("distribution_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountIsNotNull() {
+            addCriterion("distribution_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountEqualTo(BigDecimal value) {
+            addCriterion("distribution_amount =", value, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountNotEqualTo(BigDecimal value) {
+            addCriterion("distribution_amount <>", value, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountGreaterThan(BigDecimal value) {
+            addCriterion("distribution_amount >", value, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("distribution_amount >=", value, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountLessThan(BigDecimal value) {
+            addCriterion("distribution_amount <", value, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("distribution_amount <=", value, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountIn(List<BigDecimal> values) {
+            addCriterion("distribution_amount in", values, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountNotIn(List<BigDecimal> values) {
+            addCriterion("distribution_amount not in", values, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("distribution_amount between", value1, value2, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("distribution_amount not between", value1, value2, "distributionAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaIsNull() {
+            addCriterion("distribution_amount_formula is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaIsNotNull() {
+            addCriterion("distribution_amount_formula is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaEqualTo(String value) {
+            addCriterion("distribution_amount_formula =", value, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaNotEqualTo(String value) {
+            addCriterion("distribution_amount_formula <>", value, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaGreaterThan(String value) {
+            addCriterion("distribution_amount_formula >", value, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaGreaterThanOrEqualTo(String value) {
+            addCriterion("distribution_amount_formula >=", value, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaLessThan(String value) {
+            addCriterion("distribution_amount_formula <", value, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaLessThanOrEqualTo(String value) {
+            addCriterion("distribution_amount_formula <=", value, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaLike(String value) {
+            addCriterion("distribution_amount_formula like", value, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaNotLike(String value) {
+            addCriterion("distribution_amount_formula not like", value, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaIn(List<String> values) {
+            addCriterion("distribution_amount_formula in", values, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaNotIn(List<String> values) {
+            addCriterion("distribution_amount_formula not in", values, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaBetween(String value1, String value2) {
+            addCriterion("distribution_amount_formula between", value1, value2, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andDistributionAmountFormulaNotBetween(String value1, String value2) {
+            addCriterion("distribution_amount_formula not between", value1, value2, "distributionAmountFormula");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            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;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cit_distribution
+     *
+     * @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 cit_distribution
+     *
+     * @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/resources/pwc/taxtech/atms/dao/CitDistributionMapper.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.CitDistributionMapper">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.entity.CitDistribution">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
+    <result column="project_id" jdbcType="VARCHAR" property="projectId" />
+    <result column="date" jdbcType="TIMESTAMP" property="date" />
+    <result column="source" jdbcType="VARCHAR" property="source" />
+    <result column="period" jdbcType="INTEGER" property="period" />
+    <result column="quarter" jdbcType="INTEGER" property="quarter" />
+    <result column="tax_payer_number" jdbcType="VARCHAR" property="taxPayerNumber" />
+    <result column="org_name" jdbcType="VARCHAR" property="orgName" />
+    <result column="business_income" jdbcType="DECIMAL" property="businessIncome" />
+    <result column="employee_remuneration" jdbcType="DECIMAL" property="employeeRemuneration" />
+    <result column="total_assets" jdbcType="DECIMAL" property="totalAssets" />
+    <result column="distribution_ratio" jdbcType="DECIMAL" property="distributionRatio" />
+    <result column="distribution_ratio_formula" jdbcType="VARCHAR" property="distributionRatioFormula" />
+    <result column="distribution_amount" jdbcType="DECIMAL" property="distributionAmount" />
+    <result column="distribution_amount_formula" jdbcType="VARCHAR" property="distributionAmountFormula" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+  </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, organization_id, project_id, date, source, period, quarter, tax_payer_number, 
+    org_name, business_income, employee_remuneration, total_assets, distribution_ratio, 
+    distribution_ratio_formula, distribution_amount, distribution_amount_formula, create_by, 
+    create_time, update_time
+  </sql>
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitDistributionExample" 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 cit_distribution
+    <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 cit_distribution
+    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 cit_distribution
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.CitDistributionExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from cit_distribution
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="pwc.taxtech.atms.entity.CitDistribution">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into cit_distribution (id, organization_id, project_id, 
+      date, source, period, 
+      quarter, tax_payer_number, org_name, 
+      business_income, employee_remuneration, total_assets, 
+      distribution_ratio, distribution_ratio_formula, 
+      distribution_amount, distribution_amount_formula, 
+      create_by, create_time, update_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
+      #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, 
+      #{quarter,jdbcType=INTEGER}, #{taxPayerNumber,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, 
+      #{businessIncome,jdbcType=DECIMAL}, #{employeeRemuneration,jdbcType=DECIMAL}, #{totalAssets,jdbcType=DECIMAL}, 
+      #{distributionRatio,jdbcType=DECIMAL}, #{distributionRatioFormula,jdbcType=VARCHAR}, 
+      #{distributionAmount,jdbcType=DECIMAL}, #{distributionAmountFormula,jdbcType=VARCHAR}, 
+      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitDistribution">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into cit_distribution
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="organizationId != null">
+        organization_id,
+      </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="date != null">
+        date,
+      </if>
+      <if test="source != null">
+        source,
+      </if>
+      <if test="period != null">
+        period,
+      </if>
+      <if test="quarter != null">
+        quarter,
+      </if>
+      <if test="taxPayerNumber != null">
+        tax_payer_number,
+      </if>
+      <if test="orgName != null">
+        org_name,
+      </if>
+      <if test="businessIncome != null">
+        business_income,
+      </if>
+      <if test="employeeRemuneration != null">
+        employee_remuneration,
+      </if>
+      <if test="totalAssets != null">
+        total_assets,
+      </if>
+      <if test="distributionRatio != null">
+        distribution_ratio,
+      </if>
+      <if test="distributionRatioFormula != null">
+        distribution_ratio_formula,
+      </if>
+      <if test="distributionAmount != null">
+        distribution_amount,
+      </if>
+      <if test="distributionAmountFormula != null">
+        distribution_amount_formula,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="updateTime != null">
+        update_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="organizationId != null">
+        #{organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="date != null">
+        #{date,jdbcType=TIMESTAMP},
+      </if>
+      <if test="source != null">
+        #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        #{period,jdbcType=INTEGER},
+      </if>
+      <if test="quarter != null">
+        #{quarter,jdbcType=INTEGER},
+      </if>
+      <if test="taxPayerNumber != null">
+        #{taxPayerNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="orgName != null">
+        #{orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="businessIncome != null">
+        #{businessIncome,jdbcType=DECIMAL},
+      </if>
+      <if test="employeeRemuneration != null">
+        #{employeeRemuneration,jdbcType=DECIMAL},
+      </if>
+      <if test="totalAssets != null">
+        #{totalAssets,jdbcType=DECIMAL},
+      </if>
+      <if test="distributionRatio != null">
+        #{distributionRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="distributionRatioFormula != null">
+        #{distributionRatioFormula,jdbcType=VARCHAR},
+      </if>
+      <if test="distributionAmount != null">
+        #{distributionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="distributionAmountFormula != null">
+        #{distributionAmountFormula,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="pwc.taxtech.atms.entity.CitDistributionExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from cit_distribution
+    <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 cit_distribution
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.organizationId != null">
+        organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.date != null">
+        date = #{record.date,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.source != null">
+        source = #{record.source,jdbcType=VARCHAR},
+      </if>
+      <if test="record.period != null">
+        period = #{record.period,jdbcType=INTEGER},
+      </if>
+      <if test="record.quarter != null">
+        quarter = #{record.quarter,jdbcType=INTEGER},
+      </if>
+      <if test="record.taxPayerNumber != null">
+        tax_payer_number = #{record.taxPayerNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgName != null">
+        org_name = #{record.orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessIncome != null">
+        business_income = #{record.businessIncome,jdbcType=DECIMAL},
+      </if>
+      <if test="record.employeeRemuneration != null">
+        employee_remuneration = #{record.employeeRemuneration,jdbcType=DECIMAL},
+      </if>
+      <if test="record.totalAssets != null">
+        total_assets = #{record.totalAssets,jdbcType=DECIMAL},
+      </if>
+      <if test="record.distributionRatio != null">
+        distribution_ratio = #{record.distributionRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="record.distributionRatioFormula != null">
+        distribution_ratio_formula = #{record.distributionRatioFormula,jdbcType=VARCHAR},
+      </if>
+      <if test="record.distributionAmount != null">
+        distribution_amount = #{record.distributionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.distributionAmountFormula != null">
+        distribution_amount_formula = #{record.distributionAmountFormula,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,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>
+    </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 cit_distribution
+    set id = #{record.id,jdbcType=BIGINT},
+      organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      project_id = #{record.projectId,jdbcType=VARCHAR},
+      date = #{record.date,jdbcType=TIMESTAMP},
+      source = #{record.source,jdbcType=VARCHAR},
+      period = #{record.period,jdbcType=INTEGER},
+      quarter = #{record.quarter,jdbcType=INTEGER},
+      tax_payer_number = #{record.taxPayerNumber,jdbcType=VARCHAR},
+      org_name = #{record.orgName,jdbcType=VARCHAR},
+      business_income = #{record.businessIncome,jdbcType=DECIMAL},
+      employee_remuneration = #{record.employeeRemuneration,jdbcType=DECIMAL},
+      total_assets = #{record.totalAssets,jdbcType=DECIMAL},
+      distribution_ratio = #{record.distributionRatio,jdbcType=DECIMAL},
+      distribution_ratio_formula = #{record.distributionRatioFormula,jdbcType=VARCHAR},
+      distribution_amount = #{record.distributionAmount,jdbcType=DECIMAL},
+      distribution_amount_formula = #{record.distributionAmountFormula,jdbcType=VARCHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      update_time = #{record.updateTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.entity.CitDistribution">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update cit_distribution
+    <set>
+      <if test="organizationId != null">
+        organization_id = #{organizationId,jdbcType=VARCHAR},
+      </if>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=VARCHAR},
+      </if>
+      <if test="date != null">
+        date = #{date,jdbcType=TIMESTAMP},
+      </if>
+      <if test="source != null">
+        source = #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="period != null">
+        period = #{period,jdbcType=INTEGER},
+      </if>
+      <if test="quarter != null">
+        quarter = #{quarter,jdbcType=INTEGER},
+      </if>
+      <if test="taxPayerNumber != null">
+        tax_payer_number = #{taxPayerNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="orgName != null">
+        org_name = #{orgName,jdbcType=VARCHAR},
+      </if>
+      <if test="businessIncome != null">
+        business_income = #{businessIncome,jdbcType=DECIMAL},
+      </if>
+      <if test="employeeRemuneration != null">
+        employee_remuneration = #{employeeRemuneration,jdbcType=DECIMAL},
+      </if>
+      <if test="totalAssets != null">
+        total_assets = #{totalAssets,jdbcType=DECIMAL},
+      </if>
+      <if test="distributionRatio != null">
+        distribution_ratio = #{distributionRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="distributionRatioFormula != null">
+        distribution_ratio_formula = #{distributionRatioFormula,jdbcType=VARCHAR},
+      </if>
+      <if test="distributionAmount != null">
+        distribution_amount = #{distributionAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="distributionAmountFormula != null">
+        distribution_amount_formula = #{distributionAmountFormula,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        create_by = #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateTime != null">
+        update_time = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.entity.CitDistribution">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update cit_distribution
+    set organization_id = #{organizationId,jdbcType=VARCHAR},
+      project_id = #{projectId,jdbcType=VARCHAR},
+      date = #{date,jdbcType=TIMESTAMP},
+      source = #{source,jdbcType=VARCHAR},
+      period = #{period,jdbcType=INTEGER},
+      quarter = #{quarter,jdbcType=INTEGER},
+      tax_payer_number = #{taxPayerNumber,jdbcType=VARCHAR},
+      org_name = #{orgName,jdbcType=VARCHAR},
+      business_income = #{businessIncome,jdbcType=DECIMAL},
+      employee_remuneration = #{employeeRemuneration,jdbcType=DECIMAL},
+      total_assets = #{totalAssets,jdbcType=DECIMAL},
+      distribution_ratio = #{distributionRatio,jdbcType=DECIMAL},
+      distribution_ratio_formula = #{distributionRatioFormula,jdbcType=VARCHAR},
+      distribution_amount = #{distributionAmount,jdbcType=DECIMAL},
+      distribution_amount_formula = #{distributionAmountFormula,jdbcType=VARCHAR},
+      create_by = #{createBy,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      update_time = #{updateTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.CitDistributionExample" 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 cit_distribution
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+</mapper>
\ No newline at end of file

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.html

@@ -2,10 +2,10 @@
     <div class="nav-wrapper">
         <div class="nav-header">{{'AssetList' | translate}}</div>
         <div class="nav-tab">
-            <span ng-click="switchTab($event,1)">{{'AssetListImport' | translate}}</span>&nbsp;&nbsp;
-            <span class="active" ng-click="switchTab($event,2)">{{'FixedAssets' | translate}}</span><span
-                ng-click="switchTab($event,3)">{{'LongTermPrepaid' | translate}}</span><span
-                ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,1)">{{'AssetListImport' | translate}}</span>&nbsp;&nbsp;
+            <span style="width: auto" class="active" ng-click="switchTab($event,2)">{{'FixedAssets' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,3)">{{'LongTermPrepaid' | translate}}</span>
+            <span style="width: auto" ng-click="switchTab($event,4)">{{'InvisibleAssets' | translate}}</span>
             <!--税会差异的选择-->
             <!--<div class="option" style="display: inline-block">-->
                 <!--<span>{{'TaxAccountDifference' | translate}}</span>-->
@@ -138,7 +138,7 @@
                             atms-popover ng-mouseenter="prepareSummary()"
                             popover-container="body" popover-auto-hide="true" data-overwrite="true"
                             use-optimized-placement-algorithm="true"
-                            data-placement="left"
+                            data-placement="bottom"
                             data-templateurl="/app/cit/import/cit-import-asset-list/cit-import-asset-list-search.html">
                         <i class="fa fa-filter" aria-hidden="true"></i>
                     </button>

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.less

@@ -415,7 +415,7 @@
     min-width: 370px;
 
     .arrow {
-        left: 5% !important;
+        left: 0px;
     }
 }
 
@@ -423,9 +423,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.html

@@ -9,7 +9,7 @@
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
         <span translate="TrialBalanceGeneVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
-        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>：
+        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
         <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none;" id="input-invoice-period-picker" />
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-generate-ver/cit-preview-tb-generate-ver.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }
 

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.html

@@ -9,7 +9,7 @@
             <i class="fa fa-filter" aria-hidden="true"></i>
         </button>
         <span translate="TrialBalanceMappingVer" class="text-bold"></span> &nbsp;&nbsp;|&nbsp;&nbsp;
-        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>：
+        <span class="text-bold" translate="InvoiceQJ" style="display: none"></span>
         <input type="text" class="form-control input-width-middle periodInput" style="position: relative; top: -30px; left: 180px;display: none" id="input-invoice-period-picker" />
         <span ng-click="downloadJE()" style="position: relative; top: -61px; left: 95%;"><i class="fa fa-file-excel-o" aria-hidden="true"></i>{{'ExportBtn' | translate}}</span>
     </div>

atms-web/src/main/webapp/app/cit/preview/cit-preview-tb-mapping-ver/cit-preview-tb-mapping-ver.less

@@ -138,9 +138,11 @@
     td {
         text-align: right;
         padding: 6px;
+        vertical-align: middle;
 
         span {
-            float: left;
+            text-align: right;
+            float: right;
         }
     }