1、real last commit!

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

@@ -5,8 +5,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
-import pwc.taxtech.atms.vat.entity.CashFlowManual;
-import pwc.taxtech.atms.vat.entity.CashFlowManualExample;
+import pwc.taxtech.atms.vat.dpo.CashFlowCondition;
+import pwc.taxtech.atms.vat.entity.CashFlow;
+import pwc.taxtech.atms.vat.entity.CashFlowExample;
 
 @Mapper
 public interface CashFlowManualMapper extends MyVatMapper {
@@ -16,7 +17,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    long countByExample(CashFlowManualExample example);
+    long countByExample(CashFlowExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -24,7 +25,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    int deleteByExample(CashFlowManualExample example);
+    int deleteByExample(CashFlowExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -40,7 +41,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    int insert(CashFlowManual record);
+    int insert(CashFlow record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -48,7 +49,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    int insertSelective(CashFlowManual record);
+    int insertSelective(CashFlow record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -56,7 +57,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    List<CashFlowManual> selectByExampleWithRowbounds(CashFlowManualExample example, RowBounds rowBounds);
+    List<CashFlow> selectByExampleWithRowbounds(CashFlowExample example, RowBounds rowBounds);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -64,7 +65,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    List<CashFlowManual> selectByExample(CashFlowManualExample example);
+    List<CashFlow> selectByExample(CashFlowExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -72,7 +73,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    CashFlowManual selectByPrimaryKey(Long id);
+    CashFlow selectByPrimaryKey(Long id);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -80,7 +81,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    int updateByExampleSelective(@Param("record") CashFlowManual record, @Param("example") CashFlowManualExample example);
+    int updateByExampleSelective(@Param("record") CashFlow record, @Param("example") CashFlowExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -88,7 +89,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    int updateByExample(@Param("record") CashFlowManual record, @Param("example") CashFlowManualExample example);
+    int updateByExample(@Param("record") CashFlow record, @Param("example") CashFlowExample example);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -96,7 +97,7 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    int updateByPrimaryKeySelective(CashFlowManual record);
+    int updateByPrimaryKeySelective(CashFlow record);
 
     /**
      * This method was generated by MyBatis Generator.
@@ -104,5 +105,11 @@ public interface CashFlowManualMapper extends MyVatMapper {
      *
      * @mbg.generated
      */
-    int updateByPrimaryKey(CashFlowManual record);
+    int updateByPrimaryKey(CashFlow record);
+
+    List<CashFlow> selectByCondition(@Param("cfCondition") CashFlowCondition condition);
+
+    Integer selectCountByCondition(@Param("cfCondition") CashFlowCondition condition);
+
+    int insertBatch(List<CashFlow> cfs);
 }
\ No newline at end of file

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/CashFlowManualMapper.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.vat.dao.CashFlowManualMapper">
-  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.CashFlowManual">
+  <resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.CashFlow">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -105,7 +105,7 @@
     frequency, item_name, item_name2, period_amt, ytd_amt, create_time, update_time, 
     task_id
   </sql>
-  <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowManualExample" resultMap="BaseResultMap">
+  <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -141,7 +141,7 @@
     delete from cash_flow_manual
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowManualExample">
+  <delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -151,7 +151,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.CashFlowManual">
+  <insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.CashFlow">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -173,7 +173,7 @@
       #{ytdAmt,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{taskId,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.CashFlowManual">
+  <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.CashFlow">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -316,7 +316,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowManualExample" resultType="java.lang.Long">
+  <select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -436,7 +436,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.CashFlowManual">
+  <update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.CashFlow">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -509,7 +509,7 @@
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.CashFlowManual">
+  <update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.CashFlow">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -538,7 +538,7 @@
       task_id = #{taskId,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.CashFlowManualExample" resultMap="BaseResultMap">
+  <select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.