Переглянути джерело

新增外包公司表、接口修改

anderx 6 роки тому
батько
коміт
cbc18c006c
19 змінених файлів з 2143 додано та 278 видалено
  1. 1 1
      GeneratorConfig.xml
  2. 96 0
      src/main/java/com/goafanti/common/dao/OutsourceOrganizationMapper.java
  3. 14 14
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  4. 365 0
      src/main/java/com/goafanti/common/mapper/OutsourceOrganizationMapper.xml
  5. 51 90
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  6. 335 0
      src/main/java/com/goafanti/common/model/OutsourceOrganization.java
  7. 953 0
      src/main/java/com/goafanti/common/model/OutsourceOrganizationExample.java
  8. 127 136
      src/main/java/com/goafanti/common/model/TOrderNew.java
  9. 76 16
      src/main/java/com/goafanti/common/model/TOrderNewExample.java
  10. 8 0
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  11. 2 2
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  12. 2 3
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  13. 56 0
      src/main/java/com/goafanti/order/controller/outsourceOrgApiController.java
  14. 1 1
      src/main/java/com/goafanti/order/service/OrderNewService.java
  15. 12 0
      src/main/java/com/goafanti/order/service/OutsourceOrgService.java
  16. 2 2
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  17. 7 3
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  18. 25 0
      src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java
  19. 10 10
      src/main/resources/props/config_local.properties

+ 1 - 1
GeneratorConfig.xml

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

+ 96 - 0
src/main/java/com/goafanti/common/dao/OutsourceOrganizationMapper.java

@@ -0,0 +1,96 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.OutsourceOrganization;
+import com.goafanti.common.model.OutsourceOrganizationExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OutsourceOrganizationMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    long countByExample(OutsourceOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    int deleteByExample(OutsourceOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    int insert(OutsourceOrganization record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    int insertSelective(OutsourceOrganization record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    List<OutsourceOrganization> selectByExample(OutsourceOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    OutsourceOrganization selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    int updateByExampleSelective(@Param("record") OutsourceOrganization record, @Param("example") OutsourceOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    int updateByExample(@Param("record") OutsourceOrganization record, @Param("example") OutsourceOrganizationExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    int updateByPrimaryKeySelective(OutsourceOrganization record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    int updateByPrimaryKey(OutsourceOrganization record);
+}

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

@@ -12,72 +12,72 @@ 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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	long countByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int deleteByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int deleteByPrimaryKey(String orderNo);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int insert(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int insertSelective(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	List<TOrderNew> selectByExampleWithBLOBs(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	List<TOrderNew> selectByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	TOrderNew selectByPrimaryKey(String orderNo);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int updateByExample(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderNew record);
 	TOrderNewBo getOrderNewDetail(String orderNo); 

+ 365 - 0
src/main/java/com/goafanti/common/mapper/OutsourceOrganizationMapper.xml

@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.OutsourceOrganizationMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.OutsourceOrganization">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="contacts" jdbcType="VARCHAR" property="contacts" />
+    <result column="contacts_mobile" jdbcType="VARCHAR" property="contactsMobile" />
+    <result column="province" jdbcType="INTEGER" property="province" />
+    <result column="city" jdbcType="INTEGER" property="city" />
+    <result column="area" jdbcType="INTEGER" property="area" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    id, name, contacts, contacts_mobile, province, city, area, address, remarks, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.OutsourceOrganizationExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from outsource_organization
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from outsource_organization
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    delete from outsource_organization
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.OutsourceOrganizationExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    delete from outsource_organization
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.OutsourceOrganization">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    insert into outsource_organization (id, name, contacts, 
+      contacts_mobile, province, city, 
+      area, address, remarks, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
+      #{contactsMobile,jdbcType=VARCHAR}, #{province,jdbcType=INTEGER}, #{city,jdbcType=INTEGER}, 
+      #{area,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.OutsourceOrganization">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    insert into outsource_organization
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="contacts != null">
+        contacts,
+      </if>
+      <if test="contactsMobile != null">
+        contacts_mobile,
+      </if>
+      <if test="province != null">
+        province,
+      </if>
+      <if test="city != null">
+        city,
+      </if>
+      <if test="area != null">
+        area,
+      </if>
+      <if test="address != null">
+        address,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsMobile != null">
+        #{contactsMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null">
+        #{province,jdbcType=INTEGER},
+      </if>
+      <if test="city != null">
+        #{city,jdbcType=INTEGER},
+      </if>
+      <if test="area != null">
+        #{area,jdbcType=INTEGER},
+      </if>
+      <if test="address != null">
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.OutsourceOrganizationExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    select count(*) from outsource_organization
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    update outsource_organization
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contacts != null">
+        contacts = #{record.contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contactsMobile != null">
+        contacts_mobile = #{record.contactsMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.province != null">
+        province = #{record.province,jdbcType=INTEGER},
+      </if>
+      <if test="record.city != null">
+        city = #{record.city,jdbcType=INTEGER},
+      </if>
+      <if test="record.area != null">
+        area = #{record.area,jdbcType=INTEGER},
+      </if>
+      <if test="record.address != null">
+        address = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    update outsource_organization
+    set id = #{record.id,jdbcType=INTEGER},
+      name = #{record.name,jdbcType=VARCHAR},
+      contacts = #{record.contacts,jdbcType=VARCHAR},
+      contacts_mobile = #{record.contactsMobile,jdbcType=VARCHAR},
+      province = #{record.province,jdbcType=INTEGER},
+      city = #{record.city,jdbcType=INTEGER},
+      area = #{record.area,jdbcType=INTEGER},
+      address = #{record.address,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.OutsourceOrganization">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    update outsource_organization
+    <set>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="contacts != null">
+        contacts = #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsMobile != null">
+        contacts_mobile = #{contactsMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null">
+        province = #{province,jdbcType=INTEGER},
+      </if>
+      <if test="city != null">
+        city = #{city,jdbcType=INTEGER},
+      </if>
+      <if test="area != null">
+        area = #{area,jdbcType=INTEGER},
+      </if>
+      <if test="address != null">
+        address = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.OutsourceOrganization">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+    -->
+    update outsource_organization
+    set name = #{name,jdbcType=VARCHAR},
+      contacts = #{contacts,jdbcType=VARCHAR},
+      contacts_mobile = #{contactsMobile,jdbcType=VARCHAR},
+      province = #{province,jdbcType=INTEGER},
+      city = #{city,jdbcType=INTEGER},
+      area = #{area,jdbcType=INTEGER},
+      address = #{address,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 51 - 90
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_type" jdbcType="INTEGER" property="orderType" />
@@ -40,12 +40,13 @@
     <result column="proof_time" jdbcType="TIMESTAMP" property="proofTime" />
     <result column="proof_status" jdbcType="INTEGER" property="proofStatus" />
     <result column="order_dep" jdbcType="VARCHAR" property="orderDep" />
+    <result column="outsource" jdbcType="INTEGER" property="outsource" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderNew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     <result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
   </resultMap>
@@ -53,7 +54,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -87,7 +88,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -121,20 +122,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 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, order_dep
+    proof_time, proof_status, order_dep, outsource
   </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 May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     contract_picture_url
   </sql>
@@ -142,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     select
     <if test="distinct">
@@ -163,7 +164,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     select
     <if test="distinct">
@@ -182,7 +183,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -195,7 +196,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     delete from t_order_new
     where order_no = #{orderNo,jdbcType=VARCHAR}
@@ -204,7 +205,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     delete from t_order_new
     <if test="_parameter != null">
@@ -215,7 +216,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     insert into t_order_new (order_no, order_type, creater, 
       create_time, update_time, buyer_id, 
@@ -228,7 +229,7 @@
       contacts, contact_mobile, legal_person, 
       legal_person_tel, proof_count, proof_aid, 
       proof_time, proof_status, order_dep, 
-      contract_picture_url)
+      outsource, contract_picture_url)
     values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, 
       #{firstAmount,jdbcType=DECIMAL}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL}, 
@@ -240,13 +241,13 @@
       #{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})
+      #{outsource,jdbcType=INTEGER}, #{contractPictureUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderNew">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     insert into t_order_new
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -349,6 +350,9 @@
       <if test="orderDep != null">
         order_dep,
       </if>
+      <if test="outsource != null">
+        outsource,
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url,
       </if>
@@ -453,6 +457,9 @@
       <if test="orderDep != null">
         #{orderDep,jdbcType=VARCHAR},
       </if>
+      <if test="outsource != null">
+        #{outsource,jdbcType=INTEGER},
+      </if>
       <if test="contractPictureUrl != null">
         #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -462,7 +469,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     select count(*) from t_order_new
     <if test="_parameter != null">
@@ -473,7 +480,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     update t_order_new
     <set>
@@ -576,6 +583,9 @@
       <if test="record.orderDep != null">
         order_dep = #{record.orderDep,jdbcType=VARCHAR},
       </if>
+      <if test="record.outsource != null">
+        outsource = #{record.outsource,jdbcType=INTEGER},
+      </if>
       <if test="record.contractPictureUrl != null">
         contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -588,7 +598,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     update t_order_new
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -624,6 +634,7 @@
       proof_time = #{record.proofTime,jdbcType=TIMESTAMP},
       proof_status = #{record.proofStatus,jdbcType=INTEGER},
       order_dep = #{record.orderDep,jdbcType=VARCHAR},
+      outsource = #{record.outsource,jdbcType=INTEGER},
       contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -633,7 +644,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     update t_order_new
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -668,7 +679,8 @@
       proof_aid = #{record.proofAid,jdbcType=VARCHAR},
       proof_time = #{record.proofTime,jdbcType=TIMESTAMP},
       proof_status = #{record.proofStatus,jdbcType=INTEGER},
-      order_dep = #{record.orderDep,jdbcType=VARCHAR}
+      order_dep = #{record.orderDep,jdbcType=VARCHAR},
+      outsource = #{record.outsource,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -677,7 +689,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     update t_order_new
     <set>
@@ -777,6 +789,9 @@
       <if test="orderDep != null">
         order_dep = #{orderDep,jdbcType=VARCHAR},
       </if>
+      <if test="outsource != null">
+        outsource = #{outsource,jdbcType=INTEGER},
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -787,7 +802,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     update t_order_new
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -822,6 +837,7 @@
       proof_time = #{proofTime,jdbcType=TIMESTAMP},
       proof_status = #{proofStatus,jdbcType=INTEGER},
       order_dep = #{orderDep,jdbcType=VARCHAR},
+      outsource = #{outsource,jdbcType=INTEGER},
       contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -829,7 +845,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon May 06 11:18:39 CST 2019.
+      This element was generated on Mon Jun 17 11:48:15 CST 2019.
     -->
     update t_order_new
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -863,22 +879,19 @@
       proof_aid = #{proofAid,jdbcType=VARCHAR},
       proof_time = #{proofTime,jdbcType=TIMESTAMP},
       proof_status = #{proofStatus,jdbcType=INTEGER},
-      order_dep = #{orderDep,jdbcType=VARCHAR}
+      order_dep = #{orderDep,jdbcType=VARCHAR},
+      outsource = #{outsource,jdbcType=INTEGER}
     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,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
+  	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
+  	and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
   	<if test="o.processStatus == 2">
   	and process_status = #{o.processStatus,jdbcType=INTEGER}
   	</if>
@@ -903,44 +916,14 @@
   	<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, 
-	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,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 != &quot;&quot;">
-  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
-  	</if>
-  	<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 != &quot;&quot;">
-  	<bind name="n" value="'%' + o.buyerName + '%'" />
-  	and u.nickname  like #{n,jdbcType=VARCHAR}
-  	</if>
-  	<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
-  	order by oo.processStatus,oo.createTime desc
+  	order by o.process_status,o.create_time desc
 	<if test="page_sql != null">
 		${page_sql}
 	</if>
   </select>
   <select id="getAllUnassignedCountOrder" parameterType="Map" resultType="java.lang.Integer">
-  select count(*) from (
-  	select o.*
-  	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
-  	where delete_sign = 0
-  	and order_status = 2
+  select count(*) 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
+  	where delete_sign = 0 and order_status = 2 and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
   	<if test="o.processStatus == 2">
   	and process_status = #{o.processStatus,jdbcType=INTEGER}
   	</if>
@@ -965,28 +948,6 @@
   	<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.*
-	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 
-	where delete_sign = 0 and approval = 2 and finance_id is null and order_status = 2
-  	<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 != &quot;&quot;">
-  	and o.finance_id = #{o.financeId,jdbcType=VARCHAR}
-  	</if>
-  	<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 != &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
   </select>
   <!-- 查看某订单状态是否符合要求 -->
   <select id="getCountByIdAndStatus" parameterType="com.goafanti.common.model.TOrderNew" resultType="java.lang.Integer">
@@ -1072,7 +1033,7 @@
   	 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
+  	 where delete_sign = 0 and outsource=#{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>
@@ -1116,7 +1077,7 @@
   	 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
+  	 where delete_sign = 0 and outsource=#{o.outsource,jdbcType=INTEGER}
   		<if test="o.processStatus == 3">
 	  	and process_status = #{o.processStatus,jdbcType=INTEGER}
 	  	</if>

+ 335 - 0
src/main/java/com/goafanti/common/model/OutsourceOrganization.java

@@ -0,0 +1,335 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class OutsourceOrganization {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.id
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.name
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.contacts
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private String contacts;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.contacts_mobile
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private String contactsMobile;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.province
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private Integer province;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.city
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private Integer city;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.area
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private Integer area;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.address
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private String address;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.remarks
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private String remarks;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column outsource_organization.create_time
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.id
+     *
+     * @return the value of outsource_organization.id
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.id
+     *
+     * @param id the value for outsource_organization.id
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.name
+     *
+     * @return the value of outsource_organization.name
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.name
+     *
+     * @param name the value for outsource_organization.name
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.contacts
+     *
+     * @return the value of outsource_organization.contacts
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public String getContacts() {
+        return contacts;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.contacts
+     *
+     * @param contacts the value for outsource_organization.contacts
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.contacts_mobile
+     *
+     * @return the value of outsource_organization.contacts_mobile
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public String getContactsMobile() {
+        return contactsMobile;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.contacts_mobile
+     *
+     * @param contactsMobile the value for outsource_organization.contacts_mobile
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setContactsMobile(String contactsMobile) {
+        this.contactsMobile = contactsMobile;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.province
+     *
+     * @return the value of outsource_organization.province
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public Integer getProvince() {
+        return province;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.province
+     *
+     * @param province the value for outsource_organization.province
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setProvince(Integer province) {
+        this.province = province;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.city
+     *
+     * @return the value of outsource_organization.city
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public Integer getCity() {
+        return city;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.city
+     *
+     * @param city the value for outsource_organization.city
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setCity(Integer city) {
+        this.city = city;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.area
+     *
+     * @return the value of outsource_organization.area
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public Integer getArea() {
+        return area;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.area
+     *
+     * @param area the value for outsource_organization.area
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setArea(Integer area) {
+        this.area = area;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.address
+     *
+     * @return the value of outsource_organization.address
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.address
+     *
+     * @param address the value for outsource_organization.address
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.remarks
+     *
+     * @return the value of outsource_organization.remarks
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.remarks
+     *
+     * @param remarks the value for outsource_organization.remarks
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column outsource_organization.create_time
+     *
+     * @return the value of outsource_organization.create_time
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column outsource_organization.create_time
+     *
+     * @param createTime the value for outsource_organization.create_time
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 953 - 0
src/main/java/com/goafanti/common/model/OutsourceOrganizationExample.java

@@ -0,0 +1,953 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class OutsourceOrganizationExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public OutsourceOrganizationExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == 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) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsIsNull() {
+            addCriterion("contacts is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsIsNotNull() {
+            addCriterion("contacts is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsEqualTo(String value) {
+            addCriterion("contacts =", value, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsNotEqualTo(String value) {
+            addCriterion("contacts <>", value, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsGreaterThan(String value) {
+            addCriterion("contacts >", value, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsGreaterThanOrEqualTo(String value) {
+            addCriterion("contacts >=", value, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsLessThan(String value) {
+            addCriterion("contacts <", value, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsLessThanOrEqualTo(String value) {
+            addCriterion("contacts <=", value, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsLike(String value) {
+            addCriterion("contacts like", value, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsNotLike(String value) {
+            addCriterion("contacts not like", value, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsIn(List<String> values) {
+            addCriterion("contacts in", values, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsNotIn(List<String> values) {
+            addCriterion("contacts not in", values, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsBetween(String value1, String value2) {
+            addCriterion("contacts between", value1, value2, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsNotBetween(String value1, String value2) {
+            addCriterion("contacts not between", value1, value2, "contacts");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileIsNull() {
+            addCriterion("contacts_mobile is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileIsNotNull() {
+            addCriterion("contacts_mobile is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileEqualTo(String value) {
+            addCriterion("contacts_mobile =", value, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileNotEqualTo(String value) {
+            addCriterion("contacts_mobile <>", value, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileGreaterThan(String value) {
+            addCriterion("contacts_mobile >", value, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileGreaterThanOrEqualTo(String value) {
+            addCriterion("contacts_mobile >=", value, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileLessThan(String value) {
+            addCriterion("contacts_mobile <", value, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileLessThanOrEqualTo(String value) {
+            addCriterion("contacts_mobile <=", value, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileLike(String value) {
+            addCriterion("contacts_mobile like", value, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileNotLike(String value) {
+            addCriterion("contacts_mobile not like", value, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileIn(List<String> values) {
+            addCriterion("contacts_mobile in", values, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileNotIn(List<String> values) {
+            addCriterion("contacts_mobile not in", values, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileBetween(String value1, String value2) {
+            addCriterion("contacts_mobile between", value1, value2, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andContactsMobileNotBetween(String value1, String value2) {
+            addCriterion("contacts_mobile not between", value1, value2, "contactsMobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIsNull() {
+            addCriterion("province is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIsNotNull() {
+            addCriterion("province is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceEqualTo(Integer value) {
+            addCriterion("province =", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotEqualTo(Integer value) {
+            addCriterion("province <>", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceGreaterThan(Integer value) {
+            addCriterion("province >", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceGreaterThanOrEqualTo(Integer value) {
+            addCriterion("province >=", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceLessThan(Integer value) {
+            addCriterion("province <", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceLessThanOrEqualTo(Integer value) {
+            addCriterion("province <=", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIn(List<Integer> values) {
+            addCriterion("province in", values, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotIn(List<Integer> values) {
+            addCriterion("province not in", values, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceBetween(Integer value1, Integer value2) {
+            addCriterion("province between", value1, value2, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotBetween(Integer value1, Integer value2) {
+            addCriterion("province not between", value1, value2, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIsNull() {
+            addCriterion("city is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIsNotNull() {
+            addCriterion("city is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityEqualTo(Integer value) {
+            addCriterion("city =", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotEqualTo(Integer value) {
+            addCriterion("city <>", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityGreaterThan(Integer value) {
+            addCriterion("city >", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityGreaterThanOrEqualTo(Integer value) {
+            addCriterion("city >=", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityLessThan(Integer value) {
+            addCriterion("city <", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityLessThanOrEqualTo(Integer value) {
+            addCriterion("city <=", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIn(List<Integer> values) {
+            addCriterion("city in", values, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotIn(List<Integer> values) {
+            addCriterion("city not in", values, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityBetween(Integer value1, Integer value2) {
+            addCriterion("city between", value1, value2, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotBetween(Integer value1, Integer value2) {
+            addCriterion("city not between", value1, value2, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIsNull() {
+            addCriterion("area is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIsNotNull() {
+            addCriterion("area is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaEqualTo(Integer value) {
+            addCriterion("area =", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNotEqualTo(Integer value) {
+            addCriterion("area <>", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaGreaterThan(Integer value) {
+            addCriterion("area >", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaGreaterThanOrEqualTo(Integer value) {
+            addCriterion("area >=", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaLessThan(Integer value) {
+            addCriterion("area <", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaLessThanOrEqualTo(Integer value) {
+            addCriterion("area <=", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIn(List<Integer> values) {
+            addCriterion("area in", values, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNotIn(List<Integer> values) {
+            addCriterion("area not in", values, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaBetween(Integer value1, Integer value2) {
+            addCriterion("area between", value1, value2, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNotBetween(Integer value1, Integer value2) {
+            addCriterion("area not between", value1, value2, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNull() {
+            addCriterion("address is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNotNull() {
+            addCriterion("address is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressEqualTo(String value) {
+            addCriterion("address =", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotEqualTo(String value) {
+            addCriterion("address <>", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThan(String value) {
+            addCriterion("address >", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("address >=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThan(String value) {
+            addCriterion("address <", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThanOrEqualTo(String value) {
+            addCriterion("address <=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLike(String value) {
+            addCriterion("address like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotLike(String value) {
+            addCriterion("address not like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIn(List<String> values) {
+            addCriterion("address in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotIn(List<String> values) {
+            addCriterion("address not in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressBetween(String value1, String value2) {
+            addCriterion("address between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotBetween(String value1, String value2) {
+            addCriterion("address not between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNull() {
+            addCriterion("remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNotNull() {
+            addCriterion("remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksEqualTo(String value) {
+            addCriterion("remarks =", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotEqualTo(String value) {
+            addCriterion("remarks <>", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThan(String value) {
+            addCriterion("remarks >", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("remarks >=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThan(String value) {
+            addCriterion("remarks <", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThanOrEqualTo(String value) {
+            addCriterion("remarks <=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLike(String value) {
+            addCriterion("remarks like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotLike(String value) {
+            addCriterion("remarks not like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIn(List<String> values) {
+            addCriterion("remarks in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotIn(List<String> values) {
+            addCriterion("remarks not in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksBetween(String value1, String value2) {
+            addCriterion("remarks between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotBetween(String value1, String value2) {
+            addCriterion("remarks not between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table outsource_organization
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Jun 17 15:40:01 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table outsource_organization
+     *
+     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 127 - 136
src/main/java/com/goafanti/common/model/TOrderNew.java

@@ -4,214 +4,187 @@ import java.math.BigDecimal;
 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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String orderNo;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_type
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Integer orderType;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.creater
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String creater;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.create_time
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Date createTime;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.update_time
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Date updateTime;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.buyer_id
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String buyerId;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.first_amount
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private BigDecimal firstAmount;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.total_amount
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private BigDecimal totalAmount;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.settlement_amount
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private BigDecimal settlementAmount;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.refund_amount
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private BigDecimal refundAmount;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_status
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Integer orderStatus;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.liquidation_status
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Integer liquidationStatus;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.process_status
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Integer processStatus;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.project_status
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Integer projectStatus;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.approval
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Integer approval;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.order_remarks
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String orderRemarks;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.delete_sign
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Integer deleteSign;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.salesman_id
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String salesmanId;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.finance_id
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String financeId;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.technician_id
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String technicianId;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.sign_time
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Date signTime;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.settlement_time
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Date settlementTime;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_no
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String contractNo;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_type
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String contractType;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contacts
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String contacts;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contact_mobile
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String contactMobile;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.legal_person
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String legalPersonTel;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_count
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private Float proofCount;
-
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.proof_aid
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	private String orderDep;
-
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.outsource
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 */
+	private Integer outsource;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_new.contract_picture_url
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -220,7 +193,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -229,7 +202,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Integer getOrderType() {
 		return orderType;
@@ -238,7 +211,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
@@ -247,7 +220,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getCreater() {
 		return creater;
@@ -256,7 +229,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -265,7 +238,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -274,7 +247,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -283,7 +256,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -292,7 +265,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -301,7 +274,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -310,7 +283,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -319,7 +292,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public BigDecimal getFirstAmount() {
 		return firstAmount;
@@ -328,7 +301,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setFirstAmount(BigDecimal firstAmount) {
 		this.firstAmount = firstAmount;
@@ -337,7 +310,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -346,7 +319,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -355,7 +328,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public BigDecimal getSettlementAmount() {
 		return settlementAmount;
@@ -364,7 +337,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setSettlementAmount(BigDecimal settlementAmount) {
 		this.settlementAmount = settlementAmount;
@@ -373,7 +346,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public BigDecimal getRefundAmount() {
 		return refundAmount;
@@ -382,7 +355,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setRefundAmount(BigDecimal refundAmount) {
 		this.refundAmount = refundAmount;
@@ -391,7 +364,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -400,7 +373,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -409,7 +382,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -418,7 +391,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
@@ -427,7 +400,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Integer getProcessStatus() {
 		return processStatus;
@@ -436,7 +409,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setProcessStatus(Integer processStatus) {
 		this.processStatus = processStatus;
@@ -445,7 +418,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Integer getProjectStatus() {
 		return projectStatus;
@@ -454,7 +427,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
@@ -463,7 +436,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Integer getApproval() {
 		return approval;
@@ -472,7 +445,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setApproval(Integer approval) {
 		this.approval = approval;
@@ -481,7 +454,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getOrderRemarks() {
 		return orderRemarks;
@@ -490,7 +463,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
@@ -499,7 +472,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -508,7 +481,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -517,7 +490,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -526,7 +499,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -535,7 +508,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -544,7 +517,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -553,7 +526,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getTechnicianId() {
 		return technicianId;
@@ -562,7 +535,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setTechnicianId(String technicianId) {
 		this.technicianId = technicianId;
@@ -571,7 +544,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Date getSignTime() {
 		return signTime;
@@ -580,7 +553,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setSignTime(Date signTime) {
 		this.signTime = signTime;
@@ -589,7 +562,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Date getSettlementTime() {
 		return settlementTime;
@@ -598,7 +571,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setSettlementTime(Date settlementTime) {
 		this.settlementTime = settlementTime;
@@ -607,7 +580,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getContractNo() {
 		return contractNo;
@@ -616,7 +589,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setContractNo(String contractNo) {
 		this.contractNo = contractNo;
@@ -625,7 +598,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getContractType() {
 		return contractType;
@@ -634,7 +607,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setContractType(String contractType) {
 		this.contractType = contractType;
@@ -643,7 +616,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getContacts() {
 		return contacts;
@@ -652,7 +625,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -661,7 +634,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -670,7 +643,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
@@ -679,7 +652,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getLegalPerson() {
 		return legalPerson;
@@ -688,7 +661,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setLegalPerson(String legalPerson) {
 		this.legalPerson = legalPerson;
@@ -697,7 +670,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getLegalPersonTel() {
 		return legalPersonTel;
@@ -706,7 +679,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setLegalPersonTel(String legalPersonTel) {
 		this.legalPersonTel = legalPersonTel;
@@ -715,7 +688,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Float getProofCount() {
 		return proofCount;
@@ -724,7 +697,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setProofCount(Float proofCount) {
 		this.proofCount = proofCount;
@@ -733,7 +706,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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getProofAid() {
 		return proofAid;
@@ -742,7 +715,7 @@ 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
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setProofAid(String proofAid) {
 		this.proofAid = proofAid;
@@ -751,7 +724,7 @@ public class TOrderNew {
 	/**
 	 * 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Date getProofTime() {
 		return proofTime;
@@ -760,7 +733,7 @@ public class TOrderNew {
 	/**
 	 * 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setProofTime(Date proofTime) {
 		this.proofTime = proofTime;
@@ -769,7 +742,7 @@ public class TOrderNew {
 	/**
 	 * 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Integer getProofStatus() {
 		return proofStatus;
@@ -778,7 +751,7 @@ public class TOrderNew {
 	/**
 	 * 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setProofStatus(Integer proofStatus) {
 		this.proofStatus = proofStatus;
@@ -787,7 +760,7 @@ public class TOrderNew {
 	/**
 	 * 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getOrderDep() {
 		return orderDep;
@@ -796,16 +769,34 @@ public class TOrderNew {
 	/**
 	 * 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 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.outsource
+	 * @return  the value of t_order_new.outsource
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 */
+	public Integer getOutsource() {
+		return outsource;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_new.outsource
+	 * @param outsource  the value for t_order_new.outsource
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
+	 */
+	public void setOutsource(Integer outsource) {
+		this.outsource = outsource;
+	}
+
+	/**
 	 * 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getContractPictureUrl() {
 		return contractPictureUrl;
@@ -814,7 +805,7 @@ public class TOrderNew {
 	/**
 	 * 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
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setContractPictureUrl(String contractPictureUrl) {
 		this.contractPictureUrl = contractPictureUrl;

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

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderNewExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public TOrderNewExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2320,11 +2320,71 @@ public class TOrderNewExample {
 			addCriterion("order_dep not between", value1, value2, "orderDep");
 			return (Criteria) this;
 		}
+
+		public Criteria andOutsourceIsNull() {
+			addCriterion("outsource is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceIsNotNull() {
+			addCriterion("outsource is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceEqualTo(Integer value) {
+			addCriterion("outsource =", value, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceNotEqualTo(Integer value) {
+			addCriterion("outsource <>", value, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceGreaterThan(Integer value) {
+			addCriterion("outsource >", value, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceGreaterThanOrEqualTo(Integer value) {
+			addCriterion("outsource >=", value, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceLessThan(Integer value) {
+			addCriterion("outsource <", value, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceLessThanOrEqualTo(Integer value) {
+			addCriterion("outsource <=", value, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceIn(List<Integer> values) {
+			addCriterion("outsource in", values, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceNotIn(List<Integer> values) {
+			addCriterion("outsource not in", values, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceBetween(Integer value1, Integer value2) {
+			addCriterion("outsource between", value1, value2, "outsource");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceNotBetween(Integer value1, Integer value2) {
+			addCriterion("outsource not between", value1, value2, "outsource");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbg.generated  Mon May 06 11:18:39 CST 2019
+	 * @mbg.generated  Mon Jun 17 11:48:15 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 8 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -72,6 +72,8 @@ public class OrderListBo {
 	private String contractNo;
 	/** 部门编号*/
 	private String departmentId;
+	/** 外包*/
+	private Integer outsource;
 	
 	public String getOrderNo() {
 		return orderNo;
@@ -271,4 +273,10 @@ public class OrderListBo {
 	public void setDepartmentId(String departmentId) {
 		this.departmentId = departmentId;
 	}
+	public Integer getOutsource() {
+		return outsource;
+	}
+	public void setOutsource(Integer outsource) {
+		this.outsource = outsource;
+	}
 }

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

@@ -249,7 +249,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 订单审核
 	 */
 	@RequestMapping(value="/auditOrderNew", method = RequestMethod.POST)
-	public Result auditOrderNew(String orderNo,Integer orderStatus,String reason){
+	public Result auditOrderNew(String orderNo,Integer orderStatus,String reason,Integer outsource){
 		Result res=new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号","订单编号"));
@@ -264,7 +264,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"驳回原因", "驳回原因"));
 			return res;
 		}
-		return res.data(orderNewService.updateOrderNew(orderNo,orderStatus,reason));
+		return res.data(orderNewService.updateOrderNew(orderNo,orderStatus,reason,outsource));
 	}
 	/**
 	 * 催款统计列表

+ 2 - 3
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -43,7 +43,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	
 	/**
 	 * 财务管理员查看所有待分配的订单
-	 * @param order
+	 * @param order	>> outsource 0否 1外包
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
@@ -51,7 +51,6 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	@RequestMapping(value="/allUnassignedOrder",method = RequestMethod.GET)
 	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;
@@ -81,7 +80,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 	
 	/**
 	 * 财务专员查看分配给自己的订单
-	 * @param order
+	 * @param order >> outsource 0否 1外包
 	 * @param pageNo
 	 * @param pageSize
 	 * @return

+ 56 - 0
src/main/java/com/goafanti/order/controller/outsourceOrgApiController.java

@@ -0,0 +1,56 @@
+package com.goafanti.order.controller;
+
+
+
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.model.OutsourceOrganization;
+import com.goafanti.order.service.OutsourceOrgService;
+
+@RestController
+@RequestMapping(value = "/api/admin/outsourceOrg")
+public class outsourceOrgApiController extends CertifyApiController {
+	
+	@Resource
+	private OutsourceOrgService	outsourceOrgService;
+	
+	@RequestMapping(value = "/addOutsourceOrg", method=RequestMethod.POST)
+	public Result addOutsourceOrg(OutsourceOrganization o) {
+		Result res=new Result();
+		if (StringUtils.isBlank(o.getName())||
+				StringUtils.isBlank(o.getContacts())||
+					StringUtils.isBlank(o.getContactsMobile())) {
+			res.getError().add(buildError("", "名称、联系人、电话不能为空"));
+		}
+		outsourceOrgService.addOutsourceOrg(o);
+		return res;
+	}
+	@RequestMapping(value = "/updateOutsourceOrg", method=RequestMethod.POST)
+	public Result updateOutsourceOrg(OutsourceOrganization o) {
+		Result res=new Result();
+		if (StringUtils.isBlank(o.getName())||
+				StringUtils.isBlank(o.getContacts())||
+					StringUtils.isBlank(o.getContactsMobile())) {
+			res.getError().add(buildError("", "名称、联系人、电话不能为空"));
+		}
+		outsourceOrgService.updateOutsourceOrg(o);
+		return res;
+	}
+	@RequestMapping(value = "/deleteOutsourceOrg", method=RequestMethod.POST)
+	public Result deleteOutsourceOrg(Integer id) {
+		Result res=new Result();
+		if (id!=null) {
+			res.getError().add(buildError("", "必须选择外包公司"));
+		}
+		outsourceOrgService.deleteOutsourceOrg(id);
+		return res;
+	}
+}

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -93,7 +93,7 @@ public interface OrderNewService {
 	 * @param orderStatus
 	 * @return
 	 */
-	int updateOrderNew(String orderNo, Integer orderStatus,String reason);
+	int updateOrderNew(String orderNo, Integer orderStatus,String reason,Integer outsource);
 	
 	/**
 	 * 催款订单列表

+ 12 - 0
src/main/java/com/goafanti/order/service/OutsourceOrgService.java

@@ -0,0 +1,12 @@
+package com.goafanti.order.service;
+
+import com.goafanti.common.model.OutsourceOrganization;
+
+public interface OutsourceOrgService {
+	
+	int addOutsourceOrg(OutsourceOrganization o);
+	
+	int updateOutsourceOrg(OutsourceOrganization o);
+	
+	int deleteOutsourceOrg(Integer id);
+}

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -87,10 +87,9 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	@Override
 	public Pagination<OrderListBo> allUnassignedOrder(OrderListBo order, Integer pageNo,
 			Integer pageSize) {
-		
 		Map<String, Object> params = new HashMap<String, Object>();
+		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包 
 		params.put("o", order);
-		
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("getAllUnassignedListOrder", "getAllUnassignedCountOrder", params, pageNo, pageSize);
 		return data;
 	}
@@ -146,6 +145,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	public Pagination<OrderListBo> financeList(OrderListBo order,
 			Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
+		if (order.getOutsource()==null)order.setOutsource(0);//默认非外包 
 		params.put("o", order);
 		Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("financeList", "financeCount", params, pageNo, pageSize);
 		return data;

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

@@ -396,16 +396,20 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	
 
 	@Override
-	public int updateOrderNew(String orderNo, Integer orderStatus,String reason) {
+	public int updateOrderNew(String orderNo, Integer orderStatus,String reason,Integer outsource) {
 		TOrderNew t= new TOrderNew();
 		TOrderNew t2= tOrderNewMapper.selectByPrimaryKey(orderNo);
 		t.setOrderNo(orderNo);
-		if (orderStatus==OrderNewState.QDSHTG.getCode()&&t2.getApproval()==ApprovalNewState.FTP.getCode()) {//如果通过分配给财务管理员
+		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
+			if (t2.getApproval()==ApprovalNewState.FTP.getCode()) {//如果通过分配给财务管理员
 				t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
 				addOrderLog(orderNo, OrderLogProcess.SH.getCode());
-		}else if (orderStatus==OrderNewState.QDSHTG.getCode()&&t2.getApproval()==ApprovalNewState.DSH.getCode()) {
+		}else if (t2.getApproval()==ApprovalNewState.DSH.getCode()) {
 				addOrderLog(orderNo, OrderLogProcess.SH.getCode());
 		}
+			if(outsource==1)t.setOutsource(outsource);
+		}
+	
 		if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
 			t.setProcessStatus(ProcessStatus.YPYXY.getCode());
 			addBackOrder(orderNo, reason);

+ 25 - 0
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -0,0 +1,25 @@
+package com.goafanti.order.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.goafanti.common.dao.OutsourceOrganizationMapper;
+import com.goafanti.common.model.OutsourceOrganization;
+import com.goafanti.order.service.OutsourceOrgService;
+
+public class OutsourceOrgServiceImpl implements OutsourceOrgService {
+	@Autowired
+	private OutsourceOrganizationMapper  outsourceOrganizationMapper;
+	@Override
+	public int addOutsourceOrg(OutsourceOrganization o) {
+		return outsourceOrganizationMapper.insertSelective(o);
+	}
+	@Override
+	public int updateOutsourceOrg(OutsourceOrganization o) {
+		return outsourceOrganizationMapper.updateByPrimaryKeySelective(o);
+	}
+	@Override
+	public int deleteOutsourceOrg(Integer id) {
+		return outsourceOrganizationMapper.deleteByPrimaryKey(id);
+	}
+
+}

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

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-#jdbc.username=dev
-#jdbc.password=123456
+jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.username=dev
+jdbc.password=123456
 #测试
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-jdbc.username=root
-jdbc.password=aftdev
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570
@@ -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.1.06
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.06
+avatar.host=//sb.jishutao.com
 
 #连生产
-avatar.host=//static.kedexinxi.com
-static.host=//s.kedexinxi.com/1.1.06
+#avatar.host=//static.kedexinxi.com
+#static.host=//s.kedexinxi.com/1.1.06
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload