Просмотр исходного кода

修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
ad3bffede2

+ 1 - 1
GeneratorConfig.xml

@@ -9,7 +9,7 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_order_task"/>
+    <table schema="aft" tableName="t_change_dun"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

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

@@ -11,67 +11,67 @@ public interface TChangeDunMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	long countByExample(TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int deleteByExample(TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int insert(TChangeDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int insertSelective(TChangeDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	List<TChangeDun> selectByExample(TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	TChangeDun selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TChangeDun record, @Param("example") TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int updateByExample(@Param("record") TChangeDun record, @Param("example") TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TChangeDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int updateByPrimaryKey(TChangeDun record);
 

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

@@ -462,7 +462,7 @@
   </select>
   <select id="selectAllOrderDun" 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_count effectiveCount, a.aid, a.create_time createTime,b.approval
+  a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval,a.customize_time customizeTime
   ,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
   from new_order_dun a left join  t_order_new b on a.order_no=b.order_no
   where 1=1 and a.status=0 and b.process_status &gt; 1

+ 19 - 17
src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="did" jdbcType="INTEGER" property="did" />
@@ -31,7 +31,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -65,7 +65,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -99,7 +99,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     id, did, cid, order_no, tid, ctid, project_type, dun_type, wait_day, effective_count, 
     aid, status, type, create_time, start_time, money, appropriation_ratio, customize_name, 
@@ -109,7 +109,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     select
     <if test="distinct">
@@ -128,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -139,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     delete from t_change_dun
     where id = #{id,jdbcType=INTEGER}
@@ -148,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     delete from t_change_dun
     <if test="_parameter != null">
@@ -159,7 +159,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     insert into t_change_dun (id, did, cid, 
       order_no, tid, ctid, 
@@ -180,7 +180,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     insert into t_change_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -306,7 +306,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     select count(*) from t_change_dun
     <if test="_parameter != null">
@@ -317,7 +317,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     update t_change_dun
     <set>
@@ -387,7 +387,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     update t_change_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -417,7 +417,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     update t_change_dun
     <set>
@@ -482,7 +482,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 10:10:48 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     update t_change_dun
     set did = #{did,jdbcType=INTEGER},
@@ -511,14 +511,16 @@
       order_no, tid, project_type, 
       dun_type, wait_day, effective_count, 
       aid, status, create_time, 
-      start_time, money, appropriation_ratio
+      start_time, money, appropriation_ratio,
+      customize_name,customize_time
       )values
       <foreach collection="list" index="index" item="item" separator=",">
       ( #{item.did,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, 
       #{item.orderNo,jdbcType=VARCHAR}, #{item.tid,jdbcType=INTEGER}, #{item.projectType,jdbcType=INTEGER}, 
       #{item.dunType,jdbcType=INTEGER}, #{item.waitDay,jdbcType=INTEGER}, #{item.effectiveCount,jdbcType=INTEGER}, 
       #{item.aid,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, now(), 
-      #{item.startTime,jdbcType=TIMESTAMP}, #{item.money,jdbcType=DECIMAL}, #{item.appropriationRatio,jdbcType=DECIMAL}
+      #{item.startTime,jdbcType=TIMESTAMP}, #{item.money,jdbcType=DECIMAL}, #{item.appropriationRatio,jdbcType=DECIMAL},
+      #{item.customizeName,jdbcType=VARCHAR},#{item.customizeTime,jdbcType=TIMESTAMP}
       )
     </foreach>
   </insert>

+ 2 - 1
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1519,7 +1519,8 @@ where super_id is null ) e on e.order_no=a.order_no
 	from t_order_dun a  
 	</if>
 	<if test="newStatus == 1 ">
-	a.project_type projectType,a.status dunStatus, a.dun_type dunType,a.appropriation_ratio appropriationRatio,e.set_up_amount setUpAmount
+	a.project_type projectType,a.status dunStatus, a.dun_type dunType,a.appropriation_ratio appropriationRatio,
+	e.set_up_amount setUpAmount,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
 	from new_order_dun a left join t_order_task e on a.tid=e.id 
 	</if>
 	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id 

+ 0 - 282
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -262,288 +262,6 @@
       #{receiverName,jdbcType=VARCHAR}, #{declarationBatch,jdbcType=INTEGER}, #{attachmentUrl,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 15 16:05:15 CST 2020.
-    -->
-    insert into t_order_task
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="orderNo != null">
-        order_no,
-      </if>
-      <if test="main != null">
-        main,
-      </if>
-      <if test="superId != null">
-        super_id,
-      </if>
-      <if test="commodityId != null">
-        commodity_id,
-      </if>
-      <if test="commodityName != null">
-        commodity_name,
-      </if>
-      <if test="commodityQuantity != null">
-        commodity_quantity,
-      </if>
-      <if test="commodityMode != null">
-        commodity_mode,
-      </if>
-      <if test="commodityPrice != null">
-        commodity_price,
-      </if>
-      <if test="taskStatus != null">
-        task_status,
-      </if>
-      <if test="taskDistributionTime != null">
-        task_distribution_time,
-      </if>
-      <if test="taskAllocator != null">
-        task_allocator,
-      </if>
-      <if test="taskReceiver != null">
-        task_receiver,
-      </if>
-      <if test="taskComment != null">
-        task_comment,
-      </if>
-      <if test="taskStartTime != null">
-        task_start_time,
-      </if>
-      <if test="taskEndTime != null">
-        task_end_time,
-      </if>
-      <if test="projectStatus != null">
-        project_status,
-      </if>
-      <if test="acceptTime != null">
-        accept_time,
-      </if>
-      <if test="reviewTime != null">
-        review_time,
-      </if>
-      <if test="publicityTime != null">
-        publicity_time,
-      </if>
-      <if test="licenceTime != null">
-        licence_time,
-      </if>
-      <if test="certificateNumber != null">
-        certificate_number,
-      </if>
-      <if test="status != null">
-        status,
-      </if>
-      <if test="formRetrieve != null">
-        form_retrieve,
-      </if>
-      <if test="taskRefund != null">
-        task_refund,
-      </if>
-      <if test="refundContent != null">
-        refund_content,
-      </if>
-      <if test="retrieveContent != null">
-        retrieve_content,
-      </if>
-      <if test="declareUser != null">
-        declare_user,
-      </if>
-      <if test="declarePwd != null">
-        declare_pwd,
-      </if>
-      <if test="setUpAmount != null">
-        set_up_amount,
-      </if>
-      <if test="arrivalMoney != null">
-        arrival_money,
-      </if>
-      <if test="outsourceName != null">
-        outsource_name,
-      </if>
-      <if test="outsourcePrice != null">
-        outsource_price,
-      </if>
-      <if test="consultantId != null">
-        consultant_id,
-      </if>
-      <if test="managerId != null">
-        manager_id,
-      </if>
-      <if test="outsource != null">
-        outsource,
-      </if>
-      <if test="splitSuper != null">
-        split_super,
-      </if>
-      <if test="splitStatus != null">
-        split_status,
-      </if>
-      <if test="splitId != null">
-        split_id,
-      </if>
-      <if test="splitAid != null">
-        split_aid,
-      </if>
-      <if test="splitTime != null">
-        split_time,
-      </if>
-      <if test="cname != null">
-        cname,
-      </if>
-      <if test="receiverName != null">
-        receiver_name,
-      </if>
-      <if test="declarationBatch != null">
-        declaration_batch,
-      </if>
-      <if test="attachmentUrl != null">
-        attachment_url,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="orderNo != null">
-        #{orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="main != null">
-        #{main,jdbcType=INTEGER},
-      </if>
-      <if test="superId != null">
-        #{superId,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityId != null">
-        #{commodityId,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityName != null">
-        #{commodityName,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityQuantity != null">
-        #{commodityQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="commodityMode != null">
-        #{commodityMode,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityPrice != null">
-        #{commodityPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="taskStatus != null">
-        #{taskStatus,jdbcType=INTEGER},
-      </if>
-      <if test="taskDistributionTime != null">
-        #{taskDistributionTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taskAllocator != null">
-        #{taskAllocator,jdbcType=VARCHAR},
-      </if>
-      <if test="taskReceiver != null">
-        #{taskReceiver,jdbcType=VARCHAR},
-      </if>
-      <if test="taskComment != null">
-        #{taskComment,jdbcType=VARCHAR},
-      </if>
-      <if test="taskStartTime != null">
-        #{taskStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taskEndTime != null">
-        #{taskEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="projectStatus != null">
-        #{projectStatus,jdbcType=INTEGER},
-      </if>
-      <if test="acceptTime != null">
-        #{acceptTime,jdbcType=DATE},
-      </if>
-      <if test="reviewTime != null">
-        #{reviewTime,jdbcType=DATE},
-      </if>
-      <if test="publicityTime != null">
-        #{publicityTime,jdbcType=DATE},
-      </if>
-      <if test="licenceTime != null">
-        #{licenceTime,jdbcType=DATE},
-      </if>
-      <if test="certificateNumber != null">
-        #{certificateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="formRetrieve != null">
-        #{formRetrieve,jdbcType=INTEGER},
-      </if>
-      <if test="taskRefund != null">
-        #{taskRefund,jdbcType=INTEGER},
-      </if>
-      <if test="refundContent != null">
-        #{refundContent,jdbcType=VARCHAR},
-      </if>
-      <if test="retrieveContent != null">
-        #{retrieveContent,jdbcType=VARCHAR},
-      </if>
-      <if test="declareUser != null">
-        #{declareUser,jdbcType=VARCHAR},
-      </if>
-      <if test="declarePwd != null">
-        #{declarePwd,jdbcType=VARCHAR},
-      </if>
-      <if test="setUpAmount != null">
-        #{setUpAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="arrivalMoney != null">
-        #{arrivalMoney,jdbcType=INTEGER},
-      </if>
-      <if test="outsourceName != null">
-        #{outsourceName,jdbcType=VARCHAR},
-      </if>
-      <if test="outsourcePrice != null">
-        #{outsourcePrice,jdbcType=DECIMAL},
-      </if>
-      <if test="consultantId != null">
-        #{consultantId,jdbcType=VARCHAR},
-      </if>
-      <if test="managerId != null">
-        #{managerId,jdbcType=VARCHAR},
-      </if>
-      <if test="outsource != null">
-        #{outsource,jdbcType=INTEGER},
-      </if>
-      <if test="splitSuper != null">
-        #{splitSuper,jdbcType=INTEGER},
-      </if>
-      <if test="splitStatus != null">
-        #{splitStatus,jdbcType=INTEGER},
-      </if>
-      <if test="splitId != null">
-        #{splitId,jdbcType=INTEGER},
-      </if>
-      <if test="splitAid != null">
-        #{splitAid,jdbcType=VARCHAR},
-      </if>
-      <if test="splitTime != null">
-        #{splitTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="cname != null">
-        #{cname,jdbcType=VARCHAR},
-      </if>
-      <if test="receiverName != null">
-        #{receiverName,jdbcType=VARCHAR},
-      </if>
-      <if test="declarationBatch != null">
-        #{declarationBatch,jdbcType=INTEGER},
-      </if>
-      <if test="attachmentUrl != null">
-        #{attachmentUrl,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated

+ 59 - 59
src/main/java/com/goafanti/common/model/TChangeDun.java

@@ -7,106 +7,104 @@ public class TChangeDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.id
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.did
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer did;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.cid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.order_no
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.tid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.ctid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer ctid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.project_type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer projectType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.dun_type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer dunType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.wait_day
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer waitDay;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.effective_count
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer effectiveCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.aid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.status
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.create_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.start_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Date startTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.money
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private BigDecimal money;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.appropriation_ratio
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private BigDecimal appropriationRatio;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.customize_name
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private String customizeName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.customize_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Date customizeTime;
-	
-	private String customizeTimes;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.id
 	 * @return  the value of t_change_dun.id
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -115,7 +113,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.id
 	 * @param id  the value for t_change_dun.id
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -124,7 +122,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.did
 	 * @return  the value of t_change_dun.did
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getDid() {
 		return did;
@@ -133,7 +131,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.did
 	 * @param did  the value for t_change_dun.did
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setDid(Integer did) {
 		this.did = did;
@@ -142,7 +140,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.cid
 	 * @return  the value of t_change_dun.cid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -151,7 +149,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.cid
 	 * @param cid  the value for t_change_dun.cid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -160,7 +158,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.order_no
 	 * @return  the value of t_change_dun.order_no
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -169,7 +167,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.order_no
 	 * @param orderNo  the value for t_change_dun.order_no
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -178,7 +176,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.tid
 	 * @return  the value of t_change_dun.tid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -187,7 +185,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.tid
 	 * @param tid  the value for t_change_dun.tid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -196,7 +194,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.ctid
 	 * @return  the value of t_change_dun.ctid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getCtid() {
 		return ctid;
@@ -205,7 +203,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.ctid
 	 * @param ctid  the value for t_change_dun.ctid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setCtid(Integer ctid) {
 		this.ctid = ctid;
@@ -214,7 +212,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.project_type
 	 * @return  the value of t_change_dun.project_type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -223,7 +221,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.project_type
 	 * @param projectType  the value for t_change_dun.project_type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -232,7 +230,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.dun_type
 	 * @return  the value of t_change_dun.dun_type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -241,7 +239,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.dun_type
 	 * @param dunType  the value for t_change_dun.dun_type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -250,7 +248,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.wait_day
 	 * @return  the value of t_change_dun.wait_day
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -259,7 +257,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.wait_day
 	 * @param waitDay  the value for t_change_dun.wait_day
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
@@ -268,7 +266,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.effective_count
 	 * @return  the value of t_change_dun.effective_count
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getEffectiveCount() {
 		return effectiveCount;
@@ -277,7 +275,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.effective_count
 	 * @param effectiveCount  the value for t_change_dun.effective_count
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setEffectiveCount(Integer effectiveCount) {
 		this.effectiveCount = effectiveCount;
@@ -286,7 +284,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.aid
 	 * @return  the value of t_change_dun.aid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -295,7 +293,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.aid
 	 * @param aid  the value for t_change_dun.aid
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -304,7 +302,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.status
 	 * @return  the value of t_change_dun.status
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -313,7 +311,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.status
 	 * @param status  the value for t_change_dun.status
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -322,7 +320,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.type
 	 * @return  the value of t_change_dun.type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -331,7 +329,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.type
 	 * @param type  the value for t_change_dun.type
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -340,7 +338,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.create_time
 	 * @return  the value of t_change_dun.create_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -349,7 +347,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.create_time
 	 * @param createTime  the value for t_change_dun.create_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -358,7 +356,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.start_time
 	 * @return  the value of t_change_dun.start_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -367,7 +365,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.start_time
 	 * @param startTime  the value for t_change_dun.start_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -376,7 +374,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.money
 	 * @return  the value of t_change_dun.money
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public BigDecimal getMoney() {
 		return money;
@@ -385,7 +383,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.money
 	 * @param money  the value for t_change_dun.money
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setMoney(BigDecimal money) {
 		this.money = money;
@@ -394,7 +392,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.appropriation_ratio
 	 * @return  the value of t_change_dun.appropriation_ratio
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public BigDecimal getAppropriationRatio() {
 		return appropriationRatio;
@@ -403,7 +401,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.appropriation_ratio
 	 * @param appropriationRatio  the value for t_change_dun.appropriation_ratio
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setAppropriationRatio(BigDecimal appropriationRatio) {
 		this.appropriationRatio = appropriationRatio;
@@ -412,7 +410,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.customize_name
 	 * @return  the value of t_change_dun.customize_name
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public String getCustomizeName() {
 		return customizeName;
@@ -421,7 +419,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.customize_name
 	 * @param customizeName  the value for t_change_dun.customize_name
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setCustomizeName(String customizeName) {
 		this.customizeName = customizeName;
@@ -430,7 +428,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.customize_time
 	 * @return  the value of t_change_dun.customize_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Date getCustomizeTime() {
 		return customizeTime;
@@ -439,12 +437,14 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.customize_time
 	 * @param customizeTime  the value for t_change_dun.customize_time
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setCustomizeTime(Date customizeTime) {
 		this.customizeTime = customizeTime;
 	}
 
+	private String customizeTimes;
+
 	public String getCustomizeTimes() {
 		return customizeTimes;
 	}

+ 16 - 16
src/main/java/com/goafanti/common/model/TChangeDunExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TChangeDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public TChangeDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1337,7 +1337,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_dun
-	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 4 - 3
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.EmailBo;
@@ -50,7 +51,7 @@ import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderNewService;
 
 @Component
-//@Controller
+@Controller
 public class OrderDunTask {
 	@Autowired
 	private OrderNewService orderNewService;
@@ -71,8 +72,8 @@ public class OrderDunTask {
 	/**
 	 * 每天凌晨3点轮询处理需要新催款的信息
 	 */
-//	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
-//	@ResponseBody
+	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
+	@ResponseBody
 	@Scheduled(cron = "0 0 3  * * ?")
 //	@Scheduled(cron = "0 50 16  * * ?")
 	@Transactional(rollbackFor=Exception.class)

+ 4 - 1
src/main/java/com/goafanti/order/bo/TChangeDunOut.java

@@ -14,9 +14,12 @@ public class TChangeDunOut extends TChangeDun{
 	private String startDate;
 	private BigDecimal setUpAmount;
 	public String getDunTypeName() {
-		if(super.getDunType()!=null&&super.getProjectType()!=null) {
+		if(super.getDunType()!=null&&super.getProjectType()!=null&&super.getDunType()!=0) {
 			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()));
 		}
+		if(super.getDunType()!=null&&super.getProjectType()!=null&&super.getDunType()==0) {
+			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()))+getCustomizeName();
+		}
 		return dunTypeName;
 	}
 	public String getCommodityName() {

+ 17 - 1
src/main/java/com/goafanti/order/bo/outOrderDunListBo.java

@@ -27,12 +27,16 @@ public class outOrderDunListBo {
 	private String dunSubject;
 	private BigDecimal appropriationRatio;
 	private BigDecimal setUpAmount;
+	private String customizeName;
+	private String customizeTimes;
+	
 	public String getId() {
 		return id;
 	}
 	public String getDunSubject() {
 		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
-		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
+		if(getDunType()!=null&&getDunType()!=0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
+		if(getDunType()!=null&&getDunType()==0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()))+getCustomizeName();
 		return dunSubject;
 	}
 	public void setId(String id) {
@@ -156,6 +160,18 @@ public class outOrderDunListBo {
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
 	}
+	public String getCustomizeTimes() {
+		return customizeTimes;
+	}
+	public void setCustomizeTimes(String customizeTimes) {
+		this.customizeTimes = customizeTimes;
+	}
+	public String getCustomizeName() {
+		return customizeName;
+	}
+	public void setCustomizeName(String customizeName) {
+		this.customizeName = customizeName;
+	}
 	
 
 }

+ 8 - 0
src/main/java/com/goafanti/order/enums/NewOrderDunType.java

@@ -4,23 +4,31 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum NewOrderDunType {
+	CGZH_ZDY(10,"成果转化-"),
 	CGZH_SQ(11,"成果转化-首期"),
 	CGZH_WC(12,"成果转化-完成"),
+	COMMON_ZDY(20,"通用-"),
 	COMMON_SQ(21,"通用-首期"),
 	COMMON_NGS(22,"通用-拟公示"),
 	COMMON_XZ(23,"通用-下证"),
+	KJXM_ZDY(30,"科技项目-"),
 	KJXM_SQ(31,"科技项目-首期"),
 	KJXM_LX(32,"科技项目-立项(公示)"),
 	KJXM_BK(33,"科技项目-拨款"),
+	KJJR_ZDY(40,"科技金融-"),
 	KJJR_SQ(41,"科技金融-首期"),
 	KJJR_BK(42,"科技金融-拨款"),
+	CS_ZDY(50,"财税-"),
 	CS_SQ(51,"财税-首期"),
 	CS_DQ(52,"财税-期限"),
+	HY_ZDY(60,"会员-"),
 	HY_SQ(61,"会员-首期"),
 	HY_DQ(62,"会员-期限"),
+	RJKF_ZDY(70,"软件开发-"),
 	RJKF_SQ(71,"软件开发-首期"),
 	RJKF_LX(72,"软件开发-立项"),
 	RJKF_WZ(73,"软件开发-完成"),
+	ZSCQ_ZDY(80,"知识产权-"),
 	ZSCQ_SQ(81,"知识产权-首期"),
 	ZSCQ_GS_SL_XZ(82,"知识产权-公示/专利受理/软著下证"),
 	ZSCQ_XZ(83,"知识产权-专利下证"),

+ 14 - 0
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -2,6 +2,7 @@ package com.goafanti.order.service.impl;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -12,16 +13,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.constant.AFTConstants;
@@ -57,6 +62,8 @@ import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.NewOrderDun;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.ExportExcelUtil;
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.SendEmailUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
@@ -76,6 +83,7 @@ import com.goafanti.order.bo.TChangeTaskOut;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.OrderChangeType;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.OrderType;
@@ -129,6 +137,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private TOrderBillNewMapper tOrderBillNewMapper;
 	
+	Logger							logger	= LoggerFactory.getLogger(OrderChangeServiceImpl.class);
+	
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
 		TOrderNew ton=new TOrderNew();
@@ -164,6 +174,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					cd.setWaitDay(d.getWaitDay());
 					cd.setStartTime(d.getStartTime());
 					cd.setEffectiveCount(d.getEffectiveCount());
+					cd.setCustomizeTime(d.getCustomizeTime());
+					cd.setCustomizeName(d.getCustomizeName());
 					listcd.add(cd);
 				}
 				tChangeDunMapper.insertSelectiveList(listcd);
@@ -732,6 +744,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}
 	}
 
+	
+	
 	@Override
 	public Map<String, Object> listOrderInvoiceAndBill(String orderNo) {
 		Map<String, Object> map=new HashMap<>();

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -646,8 +646,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		NewOrderDun ob=newOrderDunMapper.selectByPrimaryKey(dunId);
 		AdminListBo a2 = adminMapper.getDeptNameByAid(b.getSalesmanId());
 		String dunTypeName="";
-		if(ob.getDunType()!=null&&ob.getProjectType()!=null) {
+		if(ob.getDunType()!=null&&ob.getProjectType()!=null&&ob.getDunType()!=0) {
 			dunTypeName= NewOrderDunType.getValueByCode(Integer.valueOf(""+ob.getProjectType()+ob.getDunType()));
+		}else if(ob.getDunType()!=null&&ob.getProjectType()!=null&&ob.getDunType()==0){
+			dunTypeName= NewOrderDunType.getValueByCode(Integer.valueOf(""+ob.getProjectType()+ob.getDunType()))+ob.getCustomizeName();
 		}
 			//发送驳回邮件
 		if(SendEmailUtil.isEmail(b.getEmail())) {