Browse Source

有效年数修改成有效次数

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
49fc222cb3

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="kede-server" type="XMLMAPPER" />
-    <table schema="aft" tableName="business_project"/>
+    <table schema="aft" tableName="new_order_dun"/>
   </context>
 </generatorConfiguration>

+ 11 - 11
src/main/java/com/goafanti/common/dao/NewOrderDunMapper.java

@@ -10,67 +10,67 @@ import org.apache.ibatis.annotations.Param;
 public interface NewOrderDunMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	long countByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	int deleteByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	int insert(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	int insertSelective(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	List<NewOrderDun> selectByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	NewOrderDun selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") NewOrderDun record, @Param("example") NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	int updateByExample(@Param("record") NewOrderDun record, @Param("example") NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	int updateByPrimaryKeySelective(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	int updateByPrimaryKey(NewOrderDun record);
 

+ 30 - 30
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -13,7 +13,7 @@
     <result column="project_type" jdbcType="INTEGER" property="projectType" />
     <result column="dun_type" jdbcType="INTEGER" property="dunType" />
     <result column="wait_day" jdbcType="INTEGER" property="waitDay" />
-    <result column="effective_year" jdbcType="INTEGER" property="effectiveYear" />
+    <result column="effective_count" jdbcType="INTEGER" property="effectiveCount" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -23,7 +23,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +57,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +91,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
-    id, order_no, tid, project_type, dun_type, wait_day, effective_year, aid, status, 
+    id, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, status, 
     create_time, start_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     select
     <if test="distinct">
@@ -119,7 +119,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,7 +130,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     delete from new_order_dun
     where id = #{id,jdbcType=INTEGER}
@@ -139,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     delete from new_order_dun
     <if test="_parameter != null">
@@ -150,22 +150,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     insert into new_order_dun (id, order_no, tid, 
       project_type, dun_type, wait_day, 
-      effective_year, aid, status, 
+      effective_count, aid, status, 
       create_time, start_time)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
       #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
-      #{effectiveYear,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{effectiveCount,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     insert into new_order_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -187,8 +187,8 @@
       <if test="waitDay != null">
         wait_day,
       </if>
-      <if test="effectiveYear != null">
-        effective_year,
+      <if test="effectiveCount != null">
+        effective_count,
       </if>
       <if test="aid != null">
         aid,
@@ -222,8 +222,8 @@
       <if test="waitDay != null">
         #{waitDay,jdbcType=INTEGER},
       </if>
-      <if test="effectiveYear != null">
-        #{effectiveYear,jdbcType=INTEGER},
+      <if test="effectiveCount != null">
+        #{effectiveCount,jdbcType=INTEGER},
       </if>
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
@@ -243,7 +243,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     select count(*) from new_order_dun
     <if test="_parameter != null">
@@ -254,7 +254,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     update new_order_dun
     <set>
@@ -276,8 +276,8 @@
       <if test="record.waitDay != null">
         wait_day = #{record.waitDay,jdbcType=INTEGER},
       </if>
-      <if test="record.effectiveYear != null">
-        effective_year = #{record.effectiveYear,jdbcType=INTEGER},
+      <if test="record.effectiveCount != null">
+        effective_count = #{record.effectiveCount,jdbcType=INTEGER},
       </if>
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
@@ -300,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     update new_order_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -309,7 +309,7 @@
       project_type = #{record.projectType,jdbcType=INTEGER},
       dun_type = #{record.dunType,jdbcType=INTEGER},
       wait_day = #{record.waitDay,jdbcType=INTEGER},
-      effective_year = #{record.effectiveYear,jdbcType=INTEGER},
+      effective_count = #{record.effectiveCount,jdbcType=INTEGER},
       aid = #{record.aid,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
@@ -322,7 +322,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     update new_order_dun
     <set>
@@ -341,8 +341,8 @@
       <if test="waitDay != null">
         wait_day = #{waitDay,jdbcType=INTEGER},
       </if>
-      <if test="effectiveYear != null">
-        effective_year = #{effectiveYear,jdbcType=INTEGER},
+      <if test="effectiveCount != null">
+        effective_count = #{effectiveCount,jdbcType=INTEGER},
       </if>
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
@@ -363,7 +363,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Dec 03 17:56:47 CST 2019.
+      This element was generated on Thu Dec 05 14:06:46 CST 2019.
     -->
     update new_order_dun
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -371,7 +371,7 @@
       project_type = #{projectType,jdbcType=INTEGER},
       dun_type = #{dunType,jdbcType=INTEGER},
       wait_day = #{waitDay,jdbcType=INTEGER},
-      effective_year = #{effectiveYear,jdbcType=INTEGER},
+      effective_count = #{effectiveCount,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -396,7 +396,7 @@
   from new_order_dun a left join  t_order_new b on a.order_no=b.order_no
   where 1=1 and b.approval=2
   </select>
-  <select id="selectByTid"  resultType="com.goafanti.order.bo.OutNewOrderDunBo">
+  <select id="selectByTid" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
     select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
   	a.effective_year effectiveYear, a.aid, a.create_time createTime from new_order_dun a
     where tid = #{tid} and status=0

+ 43 - 43
src/main/java/com/goafanti/common/model/NewOrderDun.java

@@ -6,64 +6,64 @@ public class NewOrderDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.id
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.order_no
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.tid
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.project_type
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private Integer projectType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.dun_type
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private Integer dunType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.wait_day
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private Integer waitDay;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.effective_year
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.effective_count
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
-	private Integer effectiveYear;
+	private Integer effectiveCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.aid
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.status
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.create_time
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.start_time
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	private Date startTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.id
 	 * @return  the value of new_order_dun.id
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -72,7 +72,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.id
 	 * @param id  the value for new_order_dun.id
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -81,7 +81,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.order_no
 	 * @return  the value of new_order_dun.order_no
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -90,7 +90,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.order_no
 	 * @param orderNo  the value for new_order_dun.order_no
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -99,7 +99,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.tid
 	 * @return  the value of new_order_dun.tid
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Integer getTid() {
 		return tid;
@@ -108,7 +108,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.tid
 	 * @param tid  the value for new_order_dun.tid
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -117,7 +117,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.project_type
 	 * @return  the value of new_order_dun.project_type
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -126,7 +126,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.project_type
 	 * @param projectType  the value for new_order_dun.project_type
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -135,7 +135,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.dun_type
 	 * @return  the value of new_order_dun.dun_type
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -144,7 +144,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.dun_type
 	 * @param dunType  the value for new_order_dun.dun_type
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -153,7 +153,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.wait_day
 	 * @return  the value of new_order_dun.wait_day
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -162,34 +162,34 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.wait_day
 	 * @param waitDay  the value for new_order_dun.wait_day
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.effective_year
-	 * @return  the value of new_order_dun.effective_year
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.effective_count
+	 * @return  the value of new_order_dun.effective_count
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
-	public Integer getEffectiveYear() {
-		return effectiveYear;
+	public Integer getEffectiveCount() {
+		return effectiveCount;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.effective_year
-	 * @param effectiveYear  the value for new_order_dun.effective_year
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.effective_count
+	 * @param effectiveCount  the value for new_order_dun.effective_count
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
-	public void setEffectiveYear(Integer effectiveYear) {
-		this.effectiveYear = effectiveYear;
+	public void setEffectiveCount(Integer effectiveCount) {
+		this.effectiveCount = effectiveCount;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.aid
 	 * @return  the value of new_order_dun.aid
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public String getAid() {
 		return aid;
@@ -198,7 +198,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.aid
 	 * @param aid  the value for new_order_dun.aid
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -207,7 +207,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.status
 	 * @return  the value of new_order_dun.status
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -216,7 +216,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.status
 	 * @param status  the value for new_order_dun.status
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -225,7 +225,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.create_time
 	 * @return  the value of new_order_dun.create_time
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -234,7 +234,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.create_time
 	 * @param createTime  the value for new_order_dun.create_time
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -243,7 +243,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.start_time
 	 * @return  the value of new_order_dun.start_time
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -252,7 +252,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.start_time
 	 * @param startTime  the value for new_order_dun.start_time
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;

+ 40 - 40
src/main/java/com/goafanti/common/model/NewOrderDunExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class NewOrderDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public NewOrderDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -533,63 +533,63 @@ public class NewOrderDunExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearIsNull() {
-			addCriterion("effective_year is null");
+		public Criteria andEffectiveCountIsNull() {
+			addCriterion("effective_count is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearIsNotNull() {
-			addCriterion("effective_year is not null");
+		public Criteria andEffectiveCountIsNotNull() {
+			addCriterion("effective_count is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearEqualTo(Integer value) {
-			addCriterion("effective_year =", value, "effectiveYear");
+		public Criteria andEffectiveCountEqualTo(Integer value) {
+			addCriterion("effective_count =", value, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearNotEqualTo(Integer value) {
-			addCriterion("effective_year <>", value, "effectiveYear");
+		public Criteria andEffectiveCountNotEqualTo(Integer value) {
+			addCriterion("effective_count <>", value, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearGreaterThan(Integer value) {
-			addCriterion("effective_year >", value, "effectiveYear");
+		public Criteria andEffectiveCountGreaterThan(Integer value) {
+			addCriterion("effective_count >", value, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearGreaterThanOrEqualTo(Integer value) {
-			addCriterion("effective_year >=", value, "effectiveYear");
+		public Criteria andEffectiveCountGreaterThanOrEqualTo(Integer value) {
+			addCriterion("effective_count >=", value, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearLessThan(Integer value) {
-			addCriterion("effective_year <", value, "effectiveYear");
+		public Criteria andEffectiveCountLessThan(Integer value) {
+			addCriterion("effective_count <", value, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearLessThanOrEqualTo(Integer value) {
-			addCriterion("effective_year <=", value, "effectiveYear");
+		public Criteria andEffectiveCountLessThanOrEqualTo(Integer value) {
+			addCriterion("effective_count <=", value, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearIn(List<Integer> values) {
-			addCriterion("effective_year in", values, "effectiveYear");
+		public Criteria andEffectiveCountIn(List<Integer> values) {
+			addCriterion("effective_count in", values, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearNotIn(List<Integer> values) {
-			addCriterion("effective_year not in", values, "effectiveYear");
+		public Criteria andEffectiveCountNotIn(List<Integer> values) {
+			addCriterion("effective_count not in", values, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearBetween(Integer value1, Integer value2) {
-			addCriterion("effective_year between", value1, value2, "effectiveYear");
+		public Criteria andEffectiveCountBetween(Integer value1, Integer value2) {
+			addCriterion("effective_count between", value1, value2, "effectiveCount");
 			return (Criteria) this;
 		}
 
-		public Criteria andEffectiveYearNotBetween(Integer value1, Integer value2) {
-			addCriterion("effective_year not between", value1, value2, "effectiveYear");
+		public Criteria andEffectiveCountNotBetween(Integer value1, Integer value2) {
+			addCriterion("effective_count not between", value1, value2, "effectiveCount");
 			return (Criteria) this;
 		}
 
@@ -846,7 +846,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Tue Dec 03 17:56:47 CST 2019
+	 * @mbg.generated  Thu Dec 05 14:06:46 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;