#

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

@@ -41,11 +41,10 @@
             <property name="rootInterface" value="pwc.taxtech.atms.MyAnalysisMapper" />
         </javaClientGenerator>
 
-        <table tableName="analysis_tax_return_end" domainObjectName="AnalysisTaxReturnEnd">
+        <table tableName="analysis_expected_tax_return" domainObjectName="AnalysisExpectedTaxReturn">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>
-
         <!--
         <table tableName="analysis_actual_tax_return" domainObjectName="AnalysisInternationalTaxData">
             <property name="useActualColumnNames" value="false"/>

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

@@ -37,7 +37,7 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
 
     /**
      * Database Column Remarks:
-     *   预期返还后增值税 预期返还后增值税_ 管理模块 应返还税金自动根据系统管理模块设置的增值税返还率计算。 5685.63
+     *   预期返还后税额 管理模块 应返还税金自动根据系统管理模块设置的增值税返还率计算。 5685.63
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column analysis_expected_tax_return.segment_1
@@ -68,6 +68,39 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
      */
     private BigDecimal segment3;
 
+    /**
+     * Database Column Remarks:
+     *   预期返还后教育费附加
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_expected_tax_return.segment_4
+     *
+     * @mbg.generated
+     */
+    private BigDecimal segment4;
+
+    /**
+     * Database Column Remarks:
+     *   预期返还后城市教育费附加
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_expected_tax_return.segment_5
+     *
+     * @mbg.generated
+     */
+    private BigDecimal segment5;
+
+    /**
+     * Database Column Remarks:
+     *   预期返还后城建税
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column analysis_expected_tax_return.segment_6
+     *
+     * @mbg.generated
+     */
+    private BigDecimal segment6;
+
     /**
      * Database Column Remarks:
      *   创建时间 
@@ -251,6 +284,78 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
         this.segment3 = segment3;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_expected_tax_return.segment_4
+     *
+     * @return the value of analysis_expected_tax_return.segment_4
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getSegment4() {
+        return segment4;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_expected_tax_return.segment_4
+     *
+     * @param segment4 the value for analysis_expected_tax_return.segment_4
+     *
+     * @mbg.generated
+     */
+    public void setSegment4(BigDecimal segment4) {
+        this.segment4 = segment4;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_expected_tax_return.segment_5
+     *
+     * @return the value of analysis_expected_tax_return.segment_5
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getSegment5() {
+        return segment5;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_expected_tax_return.segment_5
+     *
+     * @param segment5 the value for analysis_expected_tax_return.segment_5
+     *
+     * @mbg.generated
+     */
+    public void setSegment5(BigDecimal segment5) {
+        this.segment5 = segment5;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column analysis_expected_tax_return.segment_6
+     *
+     * @return the value of analysis_expected_tax_return.segment_6
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getSegment6() {
+        return segment6;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column analysis_expected_tax_return.segment_6
+     *
+     * @param segment6 the value for analysis_expected_tax_return.segment_6
+     *
+     * @mbg.generated
+     */
+    public void setSegment6(BigDecimal segment6) {
+        this.segment6 = segment6;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column analysis_expected_tax_return.create_time
@@ -388,6 +493,9 @@ public class AnalysisExpectedTaxReturn extends BaseEntity implements Serializabl
         sb.append(", segment1=").append(segment1);
         sb.append(", segment2=").append(segment2);
         sb.append(", segment3=").append(segment3);
+        sb.append(", segment4=").append(segment4);
+        sb.append(", segment5=").append(segment5);
+        sb.append(", segment6=").append(segment6);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", organizationId=").append(organizationId);

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

@@ -506,6 +506,186 @@ public class AnalysisExpectedTaxReturnExample {
             return (Criteria) this;
         }
 
+        public Criteria andSegment4IsNull() {
+            addCriterion("segment_4 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4IsNotNull() {
+            addCriterion("segment_4 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4EqualTo(BigDecimal value) {
+            addCriterion("segment_4 =", value, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4NotEqualTo(BigDecimal value) {
+            addCriterion("segment_4 <>", value, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4GreaterThan(BigDecimal value) {
+            addCriterion("segment_4 >", value, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("segment_4 >=", value, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4LessThan(BigDecimal value) {
+            addCriterion("segment_4 <", value, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("segment_4 <=", value, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4In(List<BigDecimal> values) {
+            addCriterion("segment_4 in", values, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4NotIn(List<BigDecimal> values) {
+            addCriterion("segment_4 not in", values, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("segment_4 between", value1, value2, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment4NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("segment_4 not between", value1, value2, "segment4");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5IsNull() {
+            addCriterion("segment_5 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5IsNotNull() {
+            addCriterion("segment_5 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5EqualTo(BigDecimal value) {
+            addCriterion("segment_5 =", value, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5NotEqualTo(BigDecimal value) {
+            addCriterion("segment_5 <>", value, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5GreaterThan(BigDecimal value) {
+            addCriterion("segment_5 >", value, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("segment_5 >=", value, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5LessThan(BigDecimal value) {
+            addCriterion("segment_5 <", value, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("segment_5 <=", value, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5In(List<BigDecimal> values) {
+            addCriterion("segment_5 in", values, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5NotIn(List<BigDecimal> values) {
+            addCriterion("segment_5 not in", values, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("segment_5 between", value1, value2, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment5NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("segment_5 not between", value1, value2, "segment5");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6IsNull() {
+            addCriterion("segment_6 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6IsNotNull() {
+            addCriterion("segment_6 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6EqualTo(BigDecimal value) {
+            addCriterion("segment_6 =", value, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6NotEqualTo(BigDecimal value) {
+            addCriterion("segment_6 <>", value, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6GreaterThan(BigDecimal value) {
+            addCriterion("segment_6 >", value, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6GreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("segment_6 >=", value, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6LessThan(BigDecimal value) {
+            addCriterion("segment_6 <", value, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6LessThanOrEqualTo(BigDecimal value) {
+            addCriterion("segment_6 <=", value, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6In(List<BigDecimal> values) {
+            addCriterion("segment_6 in", values, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6NotIn(List<BigDecimal> values) {
+            addCriterion("segment_6 not in", values, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6Between(BigDecimal value1, BigDecimal value2) {
+            addCriterion("segment_6 between", value1, value2, "segment6");
+            return (Criteria) this;
+        }
+
+        public Criteria andSegment6NotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("segment_6 not between", value1, value2, "segment6");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

atms-dao/src/main/java/pwc/taxtech/atms/dao/AnalysisExpectedTaxReturnMapper.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.AnalysisExpectedTaxReturn;
-import pwc.taxtech.atms.entity.AnalysisExpectedTaxReturnExample;
-
-@Mapper
-public interface AnalysisExpectedTaxReturnMapper extends MyMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    long countByExample(AnalysisExpectedTaxReturnExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    int deleteByExample(AnalysisExpectedTaxReturnExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    int insert(AnalysisExpectedTaxReturn record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    int insertSelective(AnalysisExpectedTaxReturn record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    List<AnalysisExpectedTaxReturn> selectByExampleWithRowbounds(AnalysisExpectedTaxReturnExample example, RowBounds rowBounds);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    List<AnalysisExpectedTaxReturn> selectByExample(AnalysisExpectedTaxReturnExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    AnalysisExpectedTaxReturn selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    int updateByExampleSelective(@Param("record") AnalysisExpectedTaxReturn record, @Param("example") AnalysisExpectedTaxReturnExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    int updateByExample(@Param("record") AnalysisExpectedTaxReturn record, @Param("example") AnalysisExpectedTaxReturnExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKeySelective(AnalysisExpectedTaxReturn record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table analysis_expected_tax_return
-     *
-     * @mbg.generated
-     */
-    int updateByPrimaryKey(AnalysisExpectedTaxReturn record);
-}
\ No newline at end of file

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

@@ -11,6 +11,9 @@
     <result column="segment_1" jdbcType="DECIMAL" property="segment1" />
     <result column="segment_2" jdbcType="DECIMAL" property="segment2" />
     <result column="segment_3" jdbcType="DECIMAL" property="segment3" />
+    <result column="segment_4" jdbcType="DECIMAL" property="segment4" />
+    <result column="segment_5" jdbcType="DECIMAL" property="segment5" />
+    <result column="segment_6" jdbcType="DECIMAL" property="segment6" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
@@ -88,8 +91,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, seq_no, segment_1, segment_2, segment_3, create_time, update_time, organization_id, 
-    company_name, period
+    id, seq_no, segment_1, segment_2, segment_3, segment_4, segment_5, segment_6, create_time, 
+    update_time, organization_id, company_name, period
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.analysis.entity.AnalysisExpectedTaxReturnExample" resultMap="BaseResultMap">
     <!--
@@ -143,11 +146,13 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into analysis_expected_tax_return (id, seq_no, segment_1, 
-      segment_2, segment_3, create_time, 
+      segment_2, segment_3, segment_4, 
+      segment_5, segment_6, create_time, 
       update_time, organization_id, company_name, 
       period)
     values (#{id,jdbcType=BIGINT}, #{seqNo,jdbcType=VARCHAR}, #{segment1,jdbcType=DECIMAL}, 
-      #{segment2,jdbcType=DECIMAL}, #{segment3,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{segment2,jdbcType=DECIMAL}, #{segment3,jdbcType=DECIMAL}, #{segment4,jdbcType=DECIMAL}, 
+      #{segment5,jdbcType=DECIMAL}, #{segment6,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{organizationId,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
       #{period,jdbcType=INTEGER})
   </insert>
@@ -173,6 +178,15 @@
       <if test="segment3 != null">
         segment_3,
       </if>
+      <if test="segment4 != null">
+        segment_4,
+      </if>
+      <if test="segment5 != null">
+        segment_5,
+      </if>
+      <if test="segment6 != null">
+        segment_6,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -205,6 +219,15 @@
       <if test="segment3 != null">
         #{segment3,jdbcType=DECIMAL},
       </if>
+      <if test="segment4 != null">
+        #{segment4,jdbcType=DECIMAL},
+      </if>
+      <if test="segment5 != null">
+        #{segment5,jdbcType=DECIMAL},
+      </if>
+      <if test="segment6 != null">
+        #{segment6,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -254,6 +277,15 @@
       <if test="record.segment3 != null">
         segment_3 = #{record.segment3,jdbcType=DECIMAL},
       </if>
+      <if test="record.segment4 != null">
+        segment_4 = #{record.segment4,jdbcType=DECIMAL},
+      </if>
+      <if test="record.segment5 != null">
+        segment_5 = #{record.segment5,jdbcType=DECIMAL},
+      </if>
+      <if test="record.segment6 != null">
+        segment_6 = #{record.segment6,jdbcType=DECIMAL},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -285,6 +317,9 @@
       segment_1 = #{record.segment1,jdbcType=DECIMAL},
       segment_2 = #{record.segment2,jdbcType=DECIMAL},
       segment_3 = #{record.segment3,jdbcType=DECIMAL},
+      segment_4 = #{record.segment4,jdbcType=DECIMAL},
+      segment_5 = #{record.segment5,jdbcType=DECIMAL},
+      segment_6 = #{record.segment6,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       organization_id = #{record.organizationId,jdbcType=VARCHAR},
@@ -313,6 +348,15 @@
       <if test="segment3 != null">
         segment_3 = #{segment3,jdbcType=DECIMAL},
       </if>
+      <if test="segment4 != null">
+        segment_4 = #{segment4,jdbcType=DECIMAL},
+      </if>
+      <if test="segment5 != null">
+        segment_5 = #{segment5,jdbcType=DECIMAL},
+      </if>
+      <if test="segment6 != null">
+        segment_6 = #{segment6,jdbcType=DECIMAL},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -341,6 +385,9 @@
       segment_1 = #{segment1,jdbcType=DECIMAL},
       segment_2 = #{segment2,jdbcType=DECIMAL},
       segment_3 = #{segment3,jdbcType=DECIMAL},
+      segment_4 = #{segment4,jdbcType=DECIMAL},
+      segment_5 = #{segment5,jdbcType=DECIMAL},
+      segment_6 = #{segment6,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       organization_id = #{organizationId,jdbcType=VARCHAR},