Explorar o código

Merge remote-tracking branch 'origin/dev' into test

anderx %!s(int64=6) %!d(string=hai) anos
pai
achega
3e253b14c5
Modificáronse 28 ficheiros con 2819 adicións e 2394 borrados
  1. 1 2
      GeneratorConfig.xml
  2. 2 2
      src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java
  3. 3 1
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  4. 14 12
      src/main/java/com/goafanti/common/dao/PatentNewMapper.java
  5. 19 38
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  6. 82 110
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  7. 43 22
      src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml
  8. 174 120
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  9. 83 60
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  10. 2 1
      src/main/java/com/goafanti/common/mapper/TTaskHoursMapper.xml
  11. 71 48
      src/main/java/com/goafanti/common/model/PatentNew.java
  12. 76 16
      src/main/java/com/goafanti/common/model/PatentNewExample.java
  13. 162 109
      src/main/java/com/goafanti/common/model/TOrderNew.java
  14. 274 154
      src/main/java/com/goafanti/common/model/TOrderNewExample.java
  15. 12 0
      src/main/java/com/goafanti/common/model/TOrderTask.java
  16. 1678 1589
      src/main/java/com/goafanti/common/model/TOrderTaskExample.java
  17. 66 91
      src/main/java/com/goafanti/common/task/PatentTask.java
  18. 4 1
      src/main/java/com/goafanti/common/utils/ExportExcelUtil.java
  19. 2 2
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  20. 7 0
      src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java
  21. 21 0
      src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java
  22. 0 1
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  23. 3 0
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  24. 3 7
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  25. 3 1
      src/main/java/com/goafanti/patent/service/PatentNewService.java
  26. 11 4
      src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java
  27. 2 2
      src/main/resources/props/config_local.properties
  28. 1 1
      src/main/resources/props/error.properties

+ 1 - 2
GeneratorConfig.xml

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

+ 2 - 2
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -196,8 +196,8 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		String cname=businessVarietiesMapper.getThisCname(cid);
 		BusinessCategory bv=businessVarietiesMapper.selectByPrimaryKey(s);
 		String sid="";
-		if(null!=bv.getSuperId())sid=bv.getSuperId();
-
+		if(bv!=null&&null!=bv.getSuperId())sid=bv.getSuperId();
+		if(null==cid)return "";
 		if (cid.length()>4) {
 			if(bv.getSuperId().equals(bv.getId())){
 				return "";

+ 3 - 1
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -115,9 +115,11 @@ public class AFTConstants {
 	/** 转公共客户拜访时限 **/
 	public static final long USER_FOLLOW_LIMIT_MS					= 24*3600*1000*30L;
 	/** 转公公共客户签单时限 **/
-	public static final long USER_SIGN_LIMIT_MS						= 24*3600*1000*270L;
+	public static final long USER_SIGN_LIMIT_MS						= 24*3600*1000*360L;
 	
 	public static final Integer USER_STATUS = 1;
+	/** 领取员工上线 **/
+	public static final Integer USER_RCEIVE_MAX= 9;
 	
 	
 	public static final String DEFAULT_CONTACT_TYPE="0";

+ 14 - 12
src/main/java/com/goafanti/common/dao/PatentNewMapper.java

@@ -9,69 +9,71 @@ public interface PatentNewMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	long countByExample(PatentNewExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	int deleteByExample(PatentNewExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	int insert(PatentNew record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	int insertSelective(PatentNew record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	List<PatentNew> selectByExample(PatentNewExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	PatentNew selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") PatentNew record, @Param("example") PatentNewExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	int updateByExample(@Param("record") PatentNew record, @Param("example") PatentNewExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	int updateByPrimaryKeySelective(PatentNew record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	int updateByPrimaryKey(PatentNew record);
 
-	List<PatentNew> AllselectPatentNew();
+	List<PatentNew> AllselectStartPatentNew();
+	
+	List<PatentNew> AllselectEndPatentNew();
 }

+ 19 - 38
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -12,94 +12,75 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderNewMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
-	int countByExample(TOrderNewExample example);
-
+	long countByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	int deleteByExample(TOrderNewExample example);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	int deleteByPrimaryKey(String orderNo);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	int insert(TOrderNew record);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	int insertSelective(TOrderNew record);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	List<TOrderNew> selectByExampleWithBLOBs(TOrderNewExample example);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	List<TOrderNew> selectByExample(TOrderNewExample example);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	TOrderNew selectByPrimaryKey(String orderNo);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
-	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
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
-	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
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
-	int updateByExample(@Param("record") TOrderNew record,
-			@Param("example") TOrderNewExample example);
-
+	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
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderNew record);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderNew record);
-
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderNew record);
-
-
-
-    TOrderNewBo getOrderNewDetail(String orderNo); 
+	TOrderNewBo getOrderNewDetail(String orderNo); 
     int getCountByIdAndStatus(TOrderNew orderNew);
     
     TOrderNewBo getSaleIdByOno(String ono);

+ 82 - 110
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -10,116 +10,88 @@ import org.apache.ibatis.annotations.Param;
 
 public interface TOrderTaskMapper {
     /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    long countByExample(TOrderTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int deleteByExample(TOrderTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int insert(TOrderTask record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int insertSelective(TOrderTask record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    List<TOrderTask> selectByExample(TOrderTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    TOrderTask selectByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int updateByPrimaryKeySelective(TOrderTask record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int updateByPrimaryKeyWithBLOBs(TOrderTask record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table t_order_task
-     *
-     * @mbg.generated Mon Nov 19 11:03:38 CST 2018
-     */
-    int updateByPrimaryKey(TOrderTask record);
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	long countByExample(TOrderTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int deleteByExample(TOrderTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int insert(TOrderTask record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int insertSelective(TOrderTask record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	List<TOrderTask> selectByExample(TOrderTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	TOrderTask selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TOrderTask record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
+	 * @mbg.generated  Sun May 05 08:49:10 CST 2019
+	 */
+	int updateByPrimaryKey(TOrderTask record);
 
 	List<TOrderTaskBo> selectOrderTask(String orderNo);
 

+ 43 - 22
src/main/java/com/goafanti/common/mapper/PatentNewMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="patent_no" jdbcType="VARCHAR" property="patentNo" />
@@ -23,12 +23,13 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="years" jdbcType="INTEGER" property="years" />
   </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 Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -62,7 +63,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -96,17 +97,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     id, patent_no, name, type, status, apply_date, authorization_date, patent_amount, 
     applicant, province, contact_mobile, email, certificate_url, create_time, update_time, 
-    aid
+    aid, years
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PatentNewExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     select
     <if test="distinct">
@@ -125,7 +126,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -136,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     delete from patent_new
     where id = #{id,jdbcType=INTEGER}
@@ -145,7 +146,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     delete from patent_new
     <if test="_parameter != null">
@@ -156,26 +157,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     insert into patent_new (id, patent_no, name, 
       type, status, apply_date, 
       authorization_date, patent_amount, applicant, 
       province, contact_mobile, email, 
       certificate_url, create_time, update_time, 
-      aid)
+      aid, years)
     values (#{id,jdbcType=INTEGER}, #{patentNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{type,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{applyDate,jdbcType=DATE}, 
       #{authorizationDate,jdbcType=DATE}, #{patentAmount,jdbcType=DECIMAL}, #{applicant,jdbcType=VARCHAR}, 
       #{province,jdbcType=INTEGER}, #{contactMobile,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
       #{certificateUrl,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{aid,jdbcType=VARCHAR})
+      #{aid,jdbcType=VARCHAR}, #{years,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PatentNew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     insert into patent_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -227,6 +228,9 @@
       <if test="aid != null">
         aid,
       </if>
+      <if test="years != null">
+        years,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -277,13 +281,16 @@
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="years != null">
+        #{years,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.PatentNewExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     select count(*) from patent_new
     <if test="_parameter != null">
@@ -294,7 +301,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     update patent_new
     <set>
@@ -346,6 +353,9 @@
       <if test="record.aid != null">
         aid = #{record.aid,jdbcType=VARCHAR},
       </if>
+      <if test="record.years != null">
+        years = #{record.years,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -355,7 +365,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     update patent_new
     set id = #{record.id,jdbcType=INTEGER},
@@ -373,7 +383,8 @@
       certificate_url = #{record.certificateUrl,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      aid = #{record.aid,jdbcType=VARCHAR}
+      aid = #{record.aid,jdbcType=VARCHAR},
+      years = #{record.years,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -382,7 +393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     update patent_new
     <set>
@@ -431,6 +442,9 @@
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="years != null">
+        years = #{years,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -438,7 +452,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Apr 24 13:38:43 CST 2019.
+      This element was generated on Wed May 08 14:33:37 CST 2019.
     -->
     update patent_new
     set patent_no = #{patentNo,jdbcType=VARCHAR},
@@ -455,7 +469,8 @@
       certificate_url = #{certificateUrl,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      aid = #{aid,jdbcType=VARCHAR}
+      aid = #{aid,jdbcType=VARCHAR},
+      years = #{years,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -485,8 +500,14 @@
 	</if>
 	</select>
 	
-	<select id="AllselectPatentNew" resultMap="BaseResultMap">
+	<select id="AllselectStartPatentNew" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from patent_new where status =0
+    </select>
+    <select id="AllselectEndPatentNew" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
-    from patent_new where status !=1</select>
+    from patent_new where status =1
+    </select>
 </mapper>

+ 174 - 120
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.goafanti.common.dao.TOrderNewMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_type" jdbcType="INTEGER" property="orderType" />
@@ -37,20 +37,23 @@
     <result column="legal_person_tel" jdbcType="VARCHAR" property="legalPersonTel" />
     <result column="proof_count" jdbcType="REAL" property="proofCount" />
     <result column="proof_aid" jdbcType="VARCHAR" property="proofAid" />
+    <result column="proof_time" jdbcType="TIMESTAMP" property="proofTime" />
+    <result column="proof_status" jdbcType="INTEGER" property="proofStatus" />
+    <result column="order_dep" jdbcType="VARCHAR" property="orderDep" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     <result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -82,9 +85,9 @@
   </sql>
   <sql id="Update_By_Example_Where_Clause">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -116,30 +119,30 @@
   </sql>
   <sql id="Base_Column_List">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     order_no, order_type, creater, create_time, update_time, buyer_id, first_amount, 
     total_amount, settlement_amount, refund_amount, order_status, liquidation_status, 
     process_status, project_status, approval, order_remarks, delete_sign, salesman_id, 
     finance_id, technician_id, sign_time, settlement_time, contract_no, contract_type, 
-    contacts, contact_mobile, legal_person, legal_person_tel, proof_count, proof_aid,
-    proof_time, proof_status
+    contacts, contact_mobile, legal_person, legal_person_tel, proof_count, proof_aid, 
+    proof_time, proof_status, order_dep
   </sql>
   <sql id="Blob_Column_List">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     contract_picture_url
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.TOrderNewExample" resultMap="ResultMapWithBLOBs">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     select
     <if test="distinct">
@@ -158,9 +161,9 @@
   </select>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultMap="BaseResultMap">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     select
     <if test="distinct">
@@ -177,9 +180,9 @@
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -190,18 +193,18 @@
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     delete from t_order_new
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </delete>
   <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderNewExample">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     delete from t_order_new
     <if test="_parameter != null">
@@ -210,9 +213,9 @@
   </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TOrderNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     insert into t_order_new (order_no, order_type, creater, 
       create_time, update_time, buyer_id, 
@@ -224,6 +227,7 @@
       settlement_time, contract_no, contract_type, 
       contacts, contact_mobile, legal_person, 
       legal_person_tel, proof_count, proof_aid, 
+      proof_time, proof_status, order_dep, 
       contract_picture_url)
     values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, 
@@ -235,13 +239,14 @@
       #{settlementTime,jdbcType=DATE}, #{contractNo,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR}, 
       #{contacts,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, #{legalPerson,jdbcType=VARCHAR}, 
       #{legalPersonTel,jdbcType=VARCHAR}, #{proofCount,jdbcType=REAL}, #{proofAid,jdbcType=VARCHAR}, 
+      #{proofTime,jdbcType=TIMESTAMP}, #{proofStatus,jdbcType=INTEGER}, #{orderDep,jdbcType=VARCHAR}, 
       #{contractPictureUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     insert into t_order_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -335,6 +340,15 @@
       <if test="proofAid != null">
         proof_aid,
       </if>
+      <if test="proofTime != null">
+        proof_time,
+      </if>
+      <if test="proofStatus != null">
+        proof_status,
+      </if>
+      <if test="orderDep != null">
+        order_dep,
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url,
       </if>
@@ -430,16 +444,25 @@
       <if test="proofAid != null">
         #{proofAid,jdbcType=VARCHAR},
       </if>
+      <if test="proofTime != null">
+        #{proofTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="proofStatus != null">
+        #{proofStatus,jdbcType=INTEGER},
+      </if>
+      <if test="orderDep != null">
+        #{orderDep,jdbcType=VARCHAR},
+      </if>
       <if test="contractPictureUrl != null">
         #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultType="java.lang.Integer">
+  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderNewExample" resultType="java.lang.Long">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     select count(*) from t_order_new
     <if test="_parameter != null">
@@ -448,9 +471,9 @@
   </select>
   <update id="updateByExampleSelective" parameterType="map">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     update t_order_new
     <set>
@@ -544,6 +567,15 @@
       <if test="record.proofAid != null">
         proof_aid = #{record.proofAid,jdbcType=VARCHAR},
       </if>
+      <if test="record.proofTime != null">
+        proof_time = #{record.proofTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.proofStatus != null">
+        proof_status = #{record.proofStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.orderDep != null">
+        order_dep = #{record.orderDep,jdbcType=VARCHAR},
+      </if>
       <if test="record.contractPictureUrl != null">
         contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -554,9 +586,9 @@
   </update>
   <update id="updateByExampleWithBLOBs" parameterType="map">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     update t_order_new
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -589,6 +621,9 @@
       legal_person_tel = #{record.legalPersonTel,jdbcType=VARCHAR},
       proof_count = #{record.proofCount,jdbcType=REAL},
       proof_aid = #{record.proofAid,jdbcType=VARCHAR},
+      proof_time = #{record.proofTime,jdbcType=TIMESTAMP},
+      proof_status = #{record.proofStatus,jdbcType=INTEGER},
+      order_dep = #{record.orderDep,jdbcType=VARCHAR},
       contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -596,9 +631,9 @@
   </update>
   <update id="updateByExample" parameterType="map">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     update t_order_new
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -630,16 +665,19 @@
       legal_person = #{record.legalPerson,jdbcType=VARCHAR},
       legal_person_tel = #{record.legalPersonTel,jdbcType=VARCHAR},
       proof_count = #{record.proofCount,jdbcType=REAL},
-      proof_aid = #{record.proofAid,jdbcType=VARCHAR}
+      proof_aid = #{record.proofAid,jdbcType=VARCHAR},
+      proof_time = #{record.proofTime,jdbcType=TIMESTAMP},
+      proof_status = #{record.proofStatus,jdbcType=INTEGER},
+      order_dep = #{record.orderDep,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     update t_order_new
     <set>
@@ -731,11 +769,14 @@
         proof_aid = #{proofAid,jdbcType=VARCHAR},
       </if>
       <if test="proofTime != null">
-        proof_time = #{proofTime,jdbcType=DATE},
+        proof_time = #{proofTime,jdbcType=TIMESTAMP},
       </if>
       <if test="proofStatus != null">
         proof_status = #{proofStatus,jdbcType=INTEGER},
       </if>
+      <if test="orderDep != null">
+        order_dep = #{orderDep,jdbcType=VARCHAR},
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -744,9 +785,9 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.goafanti.common.model.TOrderNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     update t_order_new
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -778,14 +819,17 @@
       legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
       proof_count = #{proofCount,jdbcType=REAL},
       proof_aid = #{proofAid,jdbcType=VARCHAR},
+      proof_time = #{proofTime,jdbcType=TIMESTAMP},
+      proof_status = #{proofStatus,jdbcType=INTEGER},
+      order_dep = #{orderDep,jdbcType=VARCHAR},
       contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderNew">
     <!--
-      WARNING - @mbggenerated
+      WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Nov 23 15:27:45 CST 2018.
+      This element was generated on Mon May 06 11:18:39 CST 2019.
     -->
     update t_order_new
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -816,66 +860,71 @@
       legal_person = #{legalPerson,jdbcType=VARCHAR},
       legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
       proof_count = #{proofCount,jdbcType=REAL},
-      proof_aid = #{proofAid,jdbcType=VARCHAR}
+      proof_aid = #{proofAid,jdbcType=VARCHAR},
+      proof_time = #{proofTime,jdbcType=TIMESTAMP},
+      proof_status = #{proofStatus,jdbcType=INTEGER},
+      order_dep = #{orderDep,jdbcType=VARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
   
    <!-- 查看所有待财务管理员分配的订单数据 -->
   <select id="getAllUnassignedListOrder" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
   	select * from (
-  	select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus,
+  	  select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus,
   	o.sign_time as signTime, u.nickname as buyerName,o.total_amount signTotalAmount, o.approval , a.name sellerName
-  	,liquidation_status,o.finance_id as financeId,contract_no as contractNo
+  	,liquidation_status,o.finance_id as financeId,contract_no as contractNo,d.name as departmentName
   	from t_order_new o 
   	left join `user` u on o.buyer_id = u.id
   	left join admin a on o.salesman_id = a.id
+  	left join department d on o.order_dep=d.id
   	where delete_sign = 0
   	and order_status = 2
   	<if test="o.processStatus == 2">
   	and process_status = #{o.processStatus,jdbcType=INTEGER}
   	</if>
   	<if test="o.processStatus == 3">
-  	and process_status >= #{o.processStatus,jdbcType=INTEGER}
+  	and process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
   	</if>
   	<if test="o.processStatus == null or o.processStatus ==''">
-  	and process_status >= 2
+  	and process_status &gt;= 2
   	</if>
-  	<if test='o.orderNo != null and o.orderNo != ""'>
+  	<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
   	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.financeId != null and o.financeId != ""'>
+  	<if test="o.financeId != null and o.financeId != &quot;&quot;">
   	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.buyerName != null and o.buyerName != ""'>
-  	<bind name="n" value="'%' + o.buyerName + '%'"/>
+  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
+  	<bind name="n" value="'%' + o.buyerName + '%'" />
   	and u.nickname  like #{n,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
-  	<bind name="a" value="o.startTime + ' 00:00:00'"/>
-  	<bind name="b" value="o.endTime + ' 23:59:59'"/>
+  	<if test="o.startTime != null and o.startTime != &quot;&quot; and o.endTime != null and o.endTime != &quot;&quot;">
+  	<bind name="a" value="o.startTime + ' 00:00:00'" />
+  	<bind name="b" value="o.endTime + ' 23:59:59'" />
   	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
   	union 
-	select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus, 
+	  	select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus, 
 	o.sign_time as signTime, u.nickname as buyerName,o.total_amount signTotalAmount, o.approval , a.name sellerName
-	,liquidation_status ,o.finance_id as financeId,contract_no as contractNo
+	,liquidation_status ,o.finance_id as financeId,contract_no as contractNo,d.name as departmentName
 	from t_order_new o 
 	left join `user` u on o.buyer_id = u.id 
 	left join admin a on o.salesman_id = a.id 
+	left join department d on o.order_dep=d.id
 	where delete_sign = 0 and approval = 2 and finance_id is null and order_status = 2
-  	<if test='o.orderNo != null and o.orderNo != ""'>
+  	<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
   	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.financeId != null and o.financeId != ""'>
+  	<if test="o.financeId != null and o.financeId != &quot;&quot;">
   	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.buyerName != null and o.buyerName != ""'>
-  	<bind name="n" value="'%' + o.buyerName + '%'"/>
+  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
+  	<bind name="n" value="'%' + o.buyerName + '%'" />
   	and u.nickname  like #{n,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
-  	<bind name="a" value="o.startTime + ' 00:00:00'"/>
-  	<bind name="b" value="o.endTime + ' 23:59:59'"/>
+  	<if test="o.startTime != null and o.startTime != &quot;&quot; and o.endTime != null and o.endTime != &quot;&quot;">
+  	<bind name="a" value="o.startTime + ' 00:00:00'" />
+  	<bind name="b" value="o.endTime + ' 23:59:59'" />
   	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
 )oo
@@ -896,24 +945,24 @@
   	and process_status = #{o.processStatus,jdbcType=INTEGER}
   	</if>
   	<if test="o.processStatus == 3">
-  	and process_status >= #{o.processStatus,jdbcType=INTEGER}
+  	and process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
   	</if>
   	<if test="o.processStatus == null or o.processStatus ==''">
-  	and process_status >= 2
+  	and process_status &gt;= 2
   	</if>
-  	<if test='o.orderNo != null and o.orderNo != ""'>
+  	<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
   	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.financeId != null and o.financeId != ""'>
+  	<if test="o.financeId != null and o.financeId != &quot;&quot;">
   	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.buyerName != null and o.buyerName != ""'>
-  	<bind name="n" value="'%' + o.buyerName + '%'"/>
+  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
+  	<bind name="n" value="'%' + o.buyerName + '%'" />
   	and u.nickname  like #{n,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
-  	<bind name="a" value="o.startTime + ' 00:00:00'"/>
-  	<bind name="b" value="o.endTime + ' 23:59:59'"/>
+  	<if test="o.startTime != null and o.startTime != &quot;&quot; and o.endTime != null and o.endTime != &quot;&quot;">
+  	<bind name="a" value="o.startTime + ' 00:00:00'" />
+  	<bind name="b" value="o.endTime + ' 23:59:59'" />
   	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
   	union 
@@ -922,19 +971,19 @@
 	left join `user` u on o.buyer_id = u.id 
 	left join admin a on o.salesman_id = a.id 
 	where delete_sign = 0 and approval = 2 and finance_id is null and order_status = 2
-  	<if test='o.orderNo != null and o.orderNo != ""'>
+  	<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
   	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.financeId != null and o.financeId != ""'>
+  	<if test="o.financeId != null and o.financeId != &quot;&quot;">
   	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.buyerName != null and o.buyerName != ""'>
-  	<bind name="n" value="'%' + o.buyerName + '%'"/>
+  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
+  	<bind name="n" value="'%' + o.buyerName + '%'" />
   	and u.nickname  like #{n,jdbcType=VARCHAR}
   	</if>
-  	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
-  	<bind name="a" value="o.startTime + ' 00:00:00'"/>
-  	<bind name="b" value="o.endTime + ' 23:59:59'"/>
+  	<if test="o.startTime != null and o.startTime != &quot;&quot; and o.endTime != null and o.endTime != &quot;&quot;">
+  	<bind name="a" value="o.startTime + ' 00:00:00'" />
+  	<bind name="b" value="o.endTime + ' 23:59:59'" />
   	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
   	</if>
 )oo
@@ -1012,46 +1061,47 @@
   </select>
   <!-- 财务专员查看需要待收款的数据 -->
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
-  select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,
+   select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,
    o.process_status as processStatus,ifnull(b.amount,0) as actuallyTotalAmount, o.contract_no as contractNo,o.approval,
   a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus , 
   o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,o.create_time as createTime,
-  0 as companyId, "湖南科德信息咨询有限公司" as companyName
+  0 as companyId, "湖南科德信息咨询有限公司" as companyName,d.name as departmentName
   	 from t_order_new o 
+  	 left join department d on o.order_dep=d.id
   	 left join `user` u on o.buyer_id = u.id 
   	 left join admin a on o.salesman_id = a.id
   	 left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new
   				group by order_no ) b on b.order_no = o.order_no
   	 where delete_sign = 0
-  	 	<if test='o.processStatus == 3'>
+  	 	<if test="o.processStatus == 3">
 	  	and process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
-	  	<if test='o.processStatus == 4'>
-	  	and process_status >= #{o.processStatus,jdbcType=INTEGER}
+	  	<if test="o.processStatus == 4">
+	  	and process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
   		and process_status
   		and (approval = 0 or approval = 2)
 	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
-  		<if test='o.orderStatus != null and o.orderStatus != ""'>
+  		<if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
 	  	and o.order_status = #{o.orderStatus,jdbcType=INTEGER}
 	  	</if>
-  		<if test='o.departmentId != null and o.departmentId != ""'>
-	  	and a.department_id = #{o.departmentId,jdbcType=INTEGER}
+  		<if test="o.departmentId != null and o.departmentId != &quot;&quot;">
+	  	and o.order_dep = #{o.departmentId,jdbcType=INTEGER}
 	  	</if>
-  		<if test='o.liquidationStatus != null and o.liquidationStatus != ""'>
+  		<if test="o.liquidationStatus != null and o.liquidationStatus != &quot;&quot;">
 	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=INTEGER}
 	  	</if>
   		
-  		<if test='o.orderNo != null and o.orderNo != ""'>
+  		<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
-	  	<if test='o.buyerName != null and o.buyerName != ""'>
-	  	<bind name="n" value="'%' + o.buyerName + '%'"/>
+	  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
+	  	<bind name="n" value="'%' + o.buyerName + '%'" />
 	  	and u.nickname  like #{n,jdbcType=VARCHAR}
 	  	</if>
-	  	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
-	  	<bind name="a" value="o.startTime + ' 00:00:00'"/>
-	  	<bind name="b" value="o.endTime + ' 23:59:59'"/>
+	  	<if test="o.startTime != null and o.startTime != &quot;&quot; and o.endTime != null and o.endTime != &quot;&quot;">
+	  	<bind name="a" value="o.startTime + ' 00:00:00'" />
+	  	<bind name="b" value="o.endTime + ' 23:59:59'" />
 	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>
 	  	order by o.liquidation_status, o.sign_time desc
@@ -1067,38 +1117,38 @@
   	 left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new
   				group by order_no ) b on b.order_no = o.order_no
   	 where delete_sign = 0
-  		<if test='o.processStatus == 3'>
+  		<if test="o.processStatus == 3">
 	  	and process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
-	  	<if test='o.processStatus == 4'>
-	  	and process_status >= #{o.processStatus,jdbcType=INTEGER}
+	  	<if test="o.processStatus == 4">
+	  	and process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
   		and (approval = 0 or approval = 2)
 	  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
-	  	<if test='o.orderStatus != null and o.orderStatus != ""'>
+	  	<if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
 	  	and o.order_status = #{o.orderStatus,jdbcType=INTEGER}
 	  	</if>
-	  	<if test='o.departmentId != null and o.departmentId != ""'>
-	  	and a.department_id = #{o.departmentId,jdbcType=INTEGER}
+	  	<if test="o.departmentId != null and o.departmentId != &quot;&quot;">
+	  	and o.order_dep = #{o.departmentId,jdbcType=INTEGER}
 	  	</if>
-	  	<if test='o.liquidationStatus != null and o.liquidationStatus != ""'>
+	  	<if test="o.liquidationStatus != null and o.liquidationStatus != &quot;&quot;">
 	  	and o.liquidation_status = #{o.liquidationStatus,jdbcType=VARCHAR}
 	  	</if>
-  		<if test='o.orderNo != null and o.orderNo != ""'>
+  		<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
-	  	<if test='o.buyerName != null and o.buyerName != ""'>
-	  	<bind name="n" value="'%' + o.buyerName + '%'"/>
+	  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
+	  	<bind name="n" value="'%' + o.buyerName + '%'" />
 	  	and u.nickname  like #{n,jdbcType=VARCHAR}
 	  	</if>
-	  	<if test='o.startTime != null and o.startTime != "" and o.endTime != null and o.endTime != ""'>
-	  	<bind name="a" value="o.startTime + ' 00:00:00'"/>
-	  	<bind name="b" value="o.endTime + ' 23:59:59'"/>
+	  	<if test="o.startTime != null and o.startTime != &quot;&quot; and o.endTime != null and o.endTime != &quot;&quot;">
+	  	<bind name="a" value="o.startTime + ' 00:00:00'" />
+	  	<bind name="b" value="o.endTime + ' 23:59:59'" />
 	  	and o.create_time between #{a,jdbcType=VARCHAR} and #{b,jdbcType=VARCHAR}
 	  	</if>
   </select>
   <!-- 通过订单编号获得订单的负责人(营销员) -->
-  <select id="getSaleIdByOno" resultType="com.goafanti.order.bo.TOrderNewBo" parameterType="java.lang.String">
+  <select id="getSaleIdByOno" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
   	select salesman_id as salesmanId, a.name as salesmanName, a.email ,u.nickname as userName
   	from t_order_new o
   		left join admin a on o.salesman_id = a.id 
@@ -1118,7 +1168,7 @@
   	</if>
   	from t_order_new a  left join `user` b on a.buyer_id=b.id 
   	left join admin c on a.salesman_id=c.id
-  	left join department dep on c.department_id=dep.id
+  	left join department dep on a.order_dep=dep.id
   	left join admin d on a.finance_id=d.id
   	<if test="specially == 2">
 	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
@@ -1138,7 +1188,7 @@ where super_id is null )  e on e.order_no=a.order_no
   	and a.process_status =1  and a.order_status=1
   	<!-- and c.department_id in (#{deps,jdbcType=VARCHAR}) -->
   	and c.department_id in
-  	<foreach collection="deps" item="deps" open="(" separator="," close=")">
+  	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}
   	</foreach>
   	</if>
@@ -1156,7 +1206,7 @@ where super_id is null )  e on e.order_no=a.order_no
   	</if>
   	<if test="specially == 5">
   	and c.department_id in
-  	<foreach collection="deps" item="deps" open="(" separator="," close=")">
+  	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}
   	</foreach>
   	</if>
@@ -1202,6 +1252,7 @@ where super_id is null )  e on e.order_no=a.order_no
   		count(*)
   	from t_order_new a  left join `user` b on a.buyer_id=b.id
   	left join admin c on a.salesman_id=c.id
+  	left join department dep on a.order_dep=dep.id
   	left join admin d on a.finance_id=d.id
   	<if test="specially == 2">
 	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
@@ -1220,7 +1271,7 @@ where super_id is null ) e on e.order_no=a.order_no
   	<if test="specially == 1">
   	and a.process_status =1  and a.order_status=1
   	and c.department_id in
-  	<foreach collection="deps" item="deps" open="(" separator="," close=")">
+  	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}
   	</foreach>
   	</if>
@@ -1238,7 +1289,7 @@ where super_id is null ) e on e.order_no=a.order_no
   	</if>
   	<if test="specially == 5">
   	and c.department_id in
-  	<foreach collection="deps" item="deps" open="(" separator="," close=")">
+  	<foreach close=")" collection="deps" item="deps" open="(" separator=",">
 	 #{deps.id}
   	</foreach>
   	</if>
@@ -1257,6 +1308,9 @@ where super_id is null ) e on e.order_no=a.order_no
   	<if test="orderNo != null">
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
+  	<if test="depId != null">
+  	and dep.id = #{depId,jdbcType=VARCHAR}
+  	</if>
   	<if test="starTime !=null and endTime !=null">
   	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
@@ -1326,18 +1380,18 @@ where super_id is null ) e on e.order_no=a.order_no
   </select>
   
   <select id="getOrderNewDetail" parameterType="java.lang.String" resultType="com.goafanti.order.bo.TOrderNewBo">
-     select 
+      select 
     a.order_no as orderNo, a.order_type as orderType, a.creater, a.create_time as createTime,a.update_time as updateTime, a.buyer_id as buyerId, a.first_amount as firstAmount, 
     a.total_amount as totalAmount, a.settlement_amount as settlementAmount, order_status as orderStatus, a.liquidation_status as liquidationStatus, a.process_status as processStatus, 
     a.project_status as projectStatus, a.approval, a.order_remarks as orderRemarks, a.delete_sign as deleteSign, a.salesman_id as salesmanId, finance_id as financeId, technician_id as technicianId, 
     a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts, a.contact_mobile as contactMobile, 
     a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount, a.proof_aid as proofAid,contract_picture_url as contractPictureUrl,
     c.name as salesmanName,dep.name as depName,d.name as financeName,c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName
-    ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid
+    ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep
     from t_order_new a
     left join `user` b on a.buyer_id=b.id
     left join admin c on a.salesman_id=c.id
-    left join department dep on c.department_id=dep.id
+    left join department dep on a.order_dep=dep.id
   	left join admin d on a.finance_id=d.id
   	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
   	left join admin f on e.initiate=f.id
@@ -1413,4 +1467,4 @@ where super_id is null ) e on e.order_no=a.order_no
 	where order_no= #{orderNo,jdbcType=VARCHAR}
 	and finance_id= #{aid,jdbcType=VARCHAR}
   </update>
-</mapper>
+</mapper>

+ 83 - 60
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -5,10 +5,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="main" jdbcType="INTEGER" property="main" />
     <result column="super_id" jdbcType="VARCHAR" property="superId" />
     <result column="commodity_id" jdbcType="VARCHAR" property="commodityId" />
     <result column="commodity_name" jdbcType="VARCHAR" property="commodityName" />
@@ -23,19 +24,17 @@
     <result column="task_start_time" jdbcType="TIMESTAMP" property="taskStartTime" />
     <result column="task_end_time" jdbcType="TIMESTAMP" property="taskEndTime" />
     <result column="project_status" jdbcType="INTEGER" property="projectStatus" />
-    <result column="main" jdbcType="INTEGER" property="main" />
     <result column="accept_time" jdbcType="DATE" property="acceptTime" />
     <result column="review_time" jdbcType="DATE" property="reviewTime" />
     <result column="publicity_time" jdbcType="DATE" property="publicityTime" />
     <result column="licence_time" jdbcType="DATE" property="licenceTime" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="certificate_number" jdbcType="VARCHAR" property="certificateNumber" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -43,7 +42,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -77,7 +76,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -111,18 +110,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
-    id, order_no, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
+    id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
     task_comment, task_start_time, task_end_time, project_status, accept_time, review_time, 
-    publicity_time, licence_time ,main
+    publicity_time, licence_time, certificate_number
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     attachment_url
   </sql>
@@ -130,7 +129,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     select
     <if test="distinct">
@@ -151,7 +150,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     select
     <if test="distinct">
@@ -170,7 +169,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -183,7 +182,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -192,7 +191,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -203,30 +202,30 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
-    insert into t_order_task (id, order_no, super_id, 
-      commodity_id, commodity_name, commodity_quantity, 
-      commodity_mode, commodity_price, task_status, 
-      task_distribution_time, task_allocator, 
+    insert into t_order_task (id, order_no, main, 
+      super_id, commodity_id, commodity_name, 
+      commodity_quantity, commodity_mode, commodity_price, 
+      task_status, task_distribution_time, task_allocator, 
       task_receiver, task_comment, task_start_time, 
       task_end_time, project_status, accept_time, 
       review_time, publicity_time, licence_time, 
-      attachment_url,main)
-    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{superId,jdbcType=VARCHAR}, 
-      #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, 
-      #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, #{taskStatus,jdbcType=INTEGER}, 
-      #{taskDistributionTime,jdbcType=TIMESTAMP}, #{taskAllocator,jdbcType=VARCHAR}, 
+      certificate_number, attachment_url)
+    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, 
+      #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
+      #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, 
+      #{taskStatus,jdbcType=INTEGER}, #{taskDistributionTime,jdbcType=TIMESTAMP}, #{taskAllocator,jdbcType=VARCHAR}, 
       #{taskReceiver,jdbcType=VARCHAR}, #{taskComment,jdbcType=VARCHAR}, #{taskStartTime,jdbcType=TIMESTAMP}, 
       #{taskEndTime,jdbcType=TIMESTAMP}, #{projectStatus,jdbcType=INTEGER}, #{acceptTime,jdbcType=DATE}, 
       #{reviewTime,jdbcType=DATE}, #{publicityTime,jdbcType=DATE}, #{licenceTime,jdbcType=DATE}, 
-      #{attachmentUrl,jdbcType=LONGVARCHAR},#{main,jdbcType=INTEGER})
+      #{certificateNumber,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -236,6 +235,9 @@
       <if test="orderNo != null">
         order_no,
       </if>
+      <if test="main != null">
+        main,
+      </if>
       <if test="superId != null">
         super_id,
       </if>
@@ -290,12 +292,12 @@
       <if test="licenceTime != null">
         licence_time,
       </if>
+      <if test="certificateNumber != null">
+        certificate_number,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
-      <if test="main != null">
-        main,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -304,6 +306,9 @@
       <if test="orderNo != null">
         #{orderNo,jdbcType=VARCHAR},
       </if>
+      <if test="main != null">
+        #{main,jdbcType=INTEGER},
+      </if>
       <if test="superId != null">
         #{superId,jdbcType=VARCHAR},
       </if>
@@ -358,19 +363,19 @@
       <if test="licenceTime != null">
         #{licenceTime,jdbcType=DATE},
       </if>
+      <if test="certificateNumber != null">
+        #{certificateNumber,jdbcType=VARCHAR},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
-      <if test="main != null">
-        #{main,jdbcType=INTEGER},
-      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -381,7 +386,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     update t_order_task
     <set>
@@ -391,6 +396,9 @@
       <if test="record.orderNo != null">
         order_no = #{record.orderNo,jdbcType=VARCHAR},
       </if>
+      <if test="record.main != null">
+        main = #{record.main,jdbcType=INTEGER},
+      </if>
       <if test="record.superId != null">
         super_id = #{record.superId,jdbcType=VARCHAR},
       </if>
@@ -445,6 +453,9 @@
       <if test="record.licenceTime != null">
         licence_time = #{record.licenceTime,jdbcType=DATE},
       </if>
+      <if test="record.certificateNumber != null">
+        certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -457,11 +468,12 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
+      main = #{record.main,jdbcType=INTEGER},
       super_id = #{record.superId,jdbcType=VARCHAR},
       commodity_id = #{record.commodityId,jdbcType=VARCHAR},
       commodity_name = #{record.commodityName,jdbcType=VARCHAR},
@@ -480,6 +492,7 @@
       review_time = #{record.reviewTime,jdbcType=DATE},
       publicity_time = #{record.publicityTime,jdbcType=DATE},
       licence_time = #{record.licenceTime,jdbcType=DATE},
+      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -489,11 +502,12 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
+      main = #{record.main,jdbcType=INTEGER},
       super_id = #{record.superId,jdbcType=VARCHAR},
       commodity_id = #{record.commodityId,jdbcType=VARCHAR},
       commodity_name = #{record.commodityName,jdbcType=VARCHAR},
@@ -511,7 +525,8 @@
       accept_time = #{record.acceptTime,jdbcType=DATE},
       review_time = #{record.reviewTime,jdbcType=DATE},
       publicity_time = #{record.publicityTime,jdbcType=DATE},
-      licence_time = #{record.licenceTime,jdbcType=DATE}
+      licence_time = #{record.licenceTime,jdbcType=DATE},
+      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -520,13 +535,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     update t_order_task
     <set>
       <if test="orderNo != null">
         order_no = #{orderNo,jdbcType=VARCHAR},
       </if>
+      <if test="main != null">
+        main = #{main,jdbcType=INTEGER},
+      </if>
       <if test="superId != null">
         super_id = #{superId,jdbcType=VARCHAR},
       </if>
@@ -581,11 +599,14 @@
       <if test="licenceTime != null">
         licence_time = #{licenceTime,jdbcType=DATE},
       </if>
+      <if test="certificateNumber != null">
+        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
-      <if test="main != null">
-        main = #{main,jdbcType=INTEGER},
+      <if test="certificateNumber != null">
+        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -594,10 +615,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
+      main = #{main,jdbcType=INTEGER},
       super_id = #{superId,jdbcType=VARCHAR},
       commodity_id = #{commodityId,jdbcType=VARCHAR},
       commodity_name = #{commodityName,jdbcType=VARCHAR},
@@ -616,18 +638,19 @@
       review_time = #{reviewTime,jdbcType=DATE},
       publicity_time = #{publicityTime,jdbcType=DATE},
       licence_time = #{licenceTime,jdbcType=DATE},
-      attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
-      main = #{main,jdbcType=INTEGER}
+      certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Nov 19 11:03:38 CST 2018.
+      This element was generated on Sun May 05 08:49:10 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
+      main = #{main,jdbcType=INTEGER},
       super_id = #{superId,jdbcType=VARCHAR},
       commodity_id = #{commodityId,jdbcType=VARCHAR},
       commodity_name = #{commodityName,jdbcType=VARCHAR},
@@ -646,14 +669,14 @@
       review_time = #{reviewTime,jdbcType=DATE},
       publicity_time = #{publicityTime,jdbcType=DATE},
       licence_time = #{licenceTime,jdbcType=DATE},
-      main = #{main,jdbcType=INTEGER}
+      certificate_number = #{certificateNumber,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="selectOrderTask"  resultType="com.goafanti.order.bo.TOrderTaskBo">
+  <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
   	select 
   		a.id,a.order_no as orderNo,a.commodity_name as commodityName,a.commodity_id as commodityId,
   		a.commodity_quantity as commodityQuantity,a.commodity_price as commodityPrice,a.task_comment as taskComment,
-  		a.task_status as taskStatus,a.project_status as projectStatus,a.main,a.task_receiver as taskReceiver ,
+  		a.task_status as taskStatus,a.project_status as projectStatus,a.main,a.task_receiver as taskReceiver ,a.certificate_number as certificateNumber,
   		d.name as contacts,d.contact_mobile as contactsMobile,c.cname
   	 from t_order_task a left join business_project b on a.commodity_id=b.id
   	 left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
@@ -670,8 +693,7 @@
     left join admin d on a.task_receiver=d.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
-    left join admin g on e.salesman_id=g.id
-    left join department h on g.department_id=h.id
+    left join department h on e.order_dep=h.id
     where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
@@ -688,7 +710,7 @@
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="depId != null">
-  	and g.department_id= #{depId,jdbcType=VARCHAR}
+  	and e.order_dep= #{depId,jdbcType=VARCHAR}
   	</if>
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
@@ -734,7 +756,7 @@
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="depId != null">
-  	and g.department_id= #{depId,jdbcType=VARCHAR}
+  	and e.order_dep= #{depId,jdbcType=VARCHAR}
   	</if>
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
@@ -756,7 +778,7 @@
   select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,
     a.project_status as projectStatus,a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,
-	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,
+	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.certificate_number as certificateNumber,
 	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
@@ -769,14 +791,15 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join admin g on e.salesman_id=g.id
     where a.id= #{id,jdbcType=VARCHAR}
   </select>
-  <select id="selectBySuperId"  resultType="com.goafanti.common.model.TOrderTask">
+  <select id="selectBySuperId" resultType="com.goafanti.common.model.TOrderTask">
      select super_id as superId,min(task_status) as taskStatus,min(project_status) as projectStatus,max(main) as main  from t_order_task
     where super_id = #{superId,jdbcType=VARCHAR} group by super_id
   </select>
   
    <select id="selectTaskHoursListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
   	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,
-    a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity
+    a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity,
+    e.contract_no as contractNo,date_format(e.create_time,'%Y-%m-%d %H:%I:%S')as creteTime,date_format(e.sign_time,'%Y-%m-%d')as signTime
   	from t_order_task a left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id
@@ -830,7 +853,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
     left join admin g on e.salesman_id=g.id
-    left join department h on g.department_id=h.id
+    left join department h on e.order_dep=h.id
     where e.delete_sign=0 
     and x.task_receiver= #{aid,jdbcType=VARCHAR}
     <if test="orderNo != null">
@@ -843,7 +866,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="depId != null">
-  	and g.department_id= #{depId ,jdbcType=VARCHAR}
+  	and e.order_dep= #{depId ,jdbcType=VARCHAR}
   	</if>
   	<if test="taskId != null">
   	and a.id= #{taskId,jdbcType=VARCHAR}
@@ -875,7 +898,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
   	<if test="depId != null">
-  	and g.department_id= #{depId ,jdbcType=VARCHAR}
+  	and e.order_dep= #{depId ,jdbcType=VARCHAR}
   	</if>
   	<if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
@@ -900,4 +923,4 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     update t_order_task set task_allocator= #{aid,jdbcType=VARCHAR},task_receiver= #{transferId,jdbcType=VARCHAR}
 	where task_receiver=#{aid,jdbcType=VARCHAR}
   </update>
-</mapper>
+</mapper>

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

@@ -322,7 +322,8 @@
   </select>
   <select id="getTaskHoursData" resultType="com.goafanti.order.bo.TOrderTaskListBo">
   select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,dep.name as depName,
-    a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity
+    a.task_status as taskStatus,f.nickname as userName,ifnull(g.hours,0) as hours,a.commodity_quantity as commodityQuantity,
+    e.contract_no as contractNo,date_format(e.create_time,'%Y-%m-%d %H:%I:%S')as creteTime,date_format(e.sign_time,'%Y-%m-%d')as signTime
   	from t_order_task a left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id

+ 71 - 48
src/main/java/com/goafanti/common/model/PatentNew.java

@@ -7,89 +7,94 @@ public class PatentNew {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.id
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.patent_no
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private String patentNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.name
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.type
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.status
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.apply_date
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private Date applyDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.authorization_date
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private Date authorizationDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.patent_amount
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private BigDecimal patentAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.applicant
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private String applicant;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.province
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private Integer province;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.contact_mobile
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private String contactMobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.email
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private String email;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.certificate_url
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private String certificateUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.create_time
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.update_time
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.aid
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column patent_new.years
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
+	 */
+	private Integer years;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.id
 	 * @return  the value of patent_new.id
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -98,7 +103,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.id
 	 * @param id  the value for patent_new.id
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -107,7 +112,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.patent_no
 	 * @return  the value of patent_new.patent_no
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public String getPatentNo() {
 		return patentNo;
@@ -116,7 +121,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.patent_no
 	 * @param patentNo  the value for patent_new.patent_no
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setPatentNo(String patentNo) {
 		this.patentNo = patentNo;
@@ -125,7 +130,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.name
 	 * @return  the value of patent_new.name
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public String getName() {
 		return name;
@@ -134,7 +139,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.name
 	 * @param name  the value for patent_new.name
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -143,7 +148,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.type
 	 * @return  the value of patent_new.type
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Integer getType() {
 		return type;
@@ -152,7 +157,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.type
 	 * @param type  the value for patent_new.type
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -161,7 +166,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.status
 	 * @return  the value of patent_new.status
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -170,7 +175,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.status
 	 * @param status  the value for patent_new.status
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -179,7 +184,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.apply_date
 	 * @return  the value of patent_new.apply_date
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Date getApplyDate() {
 		return applyDate;
@@ -188,7 +193,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.apply_date
 	 * @param applyDate  the value for patent_new.apply_date
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setApplyDate(Date applyDate) {
 		this.applyDate = applyDate;
@@ -197,7 +202,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.authorization_date
 	 * @return  the value of patent_new.authorization_date
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Date getAuthorizationDate() {
 		return authorizationDate;
@@ -206,7 +211,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.authorization_date
 	 * @param authorizationDate  the value for patent_new.authorization_date
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setAuthorizationDate(Date authorizationDate) {
 		this.authorizationDate = authorizationDate;
@@ -215,7 +220,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.patent_amount
 	 * @return  the value of patent_new.patent_amount
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public BigDecimal getPatentAmount() {
 		return patentAmount;
@@ -224,7 +229,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.patent_amount
 	 * @param patentAmount  the value for patent_new.patent_amount
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setPatentAmount(BigDecimal patentAmount) {
 		this.patentAmount = patentAmount;
@@ -233,7 +238,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.applicant
 	 * @return  the value of patent_new.applicant
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public String getApplicant() {
 		return applicant;
@@ -242,7 +247,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.applicant
 	 * @param applicant  the value for patent_new.applicant
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setApplicant(String applicant) {
 		this.applicant = applicant;
@@ -251,7 +256,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.province
 	 * @return  the value of patent_new.province
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Integer getProvince() {
 		return province;
@@ -260,7 +265,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.province
 	 * @param province  the value for patent_new.province
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -269,7 +274,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.contact_mobile
 	 * @return  the value of patent_new.contact_mobile
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -278,7 +283,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.contact_mobile
 	 * @param contactMobile  the value for patent_new.contact_mobile
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -287,7 +292,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.email
 	 * @return  the value of patent_new.email
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public String getEmail() {
 		return email;
@@ -296,7 +301,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.email
 	 * @param email  the value for patent_new.email
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setEmail(String email) {
 		this.email = email;
@@ -305,7 +310,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.certificate_url
 	 * @return  the value of patent_new.certificate_url
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public String getCertificateUrl() {
 		return certificateUrl;
@@ -314,7 +319,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.certificate_url
 	 * @param certificateUrl  the value for patent_new.certificate_url
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setCertificateUrl(String certificateUrl) {
 		this.certificateUrl = certificateUrl;
@@ -323,7 +328,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.create_time
 	 * @return  the value of patent_new.create_time
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -332,7 +337,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.create_time
 	 * @param createTime  the value for patent_new.create_time
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -341,7 +346,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.update_time
 	 * @return  the value of patent_new.update_time
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -350,7 +355,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.update_time
 	 * @param updateTime  the value for patent_new.update_time
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -359,7 +364,7 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.aid
 	 * @return  the value of patent_new.aid
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public String getAid() {
 		return aid;
@@ -368,9 +373,27 @@ public class PatentNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.aid
 	 * @param aid  the value for patent_new.aid
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column patent_new.years
+	 * @return  the value of patent_new.years
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
+	 */
+	public Integer getYears() {
+		return years;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column patent_new.years
+	 * @param years  the value for patent_new.years
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
+	 */
+	public void setYears(Integer years) {
+		this.years = years;
+	}
 }

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

@@ -9,23 +9,23 @@ import java.util.List;
 public class PatentNewExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public PatentNewExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class PatentNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class PatentNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1220,11 +1220,71 @@ public class PatentNewExample {
 			addCriterion("aid not between", value1, value2, "aid");
 			return (Criteria) this;
 		}
+
+		public Criteria andYearsIsNull() {
+			addCriterion("years is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsIsNotNull() {
+			addCriterion("years is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsEqualTo(Integer value) {
+			addCriterion("years =", value, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsNotEqualTo(Integer value) {
+			addCriterion("years <>", value, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsGreaterThan(Integer value) {
+			addCriterion("years >", value, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsGreaterThanOrEqualTo(Integer value) {
+			addCriterion("years >=", value, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsLessThan(Integer value) {
+			addCriterion("years <", value, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsLessThanOrEqualTo(Integer value) {
+			addCriterion("years <=", value, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsIn(List<Integer> values) {
+			addCriterion("years in", values, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsNotIn(List<Integer> values) {
+			addCriterion("years not in", values, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsBetween(Integer value1, Integer value2) {
+			addCriterion("years between", value1, value2, "years");
+			return (Criteria) this;
+		}
+
+		public Criteria andYearsNotBetween(Integer value1, Integer value2) {
+			addCriterion("years not between", value1, value2, "years");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table patent_new
-	 * @mbg.generated  Wed Apr 24 13:38:43 CST 2019
+	 * @mbg.generated  Wed May 08 14:33:37 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 162 - 109
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -6,198 +6,212 @@ import java.util.Date;
 public class TOrderNew {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_no
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String orderNo;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_type
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Integer orderType;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.creater
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String creater;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.create_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Date createTime;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.update_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Date updateTime;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.buyer_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String buyerId;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.first_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private BigDecimal firstAmount;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.total_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private BigDecimal totalAmount;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.settlement_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private BigDecimal settlementAmount;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.refund_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private BigDecimal refundAmount;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Integer orderStatus;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.liquidation_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Integer liquidationStatus;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.process_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Integer processStatus;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.project_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Integer projectStatus;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.approval
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Integer approval;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_remarks
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String orderRemarks;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.delete_sign
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Integer deleteSign;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.salesman_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String salesmanId;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.finance_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String financeId;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.technician_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String technicianId;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.sign_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Date signTime;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.settlement_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Date settlementTime;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_no
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String contractNo;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_type
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String contractType;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contacts
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String contacts;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contact_mobile
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String contactMobile;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.legal_person
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String legalPerson;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.legal_person_tel
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String legalPersonTel;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_count
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private Float proofCount;
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_aid
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String proofAid;
-	
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_time
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
 	private Date proofTime;
-	
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_status
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
 	private Integer proofStatus;
 
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_dep
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
+	private String orderDep;
+
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_picture_url
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	private String contractPictureUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_no
 	 * @return  the value of t_order_new.order_no
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -206,7 +220,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_no
 	 * @param orderNo  the value for t_order_new.order_no
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -215,7 +229,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_type
 	 * @return  the value of t_order_new.order_type
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Integer getOrderType() {
 		return orderType;
@@ -224,7 +238,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_type
 	 * @param orderType  the value for t_order_new.order_type
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
@@ -233,7 +247,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.creater
 	 * @return  the value of t_order_new.creater
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getCreater() {
 		return creater;
@@ -242,7 +256,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.creater
 	 * @param creater  the value for t_order_new.creater
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -251,7 +265,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.create_time
 	 * @return  the value of t_order_new.create_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -260,7 +274,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.create_time
 	 * @param createTime  the value for t_order_new.create_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -269,7 +283,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.update_time
 	 * @return  the value of t_order_new.update_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -278,7 +292,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.update_time
 	 * @param updateTime  the value for t_order_new.update_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -287,7 +301,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.buyer_id
 	 * @return  the value of t_order_new.buyer_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -296,7 +310,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.buyer_id
 	 * @param buyerId  the value for t_order_new.buyer_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -305,7 +319,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.first_amount
 	 * @return  the value of t_order_new.first_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public BigDecimal getFirstAmount() {
 		return firstAmount;
@@ -314,7 +328,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.first_amount
 	 * @param firstAmount  the value for t_order_new.first_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setFirstAmount(BigDecimal firstAmount) {
 		this.firstAmount = firstAmount;
@@ -323,7 +337,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.total_amount
 	 * @return  the value of t_order_new.total_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -332,7 +346,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.total_amount
 	 * @param totalAmount  the value for t_order_new.total_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -341,7 +355,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.settlement_amount
 	 * @return  the value of t_order_new.settlement_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -350,7 +364,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.settlement_amount
 	 * @param settlementAmount  the value for t_order_new.settlement_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -359,7 +373,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.refund_amount
 	 * @return  the value of t_order_new.refund_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public BigDecimal getRefundAmount() {
 		return refundAmount;
@@ -368,7 +382,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.refund_amount
 	 * @param refundAmount  the value for t_order_new.refund_amount
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setRefundAmount(BigDecimal refundAmount) {
 		this.refundAmount = refundAmount;
@@ -377,7 +391,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_status
 	 * @return  the value of t_order_new.order_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -386,7 +400,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_status
 	 * @param orderStatus  the value for t_order_new.order_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -395,7 +409,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.liquidation_status
 	 * @return  the value of t_order_new.liquidation_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -404,7 +418,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.liquidation_status
 	 * @param liquidationStatus  the value for t_order_new.liquidation_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
@@ -413,7 +427,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.process_status
 	 * @return  the value of t_order_new.process_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Integer getProcessStatus() {
 		return processStatus;
@@ -422,7 +436,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.process_status
 	 * @param processStatus  the value for t_order_new.process_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setProcessStatus(Integer processStatus) {
 		this.processStatus = processStatus;
@@ -431,7 +445,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.project_status
 	 * @return  the value of t_order_new.project_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Integer getProjectStatus() {
 		return projectStatus;
@@ -440,7 +454,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.project_status
 	 * @param projectStatus  the value for t_order_new.project_status
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
@@ -449,7 +463,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.approval
 	 * @return  the value of t_order_new.approval
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Integer getApproval() {
 		return approval;
@@ -458,7 +472,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.approval
 	 * @param approval  the value for t_order_new.approval
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setApproval(Integer approval) {
 		this.approval = approval;
@@ -467,7 +481,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_remarks
 	 * @return  the value of t_order_new.order_remarks
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getOrderRemarks() {
 		return orderRemarks;
@@ -476,7 +490,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_remarks
 	 * @param orderRemarks  the value for t_order_new.order_remarks
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
@@ -485,7 +499,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.delete_sign
 	 * @return  the value of t_order_new.delete_sign
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -494,7 +508,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.delete_sign
 	 * @param deleteSign  the value for t_order_new.delete_sign
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -503,7 +517,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.salesman_id
 	 * @return  the value of t_order_new.salesman_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -512,7 +526,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.salesman_id
 	 * @param salesmanId  the value for t_order_new.salesman_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -521,7 +535,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.finance_id
 	 * @return  the value of t_order_new.finance_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -530,7 +544,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.finance_id
 	 * @param financeId  the value for t_order_new.finance_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -539,7 +553,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.technician_id
 	 * @return  the value of t_order_new.technician_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getTechnicianId() {
 		return technicianId;
@@ -548,7 +562,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.technician_id
 	 * @param technicianId  the value for t_order_new.technician_id
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setTechnicianId(String technicianId) {
 		this.technicianId = technicianId;
@@ -557,7 +571,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.sign_time
 	 * @return  the value of t_order_new.sign_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Date getSignTime() {
 		return signTime;
@@ -566,7 +580,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.sign_time
 	 * @param signTime  the value for t_order_new.sign_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setSignTime(Date signTime) {
 		this.signTime = signTime;
@@ -575,7 +589,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.settlement_time
 	 * @return  the value of t_order_new.settlement_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Date getSettlementTime() {
 		return settlementTime;
@@ -584,7 +598,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.settlement_time
 	 * @param settlementTime  the value for t_order_new.settlement_time
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setSettlementTime(Date settlementTime) {
 		this.settlementTime = settlementTime;
@@ -593,7 +607,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contract_no
 	 * @return  the value of t_order_new.contract_no
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getContractNo() {
 		return contractNo;
@@ -602,7 +616,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contract_no
 	 * @param contractNo  the value for t_order_new.contract_no
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
@@ -611,7 +625,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contract_type
 	 * @return  the value of t_order_new.contract_type
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getContractType() {
 		return contractType;
@@ -620,7 +634,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contract_type
 	 * @param contractType  the value for t_order_new.contract_type
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setContractType(String contractType) {
 		this.contractType = contractType;
@@ -629,7 +643,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contacts
 	 * @return  the value of t_order_new.contacts
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getContacts() {
 		return contacts;
@@ -638,7 +652,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contacts
 	 * @param contacts  the value for t_order_new.contacts
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -647,7 +661,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contact_mobile
 	 * @return  the value of t_order_new.contact_mobile
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -656,7 +670,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contact_mobile
 	 * @param contactMobile  the value for t_order_new.contact_mobile
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -665,7 +679,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.legal_person
 	 * @return  the value of t_order_new.legal_person
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getLegalPerson() {
 		return legalPerson;
@@ -674,7 +688,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.legal_person
 	 * @param legalPerson  the value for t_order_new.legal_person
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setLegalPerson(String legalPerson) {
 		this.legalPerson = legalPerson;
@@ -683,7 +697,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.legal_person_tel
 	 * @return  the value of t_order_new.legal_person_tel
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getLegalPersonTel() {
 		return legalPersonTel;
@@ -692,7 +706,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.legal_person_tel
 	 * @param legalPersonTel  the value for t_order_new.legal_person_tel
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setLegalPersonTel(String legalPersonTel) {
 		this.legalPersonTel = legalPersonTel;
@@ -701,7 +715,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.proof_count
 	 * @return  the value of t_order_new.proof_count
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Float getProofCount() {
 		return proofCount;
@@ -710,7 +724,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.proof_count
 	 * @param proofCount  the value for t_order_new.proof_count
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setProofCount(Float proofCount) {
 		this.proofCount = proofCount;
@@ -719,7 +733,7 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.proof_aid
 	 * @return  the value of t_order_new.proof_aid
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getProofAid() {
 		return proofAid;
@@ -728,44 +742,83 @@ public class TOrderNew {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.proof_aid
 	 * @param proofAid  the value for t_order_new.proof_aid
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setProofAid(String proofAid) {
 		this.proofAid = proofAid;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contract_picture_url
-	 * @return  the value of t_order_new.contract_picture_url
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.proof_time
+	 * @return  the value of t_order_new.proof_time
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
-	public String getContractPictureUrl() {
-		return contractPictureUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contract_picture_url
-	 * @param contractPictureUrl  the value for t_order_new.contract_picture_url
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
-	 */
-	public void setContractPictureUrl(String contractPictureUrl) {
-		this.contractPictureUrl = contractPictureUrl;
-	}
-
 	public Date getProofTime() {
 		return proofTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.proof_time
+	 * @param proofTime  the value for t_order_new.proof_time
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
 	public void setProofTime(Date proofTime) {
 		this.proofTime = proofTime;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.proof_status
+	 * @return  the value of t_order_new.proof_status
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
 	public Integer getProofStatus() {
 		return proofStatus;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.proof_status
+	 * @param proofStatus  the value for t_order_new.proof_status
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
 	public void setProofStatus(Integer proofStatus) {
 		this.proofStatus = proofStatus;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.order_dep
+	 * @return  the value of t_order_new.order_dep
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
+	public String getOrderDep() {
+		return orderDep;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.order_dep
+	 * @param orderDep  the value for t_order_new.order_dep
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
+	public void setOrderDep(String orderDep) {
+		this.orderDep = orderDep;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_new.contract_picture_url
+	 * @return  the value of t_order_new.contract_picture_url
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
+	public String getContractPictureUrl() {
+		return contractPictureUrl;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.contract_picture_url
+	 * @param contractPictureUrl  the value for t_order_new.contract_picture_url
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 */
+	public void setContractPictureUrl(String contractPictureUrl) {
+		this.contractPictureUrl = contractPictureUrl;
+	}
+
+
 }

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

@@ -9,25 +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
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	protected String orderByClause;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	protected boolean distinct;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public TOrderNewExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -35,7 +33,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -43,7 +41,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -51,7 +49,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -59,7 +57,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -67,7 +65,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -75,7 +73,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -83,7 +81,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -93,7 +91,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -105,7 +103,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -114,7 +112,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -124,7 +122,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -153,39 +151,30 @@ public class TOrderNewExample {
 			criteria.add(new Criterion(condition));
 		}
 
-		protected void addCriterion(String condition, Object value,
-				String property) {
+		protected void addCriterion(String condition, Object value, String property) {
 			if (value == null) {
-				throw new RuntimeException("Value for " + property
-						+ " cannot be null");
+				throw new RuntimeException("Value for " + property + " cannot be null");
 			}
 			criteria.add(new Criterion(condition, value));
 		}
 
-		protected void addCriterion(String condition, Object value1,
-				Object value2, String property) {
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
 			if (value1 == null || value2 == null) {
-				throw new RuntimeException("Between values for " + property
-						+ " cannot be null");
+				throw new RuntimeException("Between values for " + property + " cannot be null");
 			}
 			criteria.add(new Criterion(condition, value1, value2));
 		}
 
-		protected void addCriterionForJDBCDate(String condition, Date value,
-				String property) {
+		protected void addCriterionForJDBCDate(String condition, Date value, String property) {
 			if (value == null) {
-				throw new RuntimeException("Value for " + property
-						+ " cannot be null");
+				throw new RuntimeException("Value for " + property + " cannot be null");
 			}
-			addCriterion(condition, new java.sql.Date(value.getTime()),
-					property);
+			addCriterion(condition, new java.sql.Date(value.getTime()), property);
 		}
 
-		protected void addCriterionForJDBCDate(String condition,
-				List<Date> values, String property) {
+		protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
 			if (values == null || values.size() == 0) {
-				throw new RuntimeException("Value list for " + property
-						+ " cannot be null or empty");
+				throw new RuntimeException("Value list for " + property + " cannot be null or empty");
 			}
 			List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
 			Iterator<Date> iter = values.iterator();
@@ -195,14 +184,11 @@ public class TOrderNewExample {
 			addCriterion(condition, dateList, property);
 		}
 
-		protected void addCriterionForJDBCDate(String condition, Date value1,
-				Date value2, String property) {
+		protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
 			if (value1 == null || value2 == null) {
-				throw new RuntimeException("Between values for " + property
-						+ " cannot be null");
+				throw new RuntimeException("Between values for " + property + " cannot be null");
 			}
-			addCriterion(condition, new java.sql.Date(value1.getTime()),
-					new java.sql.Date(value2.getTime()), property);
+			addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
 		}
 
 		public Criteria andOrderNoIsNull() {
@@ -461,8 +447,7 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-			addCriterion("create_time not between", value1, value2,
-					"createTime");
+			addCriterion("create_time not between", value1, value2, "createTime");
 			return (Criteria) this;
 		}
 
@@ -522,8 +507,7 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-			addCriterion("update_time not between", value1, value2,
-					"updateTime");
+			addCriterion("update_time not between", value1, value2, "updateTime");
 			return (Criteria) this;
 		}
 
@@ -647,16 +631,13 @@ public class TOrderNewExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstAmountBetween(BigDecimal value1,
-				BigDecimal value2) {
+		public Criteria andFirstAmountBetween(BigDecimal value1, BigDecimal value2) {
 			addCriterion("first_amount between", value1, value2, "firstAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstAmountNotBetween(BigDecimal value1,
-				BigDecimal value2) {
-			addCriterion("first_amount not between", value1, value2,
-					"firstAmount");
+		public Criteria andFirstAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("first_amount not between", value1, value2, "firstAmount");
 			return (Criteria) this;
 		}
 
@@ -710,16 +691,13 @@ public class TOrderNewExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalAmountBetween(BigDecimal value1,
-				BigDecimal value2) {
+		public Criteria andTotalAmountBetween(BigDecimal value1, BigDecimal value2) {
 			addCriterion("total_amount between", value1, value2, "totalAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andTotalAmountNotBetween(BigDecimal value1,
-				BigDecimal value2) {
-			addCriterion("total_amount not between", value1, value2,
-					"totalAmount");
+		public Criteria andTotalAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("total_amount not between", value1, value2, "totalAmount");
 			return (Criteria) this;
 		}
 
@@ -773,17 +751,13 @@ public class TOrderNewExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andSettlementAmountBetween(BigDecimal value1,
-				BigDecimal value2) {
-			addCriterion("settlement_amount between", value1, value2,
-					"settlementAmount");
+		public Criteria andSettlementAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("settlement_amount between", value1, value2, "settlementAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andSettlementAmountNotBetween(BigDecimal value1,
-				BigDecimal value2) {
-			addCriterion("settlement_amount not between", value1, value2,
-					"settlementAmount");
+		public Criteria andSettlementAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("settlement_amount not between", value1, value2, "settlementAmount");
 			return (Criteria) this;
 		}
 
@@ -837,17 +811,13 @@ public class TOrderNewExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundAmountBetween(BigDecimal value1,
-				BigDecimal value2) {
-			addCriterion("refund_amount between", value1, value2,
-					"refundAmount");
+		public Criteria andRefundAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("refund_amount between", value1, value2, "refundAmount");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundAmountNotBetween(BigDecimal value1,
-				BigDecimal value2) {
-			addCriterion("refund_amount not between", value1, value2,
-					"refundAmount");
+		public Criteria andRefundAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("refund_amount not between", value1, value2, "refundAmount");
 			return (Criteria) this;
 		}
 
@@ -907,8 +877,7 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andOrderStatusNotBetween(Integer value1, Integer value2) {
-			addCriterion("order_status not between", value1, value2,
-					"orderStatus");
+			addCriterion("order_status not between", value1, value2, "orderStatus");
 			return (Criteria) this;
 		}
 
@@ -958,22 +927,17 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andLiquidationStatusNotIn(List<Integer> values) {
-			addCriterion("liquidation_status not in", values,
-					"liquidationStatus");
+			addCriterion("liquidation_status not in", values, "liquidationStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andLiquidationStatusBetween(Integer value1,
-				Integer value2) {
-			addCriterion("liquidation_status between", value1, value2,
-					"liquidationStatus");
+		public Criteria andLiquidationStatusBetween(Integer value1, Integer value2) {
+			addCriterion("liquidation_status between", value1, value2, "liquidationStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andLiquidationStatusNotBetween(Integer value1,
-				Integer value2) {
-			addCriterion("liquidation_status not between", value1, value2,
-					"liquidationStatus");
+		public Criteria andLiquidationStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("liquidation_status not between", value1, value2, "liquidationStatus");
 			return (Criteria) this;
 		}
 
@@ -1028,15 +992,12 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andProcessStatusBetween(Integer value1, Integer value2) {
-			addCriterion("process_status between", value1, value2,
-					"processStatus");
+			addCriterion("process_status between", value1, value2, "processStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andProcessStatusNotBetween(Integer value1,
-				Integer value2) {
-			addCriterion("process_status not between", value1, value2,
-					"processStatus");
+		public Criteria andProcessStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("process_status not between", value1, value2, "processStatus");
 			return (Criteria) this;
 		}
 
@@ -1091,15 +1052,12 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andProjectStatusBetween(Integer value1, Integer value2) {
-			addCriterion("project_status between", value1, value2,
-					"projectStatus");
+			addCriterion("project_status between", value1, value2, "projectStatus");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectStatusNotBetween(Integer value1,
-				Integer value2) {
-			addCriterion("project_status not between", value1, value2,
-					"projectStatus");
+		public Criteria andProjectStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("project_status not between", value1, value2, "projectStatus");
 			return (Criteria) this;
 		}
 
@@ -1224,14 +1182,12 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andOrderRemarksBetween(String value1, String value2) {
-			addCriterion("order_remarks between", value1, value2,
-					"orderRemarks");
+			addCriterion("order_remarks between", value1, value2, "orderRemarks");
 			return (Criteria) this;
 		}
 
 		public Criteria andOrderRemarksNotBetween(String value1, String value2) {
-			addCriterion("order_remarks not between", value1, value2,
-					"orderRemarks");
+			addCriterion("order_remarks not between", value1, value2, "orderRemarks");
 			return (Criteria) this;
 		}
 
@@ -1291,8 +1247,7 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andDeleteSignNotBetween(Integer value1, Integer value2) {
-			addCriterion("delete_sign not between", value1, value2,
-					"deleteSign");
+			addCriterion("delete_sign not between", value1, value2, "deleteSign");
 			return (Criteria) this;
 		}
 
@@ -1362,8 +1317,7 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andSalesmanIdNotBetween(String value1, String value2) {
-			addCriterion("salesman_id not between", value1, value2,
-					"salesmanId");
+			addCriterion("salesman_id not between", value1, value2, "salesmanId");
 			return (Criteria) this;
 		}
 
@@ -1498,14 +1452,12 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andTechnicianIdBetween(String value1, String value2) {
-			addCriterion("technician_id between", value1, value2,
-					"technicianId");
+			addCriterion("technician_id between", value1, value2, "technicianId");
 			return (Criteria) this;
 		}
 
 		public Criteria andTechnicianIdNotBetween(String value1, String value2) {
-			addCriterion("technician_id not between", value1, value2,
-					"technicianId");
+			addCriterion("technician_id not between", value1, value2, "technicianId");
 			return (Criteria) this;
 		}
 
@@ -1560,14 +1512,12 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andSignTimeBetween(Date value1, Date value2) {
-			addCriterionForJDBCDate("sign_time between", value1, value2,
-					"signTime");
+			addCriterionForJDBCDate("sign_time between", value1, value2, "signTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSignTimeNotBetween(Date value1, Date value2) {
-			addCriterionForJDBCDate("sign_time not between", value1, value2,
-					"signTime");
+			addCriterionForJDBCDate("sign_time not between", value1, value2, "signTime");
 			return (Criteria) this;
 		}
 
@@ -1582,62 +1532,52 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andSettlementTimeEqualTo(Date value) {
-			addCriterionForJDBCDate("settlement_time =", value,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time =", value, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeNotEqualTo(Date value) {
-			addCriterionForJDBCDate("settlement_time <>", value,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time <>", value, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeGreaterThan(Date value) {
-			addCriterionForJDBCDate("settlement_time >", value,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time >", value, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeGreaterThanOrEqualTo(Date value) {
-			addCriterionForJDBCDate("settlement_time >=", value,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time >=", value, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeLessThan(Date value) {
-			addCriterionForJDBCDate("settlement_time <", value,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time <", value, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeLessThanOrEqualTo(Date value) {
-			addCriterionForJDBCDate("settlement_time <=", value,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time <=", value, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeIn(List<Date> values) {
-			addCriterionForJDBCDate("settlement_time in", values,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time in", values, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeNotIn(List<Date> values) {
-			addCriterionForJDBCDate("settlement_time not in", values,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time not in", values, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeBetween(Date value1, Date value2) {
-			addCriterionForJDBCDate("settlement_time between", value1, value2,
-					"settlementTime");
+			addCriterionForJDBCDate("settlement_time between", value1, value2, "settlementTime");
 			return (Criteria) this;
 		}
 
 		public Criteria andSettlementTimeNotBetween(Date value1, Date value2) {
-			addCriterionForJDBCDate("settlement_time not between", value1,
-					value2, "settlementTime");
+			addCriterionForJDBCDate("settlement_time not between", value1, value2, "settlementTime");
 			return (Criteria) this;
 		}
 
@@ -1707,8 +1647,7 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andContractNoNotBetween(String value1, String value2) {
-			addCriterion("contract_no not between", value1, value2,
-					"contractNo");
+			addCriterion("contract_no not between", value1, value2, "contractNo");
 			return (Criteria) this;
 		}
 
@@ -1773,14 +1712,12 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andContractTypeBetween(String value1, String value2) {
-			addCriterion("contract_type between", value1, value2,
-					"contractType");
+			addCriterion("contract_type between", value1, value2, "contractType");
 			return (Criteria) this;
 		}
 
 		public Criteria andContractTypeNotBetween(String value1, String value2) {
-			addCriterion("contract_type not between", value1, value2,
-					"contractType");
+			addCriterion("contract_type not between", value1, value2, "contractType");
 			return (Criteria) this;
 		}
 
@@ -1915,14 +1852,12 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andContactMobileBetween(String value1, String value2) {
-			addCriterion("contact_mobile between", value1, value2,
-					"contactMobile");
+			addCriterion("contact_mobile between", value1, value2, "contactMobile");
 			return (Criteria) this;
 		}
 
 		public Criteria andContactMobileNotBetween(String value1, String value2) {
-			addCriterion("contact_mobile not between", value1, value2,
-					"contactMobile");
+			addCriterion("contact_mobile not between", value1, value2, "contactMobile");
 			return (Criteria) this;
 		}
 
@@ -1992,8 +1927,7 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andLegalPersonNotBetween(String value1, String value2) {
-			addCriterion("legal_person not between", value1, value2,
-					"legalPerson");
+			addCriterion("legal_person not between", value1, value2, "legalPerson");
 			return (Criteria) this;
 		}
 
@@ -2058,14 +1992,12 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andLegalPersonTelBetween(String value1, String value2) {
-			addCriterion("legal_person_tel between", value1, value2,
-					"legalPersonTel");
+			addCriterion("legal_person_tel between", value1, value2, "legalPersonTel");
 			return (Criteria) this;
 		}
 
 		public Criteria andLegalPersonTelNotBetween(String value1, String value2) {
-			addCriterion("legal_person_tel not between", value1, value2,
-					"legalPersonTel");
+			addCriterion("legal_person_tel not between", value1, value2, "legalPersonTel");
 			return (Criteria) this;
 		}
 
@@ -2125,8 +2057,7 @@ public class TOrderNewExample {
 		}
 
 		public Criteria andProofCountNotBetween(Float value1, Float value2) {
-			addCriterion("proof_count not between", value1, value2,
-					"proofCount");
+			addCriterion("proof_count not between", value1, value2, "proofCount");
 			return (Criteria) this;
 		}
 
@@ -2199,11 +2130,201 @@ public class TOrderNewExample {
 			addCriterion("proof_aid not between", value1, value2, "proofAid");
 			return (Criteria) this;
 		}
+
+		public Criteria andProofTimeIsNull() {
+			addCriterion("proof_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeIsNotNull() {
+			addCriterion("proof_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeEqualTo(Date value) {
+			addCriterion("proof_time =", value, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeNotEqualTo(Date value) {
+			addCriterion("proof_time <>", value, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeGreaterThan(Date value) {
+			addCriterion("proof_time >", value, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("proof_time >=", value, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeLessThan(Date value) {
+			addCriterion("proof_time <", value, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeLessThanOrEqualTo(Date value) {
+			addCriterion("proof_time <=", value, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeIn(List<Date> values) {
+			addCriterion("proof_time in", values, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeNotIn(List<Date> values) {
+			addCriterion("proof_time not in", values, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeBetween(Date value1, Date value2) {
+			addCriterion("proof_time between", value1, value2, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofTimeNotBetween(Date value1, Date value2) {
+			addCriterion("proof_time not between", value1, value2, "proofTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusIsNull() {
+			addCriterion("proof_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusIsNotNull() {
+			addCriterion("proof_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusEqualTo(Integer value) {
+			addCriterion("proof_status =", value, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusNotEqualTo(Integer value) {
+			addCriterion("proof_status <>", value, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusGreaterThan(Integer value) {
+			addCriterion("proof_status >", value, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("proof_status >=", value, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusLessThan(Integer value) {
+			addCriterion("proof_status <", value, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("proof_status <=", value, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusIn(List<Integer> values) {
+			addCriterion("proof_status in", values, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusNotIn(List<Integer> values) {
+			addCriterion("proof_status not in", values, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusBetween(Integer value1, Integer value2) {
+			addCriterion("proof_status between", value1, value2, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andProofStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("proof_status not between", value1, value2, "proofStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepIsNull() {
+			addCriterion("order_dep is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepIsNotNull() {
+			addCriterion("order_dep is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepEqualTo(String value) {
+			addCriterion("order_dep =", value, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepNotEqualTo(String value) {
+			addCriterion("order_dep <>", value, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepGreaterThan(String value) {
+			addCriterion("order_dep >", value, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepGreaterThanOrEqualTo(String value) {
+			addCriterion("order_dep >=", value, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepLessThan(String value) {
+			addCriterion("order_dep <", value, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepLessThanOrEqualTo(String value) {
+			addCriterion("order_dep <=", value, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepLike(String value) {
+			addCriterion("order_dep like", value, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepNotLike(String value) {
+			addCriterion("order_dep not like", value, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepIn(List<String> values) {
+			addCriterion("order_dep in", values, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepNotIn(List<String> values) {
+			addCriterion("order_dep not in", values, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepBetween(String value1, String value2) {
+			addCriterion("order_dep between", value1, value2, "orderDep");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderDepNotBetween(String value1, String value2) {
+			addCriterion("order_dep not between", value1, value2, "orderDep");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbggenerated  Fri Nov 23 15:27:45 CST 2018
+	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;
@@ -2270,8 +2391,7 @@ public class TOrderNewExample {
 			this(condition, value, null);
 		}
 
-		protected Criterion(String condition, Object value, Object secondValue,
-				String typeHandler) {
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
 			super();
 			this.condition = condition;
 			this.value = value;

+ 12 - 0
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -197,6 +197,10 @@ public class TOrderTask {
     
     private Integer main;
     
+    private String certificateNumber;
+    
+    
+    
 
     /**
      * This method was generated by MyBatis Generator.
@@ -725,4 +729,12 @@ public class TOrderTask {
 	public void setEmail(String email) {
 		this.email = email;
 	}
+
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
 }

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1678 - 1589
src/main/java/com/goafanti/common/model/TOrderTaskExample.java


+ 66 - 91
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -14,6 +14,7 @@ import java.util.regex.Pattern;
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -62,53 +63,81 @@ public class PatentTask {
 //	@RequestMapping(value = "/open/patentRemind", method = RequestMethod.GET)
 	public void patentRemind() {
 		LoggerUtils.debug(getClass(), "开始检查专利提醒");
-		List<PatentNew> l=patentNewService.AllselectPatentNew();
+		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		List<PatentNew> l=patentNewService.AllselectStartPatentNew();
 		for (PatentNew p : l) {
 			 Calendar cst =Calendar.getInstance();
 			 Calendar ced =Calendar.getInstance();
 			 Calendar ted =Calendar.getInstance();
 			 cst.setTime(p.getApplyDate());
 			 ced.setTime(new Date());
-			 //获得累计年限   2019-2018=1
-			 int y=ced.getWeekYear()-cst.getWeekYear();
-			//获得提醒日期
-			 ted.setTime(p.getApplyDate());
-			 cst.add(Calendar.YEAR, y);
-			 cst.add(Calendar.MONTH, -3);
-			 String content = null;
-			 Admin a=adminService.selectByPrimaryKey(p.getAid());
-			 //计算出年费金额,然后存入数据库
-			 BigDecimal Money=countMoney(y,p.getType());
-			 //如果今天是提醒日,则发送邮件
-			 if(isSameDate(new Date(), cst.getTime())) {
-				 if(StringUtils.isNotBlank(p.getEmail())){
-					  content = "<div>专利名称: "+ p.getName() +"</div><div>客户名称: " + p.getApplicant() + "</div>"
-							  + "<div>专利编号: "+ p.getPatentNo() + "<div>金额: "+ Money +"</div><div>你的专利将在三个月即将到期</div>";
-						EmailBo emailBo = new EmailBo("专利提醒", p.getEmail(), "客户", "科德集团", a.getName(), content);
-						emailBo.SetEnd("详情请联系相关办理人员,谢谢!");
-						try {
-							SendEmailUtil.getInstance().send(emailBo);
-						} catch (UnsupportedEncodingException e) {
-							LoggerUtils.debug(getClass(), "=====================专利提醒失败======================");
-							e.printStackTrace();
-						} catch (MessagingException e) {
-							LoggerUtils.debug(getClass(), "=====================专利提醒失败======================");
-							e.printStackTrace();
+			 //获得累计年限   
+			 int d = (int) ((ced.getTimeInMillis()-cst.getTimeInMillis()) / (1000*3600*24));
+			 int y=d/365;
+			 if(d%365>0)y++;
+			 ted.setTime(cst.getTime());
+			 ted.add(Calendar.YEAR,y);
+			 //计算相差日期
+			 int count = (int) ((ted.getTimeInMillis()-ced.getTimeInMillis()) / (1000*3600*24));
+			 if (count>=0&&count<=90) {
+				  String content = null;
+					 Admin a=adminService.selectByPrimaryKey(p.getAid());
+					 //计算出年费金额,然后存入数据库
+					 BigDecimal Money=countMoney(y,p.getType());
+
+					 if(StringUtils.isNotBlank(p.getEmail())){
+						 ted.setTime(cst.getTime());
+						 ted.add(Calendar.YEAR, y);
+						  content = "<div>专利名称: "+ p.getName() +"</div><div>客户名称: " + p.getApplicant() + "</div>"
+								  + "<div>专利编号: "+ p.getPatentNo() + "<div>金额: "+ Money +"</div><div>你的专利将在 "+DateFormatUtils.format(ted, "yyyy-MM-dd")+" 到期</div>";
+							EmailBo emailBo = new EmailBo("专利提醒", p.getEmail(), "客户", "科德集团", a.getName(), content);
+							emailBo.SetEnd("详情请联系相关办理人员,谢谢!");
+							try {
+								SendEmailUtil.getInstance().send(emailBo);
+							} catch (UnsupportedEncodingException e) {
+								LoggerUtils.debug(getClass(), "=====================专利提醒失败======================");
+								e.printStackTrace();
+							} catch (MessagingException e) {
+								LoggerUtils.debug(getClass(), "=====================专利提醒失败======================");
+								e.printStackTrace();
+							}
 						}
-					}
-				 p.setPatentAmount(Money);
-				 p.setStatus(1);//提醒中
-				 patentNewService.updatePatenNew(p);
-				 PatentNewLog pl=new PatentNewLog();
-				 pl.setContent(getTextFromHtml(content));
-				 pl.setCreateTime(new Date());
-				 pl.setPid(p.getId());
-				 patentNewService.addPatenNewLog(pl);
-			}
+					 p.setPatentAmount(Money);
+					 p.setStatus(1);//提醒中
+					 p.setYears(y);
+					 patentNewService.updatePatenNew(p);
+					 PatentNewLog pl=new PatentNewLog();
+					 pl.setContent(getTextFromHtml(content));
+					 pl.setCreateTime(new Date());
+					 pl.setPid(p.getId());
+					 patentNewService.addPatenNewLog(pl);
+				
+				}
+		}
+		List<PatentNew> ls=patentNewService.AllselectEndPatentNew();
+		for (PatentNew p : ls) {
+			Calendar cst =Calendar.getInstance();
+			Calendar ced =Calendar.getInstance();
+			Calendar ted =Calendar.getInstance();
+			cst.setTime(p.getApplyDate());
+			ced.setTime(new Date());
+			int d = (int) ((ced.getTimeInMillis()-cst.getTimeInMillis()) / (1000*3600*24));
+			int y=(d/365);
+			if(d%365>0)y++;
+			ted.setTime(cst.getTime());
+			ted.add(Calendar.YEAR,y);
+			//计算相差日期
+			int count = (int) ((ted.getTimeInMillis()-ced.getTimeInMillis()) / (1000*3600*24));
+			if (count>276) {
+			p.setStatus(0);//恢复待提醒
+			patentNewService.updatePatenNew(p);
+			 }
 		}
 		LoggerUtils.debug(getClass(), "=====================专利提醒结束======================");
 	}
 	
+	
+
 	/**
 	 * 
 	 * @param 年份
@@ -146,55 +175,7 @@ public class PatentTask {
 		
 		return new BigDecimal(money);
 	}
-	
-	
-
-
-
-	public static final int calculationYear(Date early) { 
-	     
-        Calendar calst =Calendar.getInstance();   
-       Calendar caled =Calendar.getInstance();   
-        calst.setTime(early);   
-         caled.setTime(new Date());   
-         //设置时间为0时   
-        int y=caled.getWeekYear()-calst.getWeekYear();
-        
-		
-        return y;   
-   } 
-	
-	  /**
-     * 判断两个日期是否是同一天
-     * 
-     * @param date1
-     *            date1
-     * @param date2
-     *            date2
-     * @return
-     */
-    private static boolean isSameDate(Date date1, Date date2) {
-        Calendar cal1 = Calendar.getInstance();
-        cal1.setTime(date1);
-
-        Calendar cal2 = Calendar.getInstance();
-        cal2.setTime(date2);
-
-        boolean isSameYear = cal1.get(Calendar.YEAR) == cal2
-                .get(Calendar.YEAR);
-        boolean isSameMonth = isSameYear
-                && cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH);
-        boolean isSameDate = isSameMonth
-                && cal1.get(Calendar.DAY_OF_MONTH) == cal2
-                        .get(Calendar.DAY_OF_MONTH);
-
-        return isSameDate;
-    }
-
-
-
-           
-        /**
+	/**
          * @param htmlStr
          * @return
          *  删除Html标签
@@ -223,10 +204,4 @@ public class PatentTask {
             htmlStr = htmlStr.replaceAll("&nbsp;", "");
             return htmlStr;
         }
-           
-       /* public static void main(String[] args) {
-            String str = "<div style='text-align:center;'> 整治“四风”   清弊除垢<br/><span style='font-size:14px;'> </span><span style='font-size:18px;'>公司召开党的群众路线教育实践活动动员大会</span><br/><title>我是标题</title><desc>我是desc里的内容</desc></div>";
-            System.out.println(getTextFromHtml(str));
-        }*/
-    
 }

+ 4 - 1
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -439,8 +439,8 @@ public class ExportExcelUtil {
 		return "";
 	}
 
-	public static XSSFWorkbook exportTaskHoursListData(List<TOrderTaskListBo> list, String[] comment, String filePath) {
 
+	public static XSSFWorkbook exportTaskHoursListData(List<TOrderTaskListBo> list, String[] comment, String filePath) {
 		//map 数据 comment表头 (列名称)
  		//1,创建一个workbook,对应的是一个excel文件
 		XSSFWorkbook wb = new XSSFWorkbook();
@@ -472,6 +472,9 @@ public class ExportExcelUtil {
 					case "任务负责人": o = ob.getReceiverName(); break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); break;
 					case "工时": o = ob.getHours(); break;
+					case "合同编号":o =ob.getContractNo();break;
+					case "签单日期":o =ob.getSignTime();break;
+					case "派单日期":o =ob.getCreteTime();break;
 					default: o = ""; break;
 					}
 					XSSFCell c = r.createCell(i);

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

@@ -925,8 +925,8 @@ public class CustomerServiceImpl  extends BaseMybatisDao<UserMapper> implements
 			user.setTransferTime(now);
 			flag = addUserLock(uid,TokenManager.getAdminId(),now); //指定用户锁定客户
 			if(flag <= 0) throw new BusinessException(new Error(ErrorConstants.CUSTOMER_ALREADY_RECEIVE,""));
-			if(userMapper.UserReceiveCount(TokenManager.getAdminId())>9)
-			throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""));
+			if(userMapper.UserReceiveCount(TokenManager.getAdminId())>AFTConstants.USER_RCEIVE_MAX)
+			throw new BusinessException(new Error(ErrorConstants.CUSTOM_EREXCESS,""+(AFTConstants.USER_RCEIVE_MAX+1),""));
 			organizationContactBookMapper.updateAdmin(uid,TokenManager.getAdminId());
 		}else if(operatorType.equals(AFTConstants.USER_TRANSFER_TO_OTHER)){
 			user.setAid(String.valueOf(params[0]));

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -23,6 +23,7 @@ public class TOrderTaskDetailBo {
 	private String contactMobile;
 	private String legalPerson;
 	private String legalPersonTel;
+	private String certificateNumber;
 	
 	
 	public String getTaskComment() {
@@ -158,5 +159,11 @@ public class TOrderTaskDetailBo {
 	public void setLegalPersonTel(String legalPersonTel) {
 		this.legalPersonTel = legalPersonTel;
 	}
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
 	
 }

+ 21 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -13,6 +13,27 @@ public class TOrderTaskListBo {
 	private Integer commodityQuantity;
 	private String hours;
 	private String depName;
+	private String contractNo;
+	private String creteTime;
+	private String signTime;
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getCreteTime() {
+		return creteTime;
+	}
+	public void setCreteTime(String creteTime) {
+		this.creteTime = creteTime;
+	}
+	public String getSignTime() {
+		return signTime;
+	}
+	public void setSignTime(String signTime) {
+		this.signTime = signTime;
+	}
 	public String getId() {
 		return id;
 	}

+ 0 - 1
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -52,7 +52,6 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	public Result allUnassignedOrder(OrderListBo order, Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		//判断当前登录的角色是不是财务管理员
-		
 		//order.setProcessStatus(2);//订单状态为2   改为前端传
 		res.setData(fundManageOrderServiceImpl.allUnassignedOrder(order, pageNo, pageSize));
 		return res;

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

@@ -213,6 +213,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			contactBook.setMobile(t.getContactMobile());
 			organizationContactBookMapper.insertSelective(contactBook);
 		}
+		if (StringUtils.isBlank(t.getOrderDep())) {
+			t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
+		}
 		if (isSubmit==1) {//订单
 			t.setOrderStatus(OrderNewState.QDDS.getCode());
 			t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());

+ 3 - 7
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -171,6 +171,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setTaskStatus(t.getTaskStatus());
 		task.setProjectStatus(t.getProjectStatus());
 		task.setTaskComment(t.getTaskComment());
+		task.setCertificateNumber(t.getCertificateNumber());
 		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo()); 
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());
 		if(StringUtils.isNotEmpty(t.getContacts()))	tn.setContactMobile(t.getContactMobile());
@@ -294,12 +295,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskHoursListByPage", "selectTaskHoursListCount", params, pageNo, pageSize);
-		/*List<TOrderTaskListBo> list=(List<TOrderTaskListBo>) p.getList();
-		for (TOrderTaskListBo t : list) {
-			if (t.getCommodityQuantity()!=null&&t.getCommodityQuantity()>1) {
-				t.setHours(tTaskHoursMapper.getTaskSuperHours(t.getId()));
-			}
-		}*/
+		
 		return p;
 	}
 
@@ -311,7 +307,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (list==null && list.size()==0) {
 			return null;
 		}
-		String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","工时"};
+		String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","工时","合同编号","签单日期","派单日期"};
 		String filePath = uploadPath + "/TaskHours";
 		XSSFWorkbook wb = ExportExcelUtil.exportTaskHoursListData(list, comment, filePath);
 		return wb;

+ 3 - 1
src/main/java/com/goafanti/patent/service/PatentNewService.java

@@ -15,9 +15,11 @@ public interface PatentNewService {
 
 	Pagination<PatentNewBo> selectPatentNew(Integer pageSize, Integer pageNo);
 	
-	List<PatentNew> AllselectPatentNew();
+	List<PatentNew> AllselectStartPatentNew();
 	
 	
 	int addPatenNewLog(PatentNewLog pl);
 
+	List<PatentNew> AllselectEndPatentNew();
+
 }

+ 11 - 4
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -43,16 +43,18 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		Map<String, Object> params = new HashMap<>();
 		if (pageNo == null || pageNo < 0) pageNo = 1;
 		if (pageSize == null || pageSize < 0)	pageSize = 10;
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN))params.put("aid", TokenManager.getAdminId());
+		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
+			params.put("aid", TokenManager.getAdminId());
+			System.out.println("非管理");
+		}
 		
 		return (Pagination<PatentNewBo>) findPage("selectPatentNewList", "selectPatentNewCount", params, pageNo,
 				pageSize);
 	}
 
 	@Override
-	public List<PatentNew> AllselectPatentNew() {
-
-		return patentNewMapper.AllselectPatentNew();
+	public List<PatentNew> AllselectStartPatentNew() {
+		return patentNewMapper.AllselectStartPatentNew();
 	}
 
 	@Override
@@ -60,6 +62,11 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 		return patentNewLogMapper.insertSelective(pl);
 	}
 
+	@Override
+	public List<PatentNew> AllselectEndPatentNew() {
+		return patentNewMapper.AllselectEndPatentNew();
+	}
+
 	
 	
 	

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.0.99
+static.host=//sb.jishutao.com/1.1.0
 avatar.host=//sb.jishutao.com
 
 #连生产
 #avatar.host=//static.kedexinxi.com
-#static.host=//s.kedexinxi.com/1.0.99
+#static.host=//s.kedexinxi.com/1.1.0
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

@@ -122,7 +122,7 @@ ORDER_ALREADY_REVOKE = \u8BE5\u8BA2\u5355\u5DF2\u7ECF\u5E9F\u9664{0}
 
 ORDER_NOT_EXIST = \u8BA2\u5355\u4E0D\u5B58\u5728{0}
 
-CUSTOM_EREXCESS= \u5ba2\u6237\u9886\u53d6\u8d85\u989d
+CUSTOM_EREXCESS= \u5ba2\u6237\u9886\u53d6\u8d85\u989d\u002c\u6bcf\u5929\u6700\u591a{0}\u4e2a
 
 PAY_BEYOND_SIGN = \u652F\u4ED8\u91D1\u989D\u8D85\u8FC7\u5408\u540C\u4EF7\u683C