Przeglądaj źródła

催款修改

Signed-off-by: anderx <312518615@qq.com>
anderx 5 lat temu
rodzic
commit
93527851b2
32 zmienionych plików z 2937 dodań i 2394 usunięć
  1. 1 1
      GeneratorConfig.xml
  2. 11 11
      src/main/java/com/goafanti/common/dao/NewOrderDunMapper.java
  3. 11 11
      src/main/java/com/goafanti/common/dao/TChangeDunMapper.java
  4. 21 18
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  5. 4 0
      src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java
  6. 58 22
      src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml
  7. 83 50
      src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml
  8. 1868 1853
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  9. 5 0
      src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml
  10. 5 0
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  11. 85 39
      src/main/java/com/goafanti/common/model/NewOrderDun.java
  12. 146 16
      src/main/java/com/goafanti/common/model/NewOrderDunExample.java
  13. 127 71
      src/main/java/com/goafanti/common/model/TChangeDun.java
  14. 194 64
      src/main/java/com/goafanti/common/model/TChangeDunExample.java
  15. 182 137
      src/main/java/com/goafanti/common/model/TOrderNew.java
  16. 16 16
      src/main/java/com/goafanti/common/model/TOrderNewExample.java
  17. 3 0
      src/main/java/com/goafanti/common/model/TOrderNewWithBLOBs.java
  18. 9 2
      src/main/java/com/goafanti/common/task/OrderDunTask.java
  19. 12 7
      src/main/java/com/goafanti/common/utils/DateUtils.java
  20. 12 0
      src/main/java/com/goafanti/customer/bo/CustomerListIn.java
  21. 13 0
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  22. 1 0
      src/main/java/com/goafanti/customer/service/CustomerService.java
  23. 18 0
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  24. 9 0
      src/main/java/com/goafanti/order/bo/InputNewOrderDunBo.java
  25. 9 1
      src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java
  26. 2 1
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  27. 6 0
      src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java
  28. 5 5
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  29. 1 5
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  30. 1 11
      src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java
  31. 18 52
      src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java
  32. 1 1
      src/main/resources/props/config_local.properties

+ 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="personnel_mid"/>
+    <table schema="aft" tableName="t_order_new"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	long countByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int deleteByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int insert(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int insertSelective(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	List<NewOrderDun> selectByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	NewOrderDun selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int updateByPrimaryKeySelective(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int updateByPrimaryKey(NewOrderDun record);
 

+ 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	int updateByPrimaryKey(TChangeDun record);
 

+ 21 - 18
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -11,76 +11,79 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
+import com.goafanti.common.model.TOrderNewWithBLOBs;
 
 public interface TOrderNewMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	long countByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int deleteByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int deleteByPrimaryKey(String orderNo);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int insert(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int insertSelective(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
-	List<TOrderNew> selectByExampleWithBLOBs(TOrderNewExample example);
+	List<TOrderNewWithBLOBs> selectByExampleWithBLOBs(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	List<TOrderNew> selectByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
-	TOrderNew selectByPrimaryKey(String orderNo);
+	TOrderNewWithBLOBs selectByPrimaryKey(String orderNo);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
-	int updateByExampleSelective(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
+	int updateByExampleSelective(@Param("record") TOrderNew record,
+			@Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
-	int updateByExampleWithBLOBs(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
+	int updateByExampleWithBLOBs(@Param("record") TOrderNew record,
+			@Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderNew record);
 	TOrderNewBo getOrderNewDetail(String orderNo); 

+ 4 - 0
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -4,6 +4,7 @@ import com.goafanti.common.model.UserLockRelease;
 import com.goafanti.common.model.UserLockReleaseExample;
 import com.goafanti.customer.bo.LockingReleaseBo;
 
+import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -86,6 +87,9 @@ public interface UserLockReleaseMapper {
 	 * @return
 	 */
 	int updateUserLock(@Param("uid")String uid,@Param("aid")String aid,@Param("oldStatus")Integer oldStatus,@Param("newStatus")Integer newStatus);
+	
+	int updateUserTypeLock(@Param("uid")String uid,@Param("aid")String aid,@Param("type")Integer type,
+			@Param("newStatus")Integer newStatus,@Param("date") Date date);
 
 	List<LockingReleaseBo> selectWaitReleaseCustomer(String aid);
 

+ 58 - 22
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 Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -20,12 +20,14 @@
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="money" jdbcType="DECIMAL" property="money" />
     <result column="appropriation_ratio" jdbcType="DECIMAL" property="appropriationRatio" />
+    <result column="customize_name" jdbcType="VARCHAR" property="customizeName" />
+    <result column="customize_time" jdbcType="TIMESTAMP" property="customizeTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +61,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,16 +95,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     id, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, status, 
-    create_time, start_time, money, appropriation_ratio
+    create_time, start_time, money, appropriation_ratio, customize_name, customize_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 Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     select
     <if test="distinct">
@@ -121,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -132,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     delete from new_order_dun
     where id = #{id,jdbcType=INTEGER}
@@ -141,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     delete from new_order_dun
     <if test="_parameter != null">
@@ -152,24 +154,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     insert into new_order_dun (id, order_no, tid, 
       project_type, dun_type, wait_day, 
       effective_count, aid, status, 
       create_time, start_time, money, 
-      appropriation_ratio)
+      appropriation_ratio, customize_name, customize_time
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
       #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
       #{effectiveCount,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}, 
-      #{appropriationRatio,jdbcType=DECIMAL})
+      #{appropriationRatio,jdbcType=DECIMAL}, #{customizeName,jdbcType=VARCHAR}, #{customizeTime,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 Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     insert into new_order_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -212,6 +216,12 @@
       <if test="appropriationRatio != null">
         appropriation_ratio,
       </if>
+      <if test="customizeName != null">
+        customize_name,
+      </if>
+      <if test="customizeTime != null">
+        customize_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -253,13 +263,19 @@
       <if test="appropriationRatio != null">
         #{appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="customizeName != null">
+        #{customizeName,jdbcType=VARCHAR},
+      </if>
+      <if test="customizeTime != null">
+        #{customizeTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     select count(*) from new_order_dun
     <if test="_parameter != null">
@@ -270,7 +286,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     update new_order_dun
     <set>
@@ -313,6 +329,12 @@
       <if test="record.appropriationRatio != null">
         appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="record.customizeName != null">
+        customize_name = #{record.customizeName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customizeTime != null">
+        customize_time = #{record.customizeTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -322,7 +344,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     update new_order_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -337,7 +359,9 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       money = #{record.money,jdbcType=DECIMAL},
-      appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL}
+      appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
+      customize_name = #{record.customizeName,jdbcType=VARCHAR},
+      customize_time = #{record.customizeTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -346,7 +370,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     update new_order_dun
     <set>
@@ -386,6 +410,12 @@
       <if test="appropriationRatio != null">
         appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="customizeName != null">
+        customize_name = #{customizeName,jdbcType=VARCHAR},
+      </if>
+      <if test="customizeTime != null">
+        customize_time = #{customizeTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -393,7 +423,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     update new_order_dun
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -407,7 +437,9 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       start_time = #{startTime,jdbcType=TIMESTAMP},
       money = #{money,jdbcType=DECIMAL},
-      appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL}
+      appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
+      customize_name = #{customizeName,jdbcType=VARCHAR},
+      customize_time = #{customizeTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <delete id="deleteByTid" parameterType="java.lang.Integer">
@@ -418,7 +450,8 @@
   <select id="selectListNewOrderDun" 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, b.set_up_amount setUpAmount,
   a.effective_count effectiveCount, a.aid, a.create_time createTime ,b.commodity_name commodityName,a.money,a.status,
-  a.appropriation_ratio appropriationRatio from new_order_dun a left join t_order_task b on a.tid=b.id where 1=1
+  a.appropriation_ratio appropriationRatio,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName 
+  from new_order_dun a left join t_order_task b on a.tid=b.id where 1=1
   <if test="orderNo != null">
   and  a.order_no= #{orderNo}
   </if>
@@ -430,12 +463,15 @@
   <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
+  ,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
   </select>
   <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_count effectiveCount, a.aid, a.money,a.create_time createTime from new_order_dun a
+  	a.effective_count effectiveCount, a.aid, a.money,a.create_time createTime 
+  	,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
+  	from new_order_dun a
     where tid = #{tid} and status=0
   </select>
 </mapper>

+ 83 - 50
src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml

@@ -5,31 +5,33 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="did" jdbcType="INTEGER" property="did" />
     <result column="cid" jdbcType="INTEGER" property="cid" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="ctid" jdbcType="INTEGER" property="ctid" />
     <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_count" jdbcType="INTEGER" property="effectiveCount" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="type" jdbcType="INTEGER" property="type" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="money" jdbcType="DECIMAL" property="money" />
     <result column="appropriation_ratio" jdbcType="DECIMAL" property="appropriationRatio" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="ctid" jdbcType="INTEGER" property="ctid" />
+    <result column="customize_name" jdbcType="VARCHAR" property="customizeName" />
+    <result column="customize_time" jdbcType="TIMESTAMP" property="customizeTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -63,7 +65,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -97,16 +99,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
-    id, did, cid, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, 
-    status, create_time, start_time, money, appropriation_ratio, type, ctid
+    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, 
+    customize_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TChangeDunExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     select
     <if test="distinct">
@@ -125,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -136,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     delete from t_change_dun
     where id = #{id,jdbcType=INTEGER}
@@ -145,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     delete from t_change_dun
     <if test="_parameter != null">
@@ -156,26 +159,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     insert into t_change_dun (id, did, cid, 
-      order_no, tid, project_type, 
-      dun_type, wait_day, effective_count, 
-      aid, status, create_time, 
-      start_time, money, appropriation_ratio, 
-      type, ctid)
+      order_no, tid, ctid, 
+      project_type, dun_type, wait_day, 
+      effective_count, aid, status, 
+      type, create_time, start_time, 
+      money, appropriation_ratio, customize_name, 
+      customize_time)
     values (#{id,jdbcType=INTEGER}, #{did,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
-      #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER}, 
-      #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, #{effectiveCount,jdbcType=INTEGER}, 
-      #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}, #{appropriationRatio,jdbcType=DECIMAL}, 
-      #{type,jdbcType=INTEGER}, #{ctid,jdbcType=INTEGER})
+      #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, #{ctid,jdbcType=INTEGER}, 
+      #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
+      #{effectiveCount,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{money,jdbcType=DECIMAL}, #{appropriationRatio,jdbcType=DECIMAL}, #{customizeName,jdbcType=VARCHAR}, 
+      #{customizeTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     insert into t_change_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -194,6 +199,9 @@
       <if test="tid != null">
         tid,
       </if>
+      <if test="ctid != null">
+        ctid,
+      </if>
       <if test="projectType != null">
         project_type,
       </if>
@@ -212,6 +220,9 @@
       <if test="status != null">
         status,
       </if>
+      <if test="type != null">
+        type,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -224,11 +235,11 @@
       <if test="appropriationRatio != null">
         appropriation_ratio,
       </if>
-      <if test="type != null">
-        type,
+      <if test="customizeName != null">
+        customize_name,
       </if>
-      <if test="ctid != null">
-        ctid,
+      <if test="customizeTime != null">
+        customize_time,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -247,6 +258,9 @@
       <if test="tid != null">
         #{tid,jdbcType=INTEGER},
       </if>
+      <if test="ctid != null">
+        #{ctid,jdbcType=INTEGER},
+      </if>
       <if test="projectType != null">
         #{projectType,jdbcType=INTEGER},
       </if>
@@ -265,6 +279,9 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -277,11 +294,11 @@
       <if test="appropriationRatio != null">
         #{appropriationRatio,jdbcType=DECIMAL},
       </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
+      <if test="customizeName != null">
+        #{customizeName,jdbcType=VARCHAR},
       </if>
-      <if test="ctid != null">
-        #{ctid,jdbcType=INTEGER},
+      <if test="customizeTime != null">
+        #{customizeTime,jdbcType=TIMESTAMP},
       </if>
     </trim>
   </insert>
@@ -289,7 +306,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     select count(*) from t_change_dun
     <if test="_parameter != null">
@@ -300,7 +317,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     update t_change_dun
     <set>
@@ -319,6 +336,9 @@
       <if test="record.tid != null">
         tid = #{record.tid,jdbcType=INTEGER},
       </if>
+      <if test="record.ctid != null">
+        ctid = #{record.ctid,jdbcType=INTEGER},
+      </if>
       <if test="record.projectType != null">
         project_type = #{record.projectType,jdbcType=INTEGER},
       </if>
@@ -337,6 +357,9 @@
       <if test="record.status != null">
         status = #{record.status,jdbcType=INTEGER},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -349,11 +372,11 @@
       <if test="record.appropriationRatio != null">
         appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
       </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
+      <if test="record.customizeName != null">
+        customize_name = #{record.customizeName,jdbcType=VARCHAR},
       </if>
-      <if test="record.ctid != null">
-        ctid = #{record.ctid,jdbcType=INTEGER},
+      <if test="record.customizeTime != null">
+        customize_time = #{record.customizeTime,jdbcType=TIMESTAMP},
       </if>
     </set>
     <if test="_parameter != null">
@@ -364,7 +387,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     update t_change_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -372,18 +395,20 @@
       cid = #{record.cid,jdbcType=INTEGER},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
       tid = #{record.tid,jdbcType=INTEGER},
+      ctid = #{record.ctid,jdbcType=INTEGER},
       project_type = #{record.projectType,jdbcType=INTEGER},
       dun_type = #{record.dunType,jdbcType=INTEGER},
       wait_day = #{record.waitDay,jdbcType=INTEGER},
       effective_count = #{record.effectiveCount,jdbcType=INTEGER},
       aid = #{record.aid,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       money = #{record.money,jdbcType=DECIMAL},
       appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
-      type = #{record.type,jdbcType=INTEGER},
-      ctid = #{record.ctid,jdbcType=INTEGER}
+      customize_name = #{record.customizeName,jdbcType=VARCHAR},
+      customize_time = #{record.customizeTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -392,7 +417,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     update t_change_dun
     <set>
@@ -408,6 +433,9 @@
       <if test="tid != null">
         tid = #{tid,jdbcType=INTEGER},
       </if>
+      <if test="ctid != null">
+        ctid = #{ctid,jdbcType=INTEGER},
+      </if>
       <if test="projectType != null">
         project_type = #{projectType,jdbcType=INTEGER},
       </if>
@@ -426,6 +454,9 @@
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -438,11 +469,11 @@
       <if test="appropriationRatio != null">
         appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
       </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+      <if test="customizeName != null">
+        customize_name = #{customizeName,jdbcType=VARCHAR},
       </if>
-      <if test="ctid != null">
-        ctid = #{ctid,jdbcType=INTEGER},
+      <if test="customizeTime != null">
+        customize_time = #{customizeTime,jdbcType=TIMESTAMP},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -451,25 +482,27 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Fri May 15 10:10:48 CST 2020.
     -->
     update t_change_dun
     set did = #{did,jdbcType=INTEGER},
       cid = #{cid,jdbcType=INTEGER},
       order_no = #{orderNo,jdbcType=VARCHAR},
       tid = #{tid,jdbcType=INTEGER},
+      ctid = #{ctid,jdbcType=INTEGER},
       project_type = #{projectType,jdbcType=INTEGER},
       dun_type = #{dunType,jdbcType=INTEGER},
       wait_day = #{waitDay,jdbcType=INTEGER},
       effective_count = #{effectiveCount,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
+      type = #{type,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       start_time = #{startTime,jdbcType=TIMESTAMP},
       money = #{money,jdbcType=DECIMAL},
       appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
-      type = #{type,jdbcType=INTEGER},
-      ctid = #{ctid,jdbcType=INTEGER}
+      customize_name = #{customizeName,jdbcType=VARCHAR},
+      customize_time = #{customizeTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -494,6 +527,7 @@
 	select a.id,a.order_no orderNo,ifnull(a.tid,c.tid)tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
   	  b.set_up_amount setUpAmount, a.effective_count effectiveCount, a.aid, a.create_time createTime,a.type,a.ctid,a.did,
   	  ifnull(b.commodity_name,c.commodity_name) commodityName,a.money,a.status, a.appropriation_ratio appropriationRatio
+  	  ,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName,a.customize_time customizeTime
   	  from t_change_dun a left join t_order_task b on a.tid=b.id left join t_change_task c on a.ctid=c.id
     	where a.cid= #{id} order by a.id
   </select>
@@ -517,7 +551,6 @@
   		</if>
   </update>
     <delete id="deleteByCtid" parameterType="java.lang.Integer">
-    
     delete from t_change_dun
     where ctid = #{id,jdbcType=INTEGER}
   </delete>

Plik diff jest za duży
+ 1868 - 1853
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml


+ 5 - 0
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -354,6 +354,11 @@
   	update user_lock_release set status = #{newStatus} where uid = #{uid} and aid = #{aid} and type = 0 and status = #{oldStatus}
   </update>
   
+  <update id="updateUserTypeLock">
+  	update user_lock_release set status = #{newStatus} , release_time= #{date}
+  	where uid = #{uid} and aid = #{aid} and type = 0 and type = #{type}
+  </update>
+  
   <select id="selectWaitReleaseCustomer" resultType="com.goafanti.customer.bo.LockingReleaseBo">
 	select 
 		t0.id,

+ 5 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -541,7 +541,12 @@
 		<if test="area != null">
 			and b.location_area = #{area,jdbcType=INTEGER}
 		</if>
+		<if test="sort == 1">
 		order by a.transfer_time desc
+		</if>
+		<if test="sort == 2">
+		order by a.transfer_time 
+		</if>
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>

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

@@ -7,74 +7,84 @@ public class NewOrderDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.id
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.order_no
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.tid
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.project_type
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer projectType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.dun_type
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer dunType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.wait_day
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer waitDay;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.effective_count
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer effectiveCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.aid
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.status
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.create_time
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.start_time
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Date startTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.money
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private BigDecimal money;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.appropriation_ratio
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private BigDecimal appropriationRatio;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.customize_name
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	private String customizeName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.customize_time
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	private Date customizeTime;
 
 	/**
 	 * 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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -83,7 +93,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -92,7 +102,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -101,7 +111,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -110,7 +120,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -119,7 +129,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -128,7 +138,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -137,7 +147,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -146,7 +156,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -155,7 +165,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -164,7 +174,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -173,7 +183,7 @@ 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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
@@ -182,7 +192,7 @@ public class NewOrderDun {
 	/**
 	 * 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 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getEffectiveCount() {
 		return effectiveCount;
@@ -191,7 +201,7 @@ public class NewOrderDun {
 	/**
 	 * 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 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setEffectiveCount(Integer effectiveCount) {
 		this.effectiveCount = effectiveCount;
@@ -200,7 +210,7 @@ public class NewOrderDun {
 	/**
 	 * 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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -209,7 +219,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -218,7 +228,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -227,7 +237,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -236,7 +246,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -245,7 +255,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -254,7 +264,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -263,7 +273,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  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -272,7 +282,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.money
 	 * @return  the value of new_order_dun.money
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public BigDecimal getMoney() {
 		return money;
@@ -281,7 +291,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.money
 	 * @param money  the value for new_order_dun.money
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setMoney(BigDecimal money) {
 		this.money = money;
@@ -290,7 +300,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.appropriation_ratio
 	 * @return  the value of new_order_dun.appropriation_ratio
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public BigDecimal getAppropriationRatio() {
 		return appropriationRatio;
@@ -299,9 +309,45 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.appropriation_ratio
 	 * @param appropriationRatio  the value for new_order_dun.appropriation_ratio
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setAppropriationRatio(BigDecimal appropriationRatio) {
 		this.appropriationRatio = appropriationRatio;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.customize_name
+	 * @return  the value of new_order_dun.customize_name
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	public String getCustomizeName() {
+		return customizeName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.customize_name
+	 * @param customizeName  the value for new_order_dun.customize_name
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	public void setCustomizeName(String customizeName) {
+		this.customizeName = customizeName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.customize_time
+	 * @return  the value of new_order_dun.customize_time
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	public Date getCustomizeTime() {
+		return customizeTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.customize_time
+	 * @param customizeTime  the value for new_order_dun.customize_time
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	public void setCustomizeTime(Date customizeTime) {
+		this.customizeTime = customizeTime;
+	}
 }

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

@@ -8,23 +8,23 @@ import java.math.BigDecimal;
 public class NewOrderDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public NewOrderDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -963,11 +963,141 @@ public class NewOrderDunExample {
 			addCriterion("appropriation_ratio not between", value1, value2, "appropriationRatio");
 			return (Criteria) this;
 		}
+
+		public Criteria andCustomizeNameIsNull() {
+			addCriterion("customize_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameIsNotNull() {
+			addCriterion("customize_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameEqualTo(String value) {
+			addCriterion("customize_name =", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameNotEqualTo(String value) {
+			addCriterion("customize_name <>", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameGreaterThan(String value) {
+			addCriterion("customize_name >", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameGreaterThanOrEqualTo(String value) {
+			addCriterion("customize_name >=", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameLessThan(String value) {
+			addCriterion("customize_name <", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameLessThanOrEqualTo(String value) {
+			addCriterion("customize_name <=", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameLike(String value) {
+			addCriterion("customize_name like", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameNotLike(String value) {
+			addCriterion("customize_name not like", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameIn(List<String> values) {
+			addCriterion("customize_name in", values, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameNotIn(List<String> values) {
+			addCriterion("customize_name not in", values, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameBetween(String value1, String value2) {
+			addCriterion("customize_name between", value1, value2, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameNotBetween(String value1, String value2) {
+			addCriterion("customize_name not between", value1, value2, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeIsNull() {
+			addCriterion("customize_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeIsNotNull() {
+			addCriterion("customize_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeEqualTo(Date value) {
+			addCriterion("customize_time =", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeNotEqualTo(Date value) {
+			addCriterion("customize_time <>", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeGreaterThan(Date value) {
+			addCriterion("customize_time >", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("customize_time >=", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeLessThan(Date value) {
+			addCriterion("customize_time <", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeLessThanOrEqualTo(Date value) {
+			addCriterion("customize_time <=", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeIn(List<Date> values) {
+			addCriterion("customize_time in", values, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeNotIn(List<Date> values) {
+			addCriterion("customize_time not in", values, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeBetween(Date value1, Date value2) {
+			addCriterion("customize_time between", value1, value2, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeNotBetween(Date value1, Date value2) {
+			addCriterion("customize_time not between", value1, value2, "customizeTime");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -7,94 +7,106 @@ public class TChangeDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.id
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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
+	 */
+	private Integer ctid;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.project_type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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
+	 */
+	private Integer type;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.create_time
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	private BigDecimal appropriationRatio;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * 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
 	 */
-	private Integer type;
+	private String customizeName;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.ctid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * 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
 	 */
-	private Integer ctid;
+	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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -103,7 +115,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -112,7 +124,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getDid() {
 		return did;
@@ -121,7 +133,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setDid(Integer did) {
 		this.did = did;
@@ -130,7 +142,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -139,7 +151,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -148,7 +160,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -157,7 +169,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -166,7 +178,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -175,16 +187,34 @@ 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
 	}
 
 	/**
+	 * 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
+	 */
+	public Integer getCtid() {
+		return ctid;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCtid(Integer ctid) {
+		this.ctid = ctid;
+	}
+
+	/**
 	 * 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -193,7 +223,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -202,7 +232,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -211,7 +241,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -220,7 +250,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -229,7 +259,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
@@ -238,7 +268,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getEffectiveCount() {
 		return effectiveCount;
@@ -247,7 +277,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setEffectiveCount(Integer effectiveCount) {
 		this.effectiveCount = effectiveCount;
@@ -256,7 +286,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -265,7 +295,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -274,7 +304,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -283,16 +313,34 @@ 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
 
 	/**
+	 * 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
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	/**
 	 * 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -301,7 +349,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -310,7 +358,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -319,7 +367,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -328,7 +376,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public BigDecimal getMoney() {
 		return money;
@@ -337,7 +385,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setMoney(BigDecimal money) {
 		this.money = money;
@@ -346,7 +394,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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public BigDecimal getAppropriationRatio() {
 		return appropriationRatio;
@@ -355,45 +403,53 @@ 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public void setAppropriationRatio(BigDecimal appropriationRatio) {
 		this.appropriationRatio = appropriationRatio;
 	}
 
 	/**
-	 * 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  Mon Jan 13 11:34:14 CST 2020
+	 * 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
 	 */
-	public Integer getType() {
-		return type;
+	public String getCustomizeName() {
+		return customizeName;
 	}
 
 	/**
-	 * 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  Mon Jan 13 11:34:14 CST 2020
+	 * 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
 	 */
-	public void setType(Integer type) {
-		this.type = type;
+	public void setCustomizeName(String customizeName) {
+		this.customizeName = customizeName;
 	}
 
 	/**
-	 * 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  Mon Jan 13 11:34:14 CST 2020
+	 * 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
 	 */
-	public Integer getCtid() {
-		return ctid;
+	public Date getCustomizeTime() {
+		return customizeTime;
 	}
 
 	/**
-	 * 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  Mon Jan 13 11:34:14 CST 2020
+	 * 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
 	 */
-	public void setCtid(Integer ctid) {
-		this.ctid = ctid;
+	public void setCustomizeTime(Date customizeTime) {
+		this.customizeTime = customizeTime;
+	}
+
+	public String getCustomizeTimes() {
+		return customizeTimes;
+	}
+
+	public void setCustomizeTimes(String customizeTimes) {
+		this.customizeTimes = customizeTimes;
 	}
 }

+ 194 - 64
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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 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  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -474,6 +474,66 @@ public class TChangeDunExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andCtidIsNull() {
+			addCriterion("ctid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidIsNotNull() {
+			addCriterion("ctid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidEqualTo(Integer value) {
+			addCriterion("ctid =", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidNotEqualTo(Integer value) {
+			addCriterion("ctid <>", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidGreaterThan(Integer value) {
+			addCriterion("ctid >", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidGreaterThanOrEqualTo(Integer value) {
+			addCriterion("ctid >=", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidLessThan(Integer value) {
+			addCriterion("ctid <", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidLessThanOrEqualTo(Integer value) {
+			addCriterion("ctid <=", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidIn(List<Integer> values) {
+			addCriterion("ctid in", values, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidNotIn(List<Integer> values) {
+			addCriterion("ctid not in", values, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidBetween(Integer value1, Integer value2) {
+			addCriterion("ctid between", value1, value2, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidNotBetween(Integer value1, Integer value2) {
+			addCriterion("ctid not between", value1, value2, "ctid");
+			return (Criteria) this;
+		}
+
 		public Criteria andProjectTypeIsNull() {
 			addCriterion("project_type is null");
 			return (Criteria) this;
@@ -844,6 +904,66 @@ public class TChangeDunExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andTypeIsNull() {
+			addCriterion("type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeIsNotNull() {
+			addCriterion("type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeEqualTo(Integer value) {
+			addCriterion("type =", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotEqualTo(Integer value) {
+			addCriterion("type <>", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeGreaterThan(Integer value) {
+			addCriterion("type >", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("type >=", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeLessThan(Integer value) {
+			addCriterion("type <", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("type <=", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeIn(List<Integer> values) {
+			addCriterion("type in", values, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotIn(List<Integer> values) {
+			addCriterion("type not in", values, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeBetween(Integer value1, Integer value2) {
+			addCriterion("type between", value1, value2, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("type not between", value1, value2, "type");
+			return (Criteria) this;
+		}
+
 		public Criteria andCreateTimeIsNull() {
 			addCriterion("create_time is null");
 			return (Criteria) this;
@@ -1084,130 +1204,140 @@ public class TChangeDunExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIsNull() {
-			addCriterion("type is null");
+		public Criteria andCustomizeNameIsNull() {
+			addCriterion("customize_name is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIsNotNull() {
-			addCriterion("type is not null");
+		public Criteria andCustomizeNameIsNotNull() {
+			addCriterion("customize_name is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeEqualTo(Integer value) {
-			addCriterion("type =", value, "type");
+		public Criteria andCustomizeNameEqualTo(String value) {
+			addCriterion("customize_name =", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotEqualTo(Integer value) {
-			addCriterion("type <>", value, "type");
+		public Criteria andCustomizeNameNotEqualTo(String value) {
+			addCriterion("customize_name <>", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThan(Integer value) {
-			addCriterion("type >", value, "type");
+		public Criteria andCustomizeNameGreaterThan(String value) {
+			addCriterion("customize_name >", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
-			addCriterion("type >=", value, "type");
+		public Criteria andCustomizeNameGreaterThanOrEqualTo(String value) {
+			addCriterion("customize_name >=", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThan(Integer value) {
-			addCriterion("type <", value, "type");
+		public Criteria andCustomizeNameLessThan(String value) {
+			addCriterion("customize_name <", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThanOrEqualTo(Integer value) {
-			addCriterion("type <=", value, "type");
+		public Criteria andCustomizeNameLessThanOrEqualTo(String value) {
+			addCriterion("customize_name <=", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIn(List<Integer> values) {
-			addCriterion("type in", values, "type");
+		public Criteria andCustomizeNameLike(String value) {
+			addCriterion("customize_name like", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotIn(List<Integer> values) {
-			addCriterion("type not in", values, "type");
+		public Criteria andCustomizeNameNotLike(String value) {
+			addCriterion("customize_name not like", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeBetween(Integer value1, Integer value2) {
-			addCriterion("type between", value1, value2, "type");
+		public Criteria andCustomizeNameIn(List<String> values) {
+			addCriterion("customize_name in", values, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
-			addCriterion("type not between", value1, value2, "type");
+		public Criteria andCustomizeNameNotIn(List<String> values) {
+			addCriterion("customize_name not in", values, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidIsNull() {
-			addCriterion("ctid is null");
+		public Criteria andCustomizeNameBetween(String value1, String value2) {
+			addCriterion("customize_name between", value1, value2, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidIsNotNull() {
-			addCriterion("ctid is not null");
+		public Criteria andCustomizeNameNotBetween(String value1, String value2) {
+			addCriterion("customize_name not between", value1, value2, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidEqualTo(Integer value) {
-			addCriterion("ctid =", value, "ctid");
+		public Criteria andCustomizeTimeIsNull() {
+			addCriterion("customize_time is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidNotEqualTo(Integer value) {
-			addCriterion("ctid <>", value, "ctid");
+		public Criteria andCustomizeTimeIsNotNull() {
+			addCriterion("customize_time is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidGreaterThan(Integer value) {
-			addCriterion("ctid >", value, "ctid");
+		public Criteria andCustomizeTimeEqualTo(Date value) {
+			addCriterion("customize_time =", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidGreaterThanOrEqualTo(Integer value) {
-			addCriterion("ctid >=", value, "ctid");
+		public Criteria andCustomizeTimeNotEqualTo(Date value) {
+			addCriterion("customize_time <>", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidLessThan(Integer value) {
-			addCriterion("ctid <", value, "ctid");
+		public Criteria andCustomizeTimeGreaterThan(Date value) {
+			addCriterion("customize_time >", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidLessThanOrEqualTo(Integer value) {
-			addCriterion("ctid <=", value, "ctid");
+		public Criteria andCustomizeTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("customize_time >=", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidIn(List<Integer> values) {
-			addCriterion("ctid in", values, "ctid");
+		public Criteria andCustomizeTimeLessThan(Date value) {
+			addCriterion("customize_time <", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidNotIn(List<Integer> values) {
-			addCriterion("ctid not in", values, "ctid");
+		public Criteria andCustomizeTimeLessThanOrEqualTo(Date value) {
+			addCriterion("customize_time <=", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidBetween(Integer value1, Integer value2) {
-			addCriterion("ctid between", value1, value2, "ctid");
+		public Criteria andCustomizeTimeIn(List<Date> values) {
+			addCriterion("customize_time in", values, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidNotBetween(Integer value1, Integer value2) {
-			addCriterion("ctid not between", value1, value2, "ctid");
+		public Criteria andCustomizeTimeNotIn(List<Date> values) {
+			addCriterion("customize_time not in", values, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeBetween(Date value1, Date value2) {
+			addCriterion("customize_time between", value1, value2, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeNotBetween(Date value1, Date value2) {
+			addCriterion("customize_time not between", value1, value2, "customizeTime");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Fri May 15 10:10:48 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

Plik diff jest za duży
+ 182 - 137
src/main/java/com/goafanti/common/model/TOrderNew.java


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

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderNewExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public TOrderNewExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2654,7 +2654,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 3 - 0
src/main/java/com/goafanti/common/model/TOrderNewWithBLOBs.java

@@ -0,0 +1,3 @@
+package com.goafanti.common.model;
+
+public class TOrderNewWithBLOBs extends TOrderNew {}

+ 9 - 2
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -116,7 +116,14 @@ public class OrderDunTask {
   	  	  			Thread.sleep(2000);
   				}
   			}
-  	  		
+  	  		if (o.getDunType()==0) {
+  	  		calendar2.setTime(o.getCustomizeTime());
+  	  			if (calendar.equals(calendar2)) {
+  	  				updateOrderDun(o);
+	  	  			Thread.sleep(2000);
+				}
+				
+			}
 		}
   		LoggerUtils.debug(logger, "======================新催款任务轮询结束===================");
   		} catch (Exception e) {
@@ -153,7 +160,7 @@ public class OrderDunTask {
 	}
 	
 	/**
-	 * 每天凌晨4点轮询处理需要欠款催款的信息
+	* 	每月1号凌晨4点轮询处理需要欠款催款的信息
 	*
 	*/
 	@Scheduled(cron = "0 0 4 1 * ?") 

+ 12 - 7
src/main/java/com/goafanti/common/utils/DateUtils.java

@@ -5,6 +5,8 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
+import org.apache.ibatis.builder.BuilderException;
+
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
 	public static final String	YEAR_SPAN		= "yearSpan";
@@ -463,13 +465,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 * @return
 	 * @throws ParseException
 	 */
-	public static Date StringToDate(String date,String ymd) throws ParseException
-	{
-	SimpleDateFormat dateFormat=new SimpleDateFormat(ymd);
-	
-	Date parse = dateFormat.parse(date);
-	return parse;
-
+	public static Date StringToDate(String date,String ymd) {
+		Date parse=null;
+		SimpleDateFormat dateFormat=new SimpleDateFormat(ymd);
+		try {
+			parse = dateFormat.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+			throw new BuilderException("时间转换失败");
+		}
+		return parse;
 	}
 	
 

+ 12 - 0
src/main/java/com/goafanti/customer/bo/CustomerListIn.java

@@ -63,6 +63,10 @@ public class CustomerListIn {
 	
 	private String iname;
 	
+	/**
+	 * 	排序 0否 1转换倒序 2转换正序
+	 */
+	private Integer sort;
 	
 	
 	
@@ -242,4 +246,12 @@ public class CustomerListIn {
 	public void setLevel(Integer level) {
 		this.level = level;
 	}
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
 }

+ 13 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -1091,6 +1091,19 @@ public class AdminCustomerApiController extends BaseApiController{
 		return res;
 	}
 	
+	/** 释放客户 **/
+	@RequestMapping(value = "/pushReleaseUser", method = RequestMethod.GET)
+	public Result pushReleaseUser(String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"用户ID错误","用户ID"));
+			return res;
+		}
+		
+		res.data(customerService.pushReleaseUser(id));
+		return res;
+	}
+	
 	/**
 	 * 企业项目申报材料上传
 	 * 

+ 1 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -511,6 +511,7 @@ public interface CustomerService {
 	
 	List<transferListBo> transferList(String uid);
 	int updatePrivateBusinessTransfer(String inputId, String uid, String pid);
+	int pushReleaseUser(String id);
 	
 	
 }

+ 18 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -15,6 +15,7 @@ import javax.annotation.Resource;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.ibatis.builder.BuilderException;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -234,6 +235,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if(StringUtils.isNotBlank(cli.getEndDate())) params.put("endDate", cli.getEndDate()+" 23:59:59");
 		if(null!=cli.getDataGrade()) params.put("dataGrade", cli.getDataGrade());
 		if(null!=cli.getLevel())params.put("level", cli.getLevel());
+		if(null!=cli.getSort())params.put("sort", cli.getSort());
 		return params;
 	}
 
@@ -1555,5 +1557,21 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return userTransferLogMapper.selectByUidGetList(uid);
 	}
 
+	@Override
+	public int pushReleaseUser(String id) {
+		Date date =new Date();
+		User u=userMapper.selectByPrimaryKey(id);
+		System.out.println(u.getAid());
+		System.out.println(TokenManager.getAdminId());
+		if (!u.getAid().equals(TokenManager.getAdminId())) {
+			throw new BuilderException("客户归属错误!");
+		}
+		u.setTransferTime(date);
+		u.setShareType(1);
+		userMapper.updateByPrimaryKeySelective(u);
+		userLockReleaseMapper.updateUserTypeLock(u.getId(), TokenManager.getAdminId(), 0, 2,date);
+		return 1;
+	}
+
 
 }

+ 9 - 0
src/main/java/com/goafanti/order/bo/InputNewOrderDunBo.java

@@ -3,5 +3,14 @@ package com.goafanti.order.bo;
 import com.goafanti.common.model.NewOrderDun;
 
 public class InputNewOrderDunBo extends NewOrderDun {
+	private String customizeTimes;
+
+	public String getCustomizeTimes() {
+		return customizeTimes;
+	}
+
+	public void setCustomizeTimes(String customizeTimes) {
+		this.customizeTimes = customizeTimes;
+	}
 
 }

+ 9 - 1
src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java

@@ -14,7 +14,7 @@ public class OutNewOrderDunBo extends NewOrderDun {
 	private String commodityName;
 	private String startDate;
 	private BigDecimal setUpAmount;
-	
+	private String customizeTimes;
 	
 	public String getDunTypeName() {
 		if(super.getDunType()!=null&&super.getProjectType()!=null) {
@@ -88,4 +88,12 @@ public class OutNewOrderDunBo extends NewOrderDun {
 		return super.getMoney();
 	}
 
+	public String getCustomizeTimes() {
+		return customizeTimes;
+	}
+
+	public void setCustomizeTimes(String customizeTimes) {
+		this.customizeTimes = customizeTimes;
+	}
+
 }

+ 2 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -19,6 +19,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderNewWithBLOBs;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.order.bo.InputArrearsDunListBo;
@@ -150,7 +151,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateServiceOrderNew",method = RequestMethod.POST)
-	public Result updateServiceOrder(TOrderNew t,String isSubmit,String signDate){
+	public Result updateServiceOrder(TOrderNewWithBLOBs t,String isSubmit,String signDate){
 		Result res = new Result();
 		if(StringUtils.isBlank(t.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "订单编号"));

+ 6 - 0
src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java

@@ -1,15 +1,19 @@
 package com.goafanti.order.service.impl;
 
 import java.lang.reflect.InvocationTargetException;
+import java.text.ParseException;
 import java.util.List;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.converters.DateConverter;
+import org.apache.ibatis.builder.BuilderException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.NewOrderDunMapper;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.InputNewOrderDunBo;
@@ -26,6 +30,7 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	@Override
 	public int createDun(InputNewOrderDunBo ib) {
 		ib.setAid(TokenManager.getAdminId());
+		if(ib.getCustomizeTimes()!=null)ib.setCustomizeTime(DateUtils.StringToDate(ib.getCustomizeTimes(), AFTConstants.YYYYMMDD));
 		if (ib.getAppropriationRatio()!=null)ib.setMoney(null);
 		if (ib.getProjectType()==OrderDunProjectType.HY.getCode()&&ib.getDunType()==2&&ib.getEffectiveCount()>1) {
 			for (int i = 1; i <= ib.getEffectiveCount(); i++) {
@@ -42,6 +47,7 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	@Override
 	public int updateDun(InputNewOrderDunBo ib) {
 		if (ib.getAppropriationRatio()!=null)ib.setMoney(null);
+		if(ib.getCustomizeTimes()!=null)ib.setCustomizeTime(DateUtils.StringToDate(ib.getCustomizeTimes(), AFTConstants.YYYYMMDD));
 		return newOrderDunMapper.updateByPrimaryKeySelective(ib);
 	}
 	@Override

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

@@ -715,6 +715,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			nd.setWaitDay(cd.getWaitDay());
 			nd.setStartTime(cd.getStartTime());
 			nd.setEffectiveCount(cd.getEffectiveCount());
+			nd.setCustomizeTime(cd.getCustomizeTime());
+			nd.setCustomizeName(cd.getCustomizeName());
 			if (cd.getDunType()==1) {
 				nd.setStatus(1);
 				nd.setStartTime(new Date());
@@ -856,6 +858,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			public int addChangeDun(TChangeDun d) {
 				d.setAid(TokenManager.getAdminId());
 				d.setType(1);
+				if(d.getCustomizeTimes()!=null)d.setCustomizeTime(DateUtils.StringToDate(d.getCustomizeTimes(), AFTConstants.YYYYMMDD));
 				return tChangeDunMapper.insertSelective(d);
 			}
 
@@ -933,6 +936,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 			@Override
 			public int updateChangeDun(TChangeDun t) {
+				if(t.getCustomizeTimes()!=null)t.setCustomizeTime(DateUtils.StringToDate(t.getCustomizeTimes(), AFTConstants.YYYYMMDD));
 				if (t.getType()==1||t.getType()==2) {
 					return tChangeDunMapper.updateByPrimaryKeySelective(t);
 				}else if(t.getType()==3){
@@ -967,11 +971,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 			@Override
 			public int addOrderRefund(InputNewOrderRefund or) {
-				try {
-					or.setRefundTime(DateUtils.StringToDate(or.getRefundDate(), AFTConstants.YYYYMMDD));
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
+				or.setRefundTime(DateUtils.StringToDate(or.getRefundDate(), AFTConstants.YYYYMMDD));
 				return newOrderRefundMapper.insertSelective(or);
 			}
 

+ 1 - 5
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -586,11 +586,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		count +=t.getAlreadyNumber();
 		if(tt.getCommodityQuantity()<count)throw new BusinessException(new Error( "数量不能大于总量!" ,"数量不能大于总量!"));
 		tp.setAlreadyNumber(t.getAlreadyNumber());
-		try {
-			tp.setLicenceTime(DateUtils.StringToDate(t.getLicenceTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			 throw new BusinessException(new Error( "日期错误" ,"日期错误"));
-		}
+		tp.setLicenceTime(DateUtils.StringToDate(t.getLicenceTimes(), AFTConstants.YYYYMMDD));
 		tp.setTaskId(t.getTaskId());
 		return taskProgressMapper.insertSelective(tp);
 	}

+ 1 - 11
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -103,13 +103,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(t.getCorporateName()==null)t.setCorporateName("");
 		t.setCreateTime(new Date());
 		t.setStatus(0);
-		if(t.getReceivablesTimes()!=null) {
-			try {
-				t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-				throw new BusinessException("时间转换错误");
-			}
-		}
+		if(t.getReceivablesTimes()!=null) t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
 		return temporaryReceivablesMapper.insertSelective(t);
 	}
 	@Override
@@ -117,11 +111,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		t.setOrderNo(t.getOrderNo().trim());
 		t.setStatus(ReceivablesStatus.ZC.getCode());
 		if(t.getReceivablesTimes()!=null) {
-			try {
 				t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-				throw new BusinessException("时间转换错误");
-			}
 		}
 		return temporaryReceivablesMapper.updateByPrimaryKeySelective(t);
 	}

+ 18 - 52
src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java

@@ -53,12 +53,8 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			return res;
 		}
 		if ( !StringUtils.isBlank(i.getBirthdays())) {
-			try {
 				i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "出生日期", "出生日期"));
-				return res;
-			}
+			
 		}
 		return res.data(personnelService.addPersonnel(i));
 	}
@@ -87,14 +83,9 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
 	public Result updatePersonnel(InputPersonnelBo i){
 		Result res = new Result();
-		try {
-				if ( !StringUtils.isBlank(i.getBirthdays()))i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
-				if ( !StringUtils.isBlank(i.getEntryTimes()))i.setEntryTime(DateUtils.StringToDate(i.getEntryTimes(), AFTConstants.YYYYMMDD));
-				if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-				return res;
-			}
+		if ( !StringUtils.isBlank(i.getBirthdays()))i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
+		if ( !StringUtils.isBlank(i.getEntryTimes()))i.setEntryTime(DateUtils.StringToDate(i.getEntryTimes(), AFTConstants.YYYYMMDD));
+		if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updatePersonnel(i));
 	}
 	
@@ -126,12 +117,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
-		}
+		if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updatePromotion(i));
 	}
 	
@@ -145,13 +131,8 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getStartTimes()))i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
-			if ( !StringUtils.isBlank(i.getEndTimes()))i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
-		}
+		if ( !StringUtils.isBlank(i.getStartTimes()))i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
+		if ( !StringUtils.isBlank(i.getEndTimes()))i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updateContract(i));
 	}
 	
@@ -165,12 +146,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
-		}
+		if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updateChoose(i));
 	}
 	
@@ -184,12 +160,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
-		}
+		if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updateQuit(i));
 	}
 	
@@ -222,20 +193,15 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getStartTimes())) {
-				i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
-			}else {
-				i.setStartTime(null);
-			}
-			if ( !StringUtils.isBlank(i.getEndTimes())) {
-				i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
-			}else {
-				i.setEndTime(null);
-			}
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
+		if ( !StringUtils.isBlank(i.getStartTimes())) {
+			i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
+		}else {
+			i.setStartTime(null);
+		}
+		if ( !StringUtils.isBlank(i.getEndTimes())) {
+			i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
+		}else {
+			i.setEndTime(null);
 		}
 		return res.data(personnelService.updateWelfare(i));
 	}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -5,7 +5,7 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.username=dev
 #jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200511?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
 jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e