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

Merge branch 'test' of jishutao/kede-server into prod

anderx лет назад: 6
Родитель
Сommit
f81a3cad44
25 измененных файлов с 1113 добавлено и 497 удалено
  1. 1 1
      GeneratorConfig.xml
  2. 11 11
      src/main/java/com/goafanti/common/dao/TOrderOutsourceMapper.java
  3. 14 14
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  4. 1 1
      src/main/java/com/goafanti/common/dao/TTaskHoursMapper.java
  5. 7 0
      src/main/java/com/goafanti/common/enums/roleResources.java
  6. 1 1
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  7. 70 22
      src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml
  8. 123 80
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  9. 4 1
      src/main/java/com/goafanti/common/mapper/TTaskHoursMapper.xml
  10. 99 30
      src/main/java/com/goafanti/common/model/TOrderOutsource.java
  11. 206 16
      src/main/java/com/goafanti/common/model/TOrderOutsourceExample.java
  12. 192 146
      src/main/java/com/goafanti/common/model/TOrderTask.java
  13. 282 152
      src/main/java/com/goafanti/common/model/TOrderTaskExample.java
  14. 20 0
      src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java
  15. 15 0
      src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java
  16. 5 4
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  17. 12 0
      src/main/java/com/goafanti/order/service/FundManageOrderService.java
  18. 3 2
      src/main/java/com/goafanti/order/service/OrderProjectService.java
  19. 22 6
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  20. 4 2
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  21. 9 3
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  22. 1 2
      src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java
  23. 9 1
      src/main/java/com/goafanti/patent/controller/AdminPatentNewApiController.java
  24. 1 1
      src/main/resources/props/config_local.properties
  25. 1 1
      src/main/resources/props/config_test.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_outsource"/>
+    <table schema="aft" tableName="t_order_task"/>
   </context>
 </generatorConfiguration>

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

@@ -10,68 +10,68 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderOutsourceMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	long countByExample(TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	int deleteByExample(TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	int insert(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	int insertSelective(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	List<TOrderOutsource> selectByExample(TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	TOrderOutsource selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") TOrderOutsource record,
 			@Param("example") TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	int updateByExample(@Param("record") TOrderOutsource record, @Param("example") TOrderOutsourceExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderOutsource record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderOutsource record);
 

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

@@ -11,85 +11,85 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	long countByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int deleteByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	List<TOrderTask> selectByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 1 - 1
src/main/java/com/goafanti/common/dao/TTaskHoursMapper.java

@@ -80,5 +80,5 @@ public interface TTaskHoursMapper {
 
 	List<TOrderTaskListBo> getOrderDunData(String name, String taskId, String starTime, String endTime);
 
-	List<TOrderTaskListBo> getTaskHoursData( @Param("name")String name,  @Param("taskId")String taskId,  @Param("startTime")String startTime,  @Param("endTime")String endTime);
+	List<TOrderTaskListBo> getTaskHoursData( @Param("name")String name,  @Param("taskId")String taskId,  @Param("startTime")String startTime,  @Param("endTime")String endTime,@Param("fid")String fid);
 }

+ 7 - 0
src/main/java/com/goafanti/common/enums/roleResources.java

@@ -4,12 +4,19 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum roleResources {
+	/**意向客户 */
 	YXKH(	0, "意向客户"),
+	/**签单业务  */
 	QDYW(1, "签单业务 "),
+	/**客户资料  */
 	KHZL(2, "客户资料 "),
+	/**已签订单 */
 	YQDD(3, "已签订单"), 
+	/**项目任务  */
 	XMRW(	4, "项目任务 "),
+	/**科技需求 */
 	KJXQ(	5, "科技需求"), 
+	/**科技成果 */
 	KJCG(	6, "科技成果"),
 	OTHER(7, "未知参数");
 	

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

@@ -1381,7 +1381,7 @@ where super_id is null ) e on e.order_no=a.order_no
     a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount, a.proof_aid as proofAid,contract_picture_url as contractPictureUrl,
     c.name as salesmanName,dep.name as depName,d.name as financeName,c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName
     ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep,
-    g.location_province as locationProvince,g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress
+    g.location_province as locationProvince,g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress,outsource
     from t_order_new a left join `user` b on a.buyer_id=b.id left join admin c on a.salesman_id=c.id
     left join department dep on a.order_dep=dep.id left join admin d on a.finance_id=d.id
   	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no

+ 70 - 22
src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -17,12 +17,15 @@
     <result column="amount" jdbcType="DECIMAL" property="amount" />
     <result column="company_name" jdbcType="VARCHAR" property="companyName" />
     <result column="audit_time" jdbcType="TIMESTAMP" property="auditTime" />
+    <result column="unit_price" jdbcType="DECIMAL" property="unitPrice" />
+    <result column="unit_number" jdbcType="INTEGER" property="unitNumber" />
+    <result column="outsource_remarks" jdbcType="VARCHAR" property="outsourceRemarks" />
   </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 Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -56,7 +59,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -90,16 +93,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     id, order_no, refund_status, create_time, remarks, attachment_url, picture_url, amount, 
-    company_name, audit_time
+    company_name, audit_time, unit_price, unit_number, outsource_remarks
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderOutsourceExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     select
     <if test="distinct">
@@ -118,7 +121,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -129,7 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     delete from t_order_outsource
     where id = #{id,jdbcType=INTEGER}
@@ -138,7 +141,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     delete from t_order_outsource
     <if test="_parameter != null">
@@ -149,22 +152,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     insert into t_order_outsource (id, order_no, refund_status, 
       create_time, remarks, attachment_url, 
       picture_url, amount, company_name, 
-      audit_time)
+      audit_time, unit_price, unit_number, 
+      outsource_remarks)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{refundStatus,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=VARCHAR}, 
       #{pictureUrl,jdbcType=VARCHAR}, #{amount,jdbcType=DECIMAL}, #{companyName,jdbcType=VARCHAR}, 
-      #{auditTime,jdbcType=TIMESTAMP})
+      #{auditTime,jdbcType=TIMESTAMP}, #{unitPrice,jdbcType=DECIMAL}, #{unitNumber,jdbcType=INTEGER}, 
+      #{outsourceRemarks,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderOutsource">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     insert into t_order_outsource
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -198,6 +203,15 @@
       <if test="auditTime != null">
         audit_time,
       </if>
+      <if test="unitPrice != null">
+        unit_price,
+      </if>
+      <if test="unitNumber != null">
+        unit_number,
+      </if>
+      <if test="outsourceRemarks != null">
+        outsource_remarks,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -230,13 +244,22 @@
       <if test="auditTime != null">
         #{auditTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="unitPrice != null">
+        #{unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="unitNumber != null">
+        #{unitNumber,jdbcType=INTEGER},
+      </if>
+      <if test="outsourceRemarks != null">
+        #{outsourceRemarks,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderOutsourceExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     select count(*) from t_order_outsource
     <if test="_parameter != null">
@@ -247,7 +270,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     update t_order_outsource
     <set>
@@ -281,6 +304,15 @@
       <if test="record.auditTime != null">
         audit_time = #{record.auditTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.unitPrice != null">
+        unit_price = #{record.unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.unitNumber != null">
+        unit_number = #{record.unitNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.outsourceRemarks != null">
+        outsource_remarks = #{record.outsourceRemarks,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -290,7 +322,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     update t_order_outsource
     set id = #{record.id,jdbcType=INTEGER},
@@ -302,7 +334,10 @@
       picture_url = #{record.pictureUrl,jdbcType=VARCHAR},
       amount = #{record.amount,jdbcType=DECIMAL},
       company_name = #{record.companyName,jdbcType=VARCHAR},
-      audit_time = #{record.auditTime,jdbcType=TIMESTAMP}
+      audit_time = #{record.auditTime,jdbcType=TIMESTAMP},
+      unit_price = #{record.unitPrice,jdbcType=DECIMAL},
+      unit_number = #{record.unitNumber,jdbcType=INTEGER},
+      outsource_remarks = #{record.outsourceRemarks,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -311,7 +346,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     update t_order_outsource
     <set>
@@ -342,6 +377,15 @@
       <if test="auditTime != null">
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="unitPrice != null">
+        unit_price = #{unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="unitNumber != null">
+        unit_number = #{unitNumber,jdbcType=INTEGER},
+      </if>
+      <if test="outsourceRemarks != null">
+        outsource_remarks = #{outsourceRemarks,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -349,7 +393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jul 30 16:33:59 CST 2019.
+      This element was generated on Mon Aug 12 10:26:36 CST 2019.
     -->
     update t_order_outsource
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -360,13 +404,17 @@
       picture_url = #{pictureUrl,jdbcType=VARCHAR},
       amount = #{amount,jdbcType=DECIMAL},
       company_name = #{companyName,jdbcType=VARCHAR},
-      audit_time = #{auditTime,jdbcType=TIMESTAMP}
+      audit_time = #{auditTime,jdbcType=TIMESTAMP},
+      unit_price = #{unitPrice,jdbcType=DECIMAL},
+      unit_number = #{unitNumber,jdbcType=INTEGER},
+      outsource_remarks = #{outsourceRemarks,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByOrderNo" resultType="com.goafanti.order.bo.OrderOutsourceDtails">
-  select id, order_no orderNo, refund_status refundStatus, date_format(create_time,'%Y-%m-%d %H:%i:%S') createTimes , remarks,
+     select id, order_no orderNo, refund_status refundStatus, date_format(create_time,'%Y-%m-%d %H:%i:%S') createTimes , remarks,
 	 date_format(audit_time,'%Y-%m-%d %H:%i:%S') auditTimes,attachment_url attachmentUrl, picture_url pictureUrl, amount,
-	 company_name companyName from t_order_outsource where order_no =  #{orderNo}
+	 company_name companyName ,unit_price unitPrice,unit_number unitNumber,outsource_remarks outsourceRemarks from t_order_outsource
+	  where order_no =  #{orderNo}
   </select>
   <select id="orderOutsourceList" resultType="com.goafanti.order.bo.OrderOutsourceBo">
   select a.order_no orderNo,b.contract_no contractNo,date_format(b.create_time,'%Y-%m-%d %H:%i:%S') createTime,

+ 123 - 80
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -31,19 +31,21 @@
     <result column="certificate_number" jdbcType="VARCHAR" property="certificateNumber" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="form_retrieve" jdbcType="INTEGER" property="formRetrieve" />
-    <result column="declare_user" jdbcType="VARCHAR" property="declareUser" />
-    <result column="declare_pwd" jdbcType="VARCHAR" property="declarePwd" />
     <result column="task_refund" jdbcType="INTEGER" property="taskRefund" />
     <result column="refund_content" jdbcType="VARCHAR" property="refundContent" />
+    <result column="retrieve_content" jdbcType="VARCHAR" property="retrieveContent" />
+    <result column="declare_user" jdbcType="VARCHAR" property="declareUser" />
+    <result column="declare_pwd" jdbcType="VARCHAR" property="declarePwd" />
     <result column="set_up_amount" jdbcType="DECIMAL" property="setUpAmount" />
     <result column="arrival_money" jdbcType="INTEGER" property="arrivalMoney" />
-    <result column="retrieve_content" jdbcType="VARCHAR" property="retrieveContent" />
+    <result column="outsource_name" jdbcType="VARCHAR" property="outsourceName" />
+    <result column="outsource_price" jdbcType="DECIMAL" property="outsourcePrice" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -51,7 +53,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -85,7 +87,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -119,19 +121,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
     task_comment, task_start_time, task_end_time, project_status, accept_time, review_time, 
-    publicity_time, licence_time, certificate_number, status, form_retrieve, declare_user, 
-    declare_pwd, task_refund, refund_content, set_up_amount, arrival_money, retrieve_content
+    publicity_time, licence_time, certificate_number, status, form_retrieve, task_refund, 
+    refund_content, retrieve_content, declare_user, declare_pwd, set_up_amount, arrival_money, 
+    outsource_name, outsource_price
   </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 Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     attachment_url
   </sql>
@@ -139,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     select
     <if test="distinct">
@@ -160,7 +163,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     select
     <if test="distinct">
@@ -179,7 +182,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -192,7 +195,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -201,7 +204,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -212,7 +215,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -222,9 +225,10 @@
       task_end_time, project_status, accept_time, 
       review_time, publicity_time, licence_time, 
       certificate_number, status, form_retrieve, 
-      declare_user, declare_pwd, task_refund, 
-      refund_content, set_up_amount, arrival_money, 
-      retrieve_content, attachment_url)
+      task_refund, refund_content, retrieve_content, 
+      declare_user, declare_pwd, set_up_amount, 
+      arrival_money, outsource_name, outsource_price, 
+      attachment_url)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, 
       #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
       #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, 
@@ -233,15 +237,16 @@
       #{taskEndTime,jdbcType=TIMESTAMP}, #{projectStatus,jdbcType=INTEGER}, #{acceptTime,jdbcType=DATE}, 
       #{reviewTime,jdbcType=DATE}, #{publicityTime,jdbcType=DATE}, #{licenceTime,jdbcType=DATE}, 
       #{certificateNumber,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{formRetrieve,jdbcType=INTEGER}, 
-      #{declareUser,jdbcType=VARCHAR}, #{declarePwd,jdbcType=VARCHAR}, #{taskRefund,jdbcType=INTEGER}, 
-      #{refundContent,jdbcType=VARCHAR}, #{setUpAmount,jdbcType=DECIMAL}, #{arrivalMoney,jdbcType=INTEGER}, 
-      #{retrieveContent,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{taskRefund,jdbcType=INTEGER}, #{refundContent,jdbcType=VARCHAR}, #{retrieveContent,jdbcType=VARCHAR}, 
+      #{declareUser,jdbcType=VARCHAR}, #{declarePwd,jdbcType=VARCHAR}, #{setUpAmount,jdbcType=DECIMAL}, 
+      #{arrivalMoney,jdbcType=INTEGER}, #{outsourceName,jdbcType=VARCHAR}, #{outsourcePrice,jdbcType=DECIMAL}, 
+      #{attachmentUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -317,26 +322,32 @@
       <if test="formRetrieve != null">
         form_retrieve,
       </if>
-      <if test="declareUser != null">
-        declare_user,
-      </if>
-      <if test="declarePwd != null">
-        declare_pwd,
-      </if>
       <if test="taskRefund != null">
         task_refund,
       </if>
       <if test="refundContent != null">
         refund_content,
       </if>
+      <if test="retrieveContent != null">
+        retrieve_content,
+      </if>
+      <if test="declareUser != null">
+        declare_user,
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd,
+      </if>
       <if test="setUpAmount != null">
         set_up_amount,
       </if>
       <if test="arrivalMoney != null">
         arrival_money,
       </if>
-      <if test="retrieveContent != null">
-        retrieve_content,
+      <if test="outsourceName != null">
+        outsource_name,
+      </if>
+      <if test="outsourcePrice != null">
+        outsource_price,
       </if>
       <if test="attachmentUrl != null">
         attachment_url,
@@ -415,26 +426,32 @@
       <if test="formRetrieve != null">
         #{formRetrieve,jdbcType=INTEGER},
       </if>
-      <if test="declareUser != null">
-        #{declareUser,jdbcType=VARCHAR},
-      </if>
-      <if test="declarePwd != null">
-        #{declarePwd,jdbcType=VARCHAR},
-      </if>
       <if test="taskRefund != null">
         #{taskRefund,jdbcType=INTEGER},
       </if>
       <if test="refundContent != null">
         #{refundContent,jdbcType=VARCHAR},
       </if>
+      <if test="retrieveContent != null">
+        #{retrieveContent,jdbcType=VARCHAR},
+      </if>
+      <if test="declareUser != null">
+        #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        #{declarePwd,jdbcType=VARCHAR},
+      </if>
       <if test="setUpAmount != null">
         #{setUpAmount,jdbcType=DECIMAL},
       </if>
       <if test="arrivalMoney != null">
         #{arrivalMoney,jdbcType=INTEGER},
       </if>
-      <if test="retrieveContent != null">
-        #{retrieveContent,jdbcType=VARCHAR},
+      <if test="outsourceName != null">
+        #{outsourceName,jdbcType=VARCHAR},
+      </if>
+      <if test="outsourcePrice != null">
+        #{outsourcePrice,jdbcType=DECIMAL},
       </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
@@ -445,7 +462,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -456,7 +473,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     update t_order_task
     <set>
@@ -532,26 +549,32 @@
       <if test="record.formRetrieve != null">
         form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
       </if>
-      <if test="record.declareUser != null">
-        declare_user = #{record.declareUser,jdbcType=VARCHAR},
-      </if>
-      <if test="record.declarePwd != null">
-        declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
-      </if>
       <if test="record.taskRefund != null">
         task_refund = #{record.taskRefund,jdbcType=INTEGER},
       </if>
       <if test="record.refundContent != null">
         refund_content = #{record.refundContent,jdbcType=VARCHAR},
       </if>
+      <if test="record.retrieveContent != null">
+        retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
+      </if>
+      <if test="record.declareUser != null">
+        declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.declarePwd != null">
+        declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
+      </if>
       <if test="record.setUpAmount != null">
         set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
       </if>
       <if test="record.arrivalMoney != null">
         arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
       </if>
-      <if test="record.retrieveContent != null">
-        retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
+      <if test="record.outsourceName != null">
+        outsource_name = #{record.outsourceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outsourcePrice != null">
+        outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL},
       </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
@@ -565,7 +588,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -592,13 +615,15 @@
       certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
       form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
-      declare_user = #{record.declareUser,jdbcType=VARCHAR},
-      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
       task_refund = #{record.taskRefund,jdbcType=INTEGER},
       refund_content = #{record.refundContent,jdbcType=VARCHAR},
+      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
+      declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
       set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
       arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
-      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
+      outsource_name = #{record.outsourceName,jdbcType=VARCHAR},
+      outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -608,7 +633,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -635,13 +660,15 @@
       certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
       form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
-      declare_user = #{record.declareUser,jdbcType=VARCHAR},
-      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
       task_refund = #{record.taskRefund,jdbcType=INTEGER},
       refund_content = #{record.refundContent,jdbcType=VARCHAR},
+      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
+      declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
       set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
       arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
-      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR}
+      outsource_name = #{record.outsourceName,jdbcType=VARCHAR},
+      outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -650,7 +677,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     update t_order_task
     <set>
@@ -723,26 +750,32 @@
       <if test="formRetrieve != null">
         form_retrieve = #{formRetrieve,jdbcType=INTEGER},
       </if>
-      <if test="declareUser != null">
-        declare_user = #{declareUser,jdbcType=VARCHAR},
-      </if>
-      <if test="declarePwd != null">
-        declare_pwd = #{declarePwd,jdbcType=VARCHAR},
-      </if>
       <if test="taskRefund != null">
         task_refund = #{taskRefund,jdbcType=INTEGER},
       </if>
       <if test="refundContent != null">
         refund_content = #{refundContent,jdbcType=VARCHAR},
       </if>
+      <if test="retrieveContent != null">
+        retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      </if>
+      <if test="declareUser != null">
+        declare_user = #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      </if>
       <if test="setUpAmount != null">
         set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
       </if>
       <if test="arrivalMoney != null">
         arrival_money = #{arrivalMoney,jdbcType=INTEGER},
       </if>
-      <if test="retrieveContent != null">
-        retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      <if test="outsourceName != null">
+        outsource_name = #{outsourceName,jdbcType=VARCHAR},
+      </if>
+      <if test="outsourcePrice != null">
+        outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
       </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
@@ -754,7 +787,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -780,13 +813,15 @@
       certificate_number = #{certificateNumber,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       form_retrieve = #{formRetrieve,jdbcType=INTEGER},
-      declare_user = #{declareUser,jdbcType=VARCHAR},
-      declare_pwd = #{declarePwd,jdbcType=VARCHAR},
       task_refund = #{taskRefund,jdbcType=INTEGER},
       refund_content = #{refundContent,jdbcType=VARCHAR},
+      retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      declare_user = #{declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{declarePwd,jdbcType=VARCHAR},
       set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
       arrival_money = #{arrivalMoney,jdbcType=INTEGER},
-      retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      outsource_name = #{outsourceName,jdbcType=VARCHAR},
+      outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -794,7 +829,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 06 14:08:45 CST 2019.
+      This element was generated on Mon Aug 12 11:12:48 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -820,13 +855,15 @@
       certificate_number = #{certificateNumber,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       form_retrieve = #{formRetrieve,jdbcType=INTEGER},
-      declare_user = #{declareUser,jdbcType=VARCHAR},
-      declare_pwd = #{declarePwd,jdbcType=VARCHAR},
       task_refund = #{taskRefund,jdbcType=INTEGER},
       refund_content = #{refundContent,jdbcType=VARCHAR},
+      retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      declare_user = #{declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{declarePwd,jdbcType=VARCHAR},
       set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
       arrival_money = #{arrivalMoney,jdbcType=INTEGER},
-      retrieve_content = #{retrieveContent,jdbcType=VARCHAR}
+      outsource_name = #{outsourceName,jdbcType=VARCHAR},
+      outsource_price = #{outsourcePrice,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
@@ -915,14 +952,14 @@
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-select  
+ select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,
-    a.project_status as projectStatus,a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,
+    a.project_status as projectStatus,a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName,
 	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent,
 	a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,
 	a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,
 	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,
-	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,
+	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
 	e.contacts ,e.contact_mobile as contactMobile ,e.legal_person as legalPerson,e.legal_person_tel as legalPersonTel,
 	a.set_up_amount as setUpAmount,a.arrival_money as arrivalMoney
@@ -952,6 +989,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join user f on e.buyer_id=f.id
     left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id
     where e.delete_sign=0 and a.super_id is null
+    <if test="fid != null">
+  	and e.finance_id= #{fid,jdbcType=VARCHAR}
+  	</if>
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -959,7 +999,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and a.id= #{taskId,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.task_start_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and  e.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by  a.task_start_time desc
   	<if test="page_sql!=null">
@@ -975,6 +1015,9 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
     where e.delete_sign=0 and a.super_id is null
+    <if test="fid != null">
+  	and e.finance_id= #{fid,jdbcType=VARCHAR}
+  	</if>
     <if test="name != null">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -982,7 +1025,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and a.id= #{taskId,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.task_start_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and  e.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   </select>
   

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

@@ -332,6 +332,9 @@
     left join user f on e.buyer_id=f.id
     left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id
     where e.delete_sign=0 and a.super_id is null
+    <if test="fid != null">
+  	and e.finance_id= #{fid,jdbcType=VARCHAR}
+  	</if>
     <if test="name != null and name != ''">
   	and f.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
   	</if>
@@ -339,7 +342,7 @@
   	and a.id= #{taskId,jdbcType=VARCHAR}
   	</if>
   	<if test="startTime !=null and endTime !=null and startTime !='' and endTime !=''">
-  	and a.task_start_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and e.sign_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by  a.task_start_time desc
   </select>

+ 99 - 30
src/main/java/com/goafanti/common/model/TOrderOutsource.java

@@ -7,59 +7,74 @@ public class TOrderOutsource {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.id
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.order_no
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.refund_status
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private Integer refundStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.create_time
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.remarks
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.attachment_url
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private String attachmentUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.picture_url
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private String pictureUrl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.amount
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private BigDecimal amount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.company_name
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.audit_time
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	private Date auditTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.unit_price
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	private BigDecimal unitPrice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.unit_number
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	private Integer unitNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.outsource_remarks
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	private String outsourceRemarks;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.id
 	 * @return  the value of t_order_outsource.id
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -68,7 +83,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.id
 	 * @param id  the value for t_order_outsource.id
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -77,7 +92,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.order_no
 	 * @return  the value of t_order_outsource.order_no
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -86,7 +101,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.order_no
 	 * @param orderNo  the value for t_order_outsource.order_no
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -95,7 +110,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.refund_status
 	 * @return  the value of t_order_outsource.refund_status
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public Integer getRefundStatus() {
 		return refundStatus;
@@ -104,7 +119,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.refund_status
 	 * @param refundStatus  the value for t_order_outsource.refund_status
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setRefundStatus(Integer refundStatus) {
 		this.refundStatus = refundStatus;
@@ -113,7 +128,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.create_time
 	 * @return  the value of t_order_outsource.create_time
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -122,7 +137,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.create_time
 	 * @param createTime  the value for t_order_outsource.create_time
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -131,7 +146,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.remarks
 	 * @return  the value of t_order_outsource.remarks
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -140,7 +155,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.remarks
 	 * @param remarks  the value for t_order_outsource.remarks
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -149,7 +164,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.attachment_url
 	 * @return  the value of t_order_outsource.attachment_url
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -158,7 +173,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.attachment_url
 	 * @param attachmentUrl  the value for t_order_outsource.attachment_url
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;
@@ -167,7 +182,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.picture_url
 	 * @return  the value of t_order_outsource.picture_url
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public String getPictureUrl() {
 		return pictureUrl;
@@ -176,7 +191,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.picture_url
 	 * @param pictureUrl  the value for t_order_outsource.picture_url
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setPictureUrl(String pictureUrl) {
 		this.pictureUrl = pictureUrl;
@@ -185,7 +200,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.amount
 	 * @return  the value of t_order_outsource.amount
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public BigDecimal getAmount() {
 		return amount;
@@ -194,7 +209,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.amount
 	 * @param amount  the value for t_order_outsource.amount
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
@@ -203,7 +218,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.company_name
 	 * @return  the value of t_order_outsource.company_name
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -212,7 +227,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.company_name
 	 * @param companyName  the value for t_order_outsource.company_name
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -221,7 +236,7 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.audit_time
 	 * @return  the value of t_order_outsource.audit_time
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public Date getAuditTime() {
 		return auditTime;
@@ -230,9 +245,63 @@ public class TOrderOutsource {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.audit_time
 	 * @param auditTime  the value for t_order_outsource.audit_time
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setAuditTime(Date auditTime) {
 		this.auditTime = auditTime;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.unit_price
+	 * @return  the value of t_order_outsource.unit_price
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	public BigDecimal getUnitPrice() {
+		return unitPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.unit_price
+	 * @param unitPrice  the value for t_order_outsource.unit_price
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	public void setUnitPrice(BigDecimal unitPrice) {
+		this.unitPrice = unitPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.unit_number
+	 * @return  the value of t_order_outsource.unit_number
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	public Integer getUnitNumber() {
+		return unitNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.unit_number
+	 * @param unitNumber  the value for t_order_outsource.unit_number
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	public void setUnitNumber(Integer unitNumber) {
+		this.unitNumber = unitNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.outsource_remarks
+	 * @return  the value of t_order_outsource.outsource_remarks
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	public String getOutsourceRemarks() {
+		return outsourceRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.outsource_remarks
+	 * @param outsourceRemarks  the value for t_order_outsource.outsource_remarks
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
+	 */
+	public void setOutsourceRemarks(String outsourceRemarks) {
+		this.outsourceRemarks = outsourceRemarks;
+	}
 }

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderOutsourceExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public TOrderOutsourceExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderOutsourceExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -813,11 +813,201 @@ public class TOrderOutsourceExample {
 			addCriterion("audit_time not between", value1, value2, "auditTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andUnitPriceIsNull() {
+			addCriterion("unit_price is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceIsNotNull() {
+			addCriterion("unit_price is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceEqualTo(BigDecimal value) {
+			addCriterion("unit_price =", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceNotEqualTo(BigDecimal value) {
+			addCriterion("unit_price <>", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceGreaterThan(BigDecimal value) {
+			addCriterion("unit_price >", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("unit_price >=", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceLessThan(BigDecimal value) {
+			addCriterion("unit_price <", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("unit_price <=", value, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceIn(List<BigDecimal> values) {
+			addCriterion("unit_price in", values, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceNotIn(List<BigDecimal> values) {
+			addCriterion("unit_price not in", values, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("unit_price between", value1, value2, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("unit_price not between", value1, value2, "unitPrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberIsNull() {
+			addCriterion("unit_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberIsNotNull() {
+			addCriterion("unit_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberEqualTo(Integer value) {
+			addCriterion("unit_number =", value, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberNotEqualTo(Integer value) {
+			addCriterion("unit_number <>", value, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberGreaterThan(Integer value) {
+			addCriterion("unit_number >", value, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberGreaterThanOrEqualTo(Integer value) {
+			addCriterion("unit_number >=", value, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberLessThan(Integer value) {
+			addCriterion("unit_number <", value, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberLessThanOrEqualTo(Integer value) {
+			addCriterion("unit_number <=", value, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberIn(List<Integer> values) {
+			addCriterion("unit_number in", values, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberNotIn(List<Integer> values) {
+			addCriterion("unit_number not in", values, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberBetween(Integer value1, Integer value2) {
+			addCriterion("unit_number between", value1, value2, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andUnitNumberNotBetween(Integer value1, Integer value2) {
+			addCriterion("unit_number not between", value1, value2, "unitNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksIsNull() {
+			addCriterion("outsource_remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksIsNotNull() {
+			addCriterion("outsource_remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksEqualTo(String value) {
+			addCriterion("outsource_remarks =", value, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksNotEqualTo(String value) {
+			addCriterion("outsource_remarks <>", value, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksGreaterThan(String value) {
+			addCriterion("outsource_remarks >", value, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("outsource_remarks >=", value, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksLessThan(String value) {
+			addCriterion("outsource_remarks <", value, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksLessThanOrEqualTo(String value) {
+			addCriterion("outsource_remarks <=", value, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksLike(String value) {
+			addCriterion("outsource_remarks like", value, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksNotLike(String value) {
+			addCriterion("outsource_remarks not like", value, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksIn(List<String> values) {
+			addCriterion("outsource_remarks in", values, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksNotIn(List<String> values) {
+			addCriterion("outsource_remarks not in", values, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksBetween(String value1, String value2) {
+			addCriterion("outsource_remarks between", value1, value2, "outsourceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourceRemarksNotBetween(String value1, String value2) {
+			addCriterion("outsource_remarks not between", value1, value2, "outsourceRemarks");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_outsource
-	 * @mbg.generated  Tue Jul 30 16:33:59 CST 2019
+	 * @mbg.generated  Mon Aug 12 10:26:36 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 192 - 146
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -8,168 +8,178 @@ import com.goafanti.common.utils.StringUtils;
 public class TOrderTask {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.order_no
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.main
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer main;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.super_id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String superId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String commodityId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_name
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String commodityName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_quantity
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer commodityQuantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_mode
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String commodityMode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_price
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private BigDecimal commodityPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer taskStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_distribution_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Date taskDistributionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_allocator
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String taskAllocator;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_receiver
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String taskReceiver;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_comment
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String taskComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_start_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Date taskStartTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_end_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Date taskEndTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.project_status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer projectStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.accept_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Date acceptTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.review_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Date reviewTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.publicity_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Date publicityTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.licence_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Date licenceTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.certificate_number
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String certificateNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.form_retrieve
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer formRetrieve;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.declare_user
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
-	 */
-	private String declareUser;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.declare_pwd
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
-	 */
-	private String declarePwd;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_refund
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer taskRefund;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.refund_content
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String refundContent;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.retrieve_content
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	private String retrieveContent;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.declare_user
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	private String declareUser;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.declare_pwd
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	private String declarePwd;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.set_up_amount
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private BigDecimal setUpAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.arrival_money
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private Integer arrivalMoney;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.retrieve_content
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.outsource_name
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
-	private String retrieveContent;
+	private String outsourceName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.outsource_price
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	private BigDecimal outsourcePrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.attachment_url
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	private String attachmentUrl;
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.id
 	 * @return  the value of t_order_task.id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -178,7 +188,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.id
 	 * @param id  the value for t_order_task.id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -187,7 +197,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.order_no
 	 * @return  the value of t_order_task.order_no
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -196,7 +206,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.order_no
 	 * @param orderNo  the value for t_order_task.order_no
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -205,7 +215,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.main
 	 * @return  the value of t_order_task.main
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getMain() {
 		return main;
@@ -214,7 +224,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.main
 	 * @param main  the value for t_order_task.main
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setMain(Integer main) {
 		this.main = main;
@@ -223,7 +233,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.super_id
 	 * @return  the value of t_order_task.super_id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getSuperId() {
 		return superId;
@@ -232,7 +242,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.super_id
 	 * @param superId  the value for t_order_task.super_id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setSuperId(String superId) {
 		this.superId = superId;
@@ -241,7 +251,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_id
 	 * @return  the value of t_order_task.commodity_id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -250,7 +260,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_id
 	 * @param commodityId  the value for t_order_task.commodity_id
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -259,7 +269,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_name
 	 * @return  the value of t_order_task.commodity_name
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -268,7 +278,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_name
 	 * @param commodityName  the value for t_order_task.commodity_name
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -277,7 +287,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_quantity
 	 * @return  the value of t_order_task.commodity_quantity
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -286,7 +296,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_quantity
 	 * @param commodityQuantity  the value for t_order_task.commodity_quantity
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -295,7 +305,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_mode
 	 * @return  the value of t_order_task.commodity_mode
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getCommodityMode() {
 		return commodityMode;
@@ -304,7 +314,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_mode
 	 * @param commodityMode  the value for t_order_task.commodity_mode
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setCommodityMode(String commodityMode) {
 		this.commodityMode = commodityMode;
@@ -313,7 +323,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_price
 	 * @return  the value of t_order_task.commodity_price
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
@@ -322,7 +332,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_price
 	 * @param commodityPrice  the value for t_order_task.commodity_price
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
@@ -331,7 +341,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_status
 	 * @return  the value of t_order_task.task_status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getTaskStatus() {
 		return taskStatus;
@@ -340,7 +350,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_status
 	 * @param taskStatus  the value for t_order_task.task_status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setTaskStatus(Integer taskStatus) {
 		this.taskStatus = taskStatus;
@@ -349,7 +359,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_distribution_time
 	 * @return  the value of t_order_task.task_distribution_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Date getTaskDistributionTime() {
 		return taskDistributionTime;
@@ -358,7 +368,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_distribution_time
 	 * @param taskDistributionTime  the value for t_order_task.task_distribution_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setTaskDistributionTime(Date taskDistributionTime) {
 		this.taskDistributionTime = taskDistributionTime;
@@ -367,7 +377,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_allocator
 	 * @return  the value of t_order_task.task_allocator
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getTaskAllocator() {
 		return taskAllocator;
@@ -376,7 +386,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_allocator
 	 * @param taskAllocator  the value for t_order_task.task_allocator
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setTaskAllocator(String taskAllocator) {
 		this.taskAllocator = taskAllocator;
@@ -385,7 +395,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_receiver
 	 * @return  the value of t_order_task.task_receiver
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getTaskReceiver() {
 		return taskReceiver;
@@ -394,7 +404,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_receiver
 	 * @param taskReceiver  the value for t_order_task.task_receiver
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
@@ -403,7 +413,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_comment
 	 * @return  the value of t_order_task.task_comment
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -412,7 +422,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_comment
 	 * @param taskComment  the value for t_order_task.task_comment
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -421,7 +431,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_start_time
 	 * @return  the value of t_order_task.task_start_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Date getTaskStartTime() {
 		return taskStartTime;
@@ -430,7 +440,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_start_time
 	 * @param taskStartTime  the value for t_order_task.task_start_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setTaskStartTime(Date taskStartTime) {
 		this.taskStartTime = taskStartTime;
@@ -439,7 +449,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_end_time
 	 * @return  the value of t_order_task.task_end_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Date getTaskEndTime() {
 		return taskEndTime;
@@ -448,7 +458,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_end_time
 	 * @param taskEndTime  the value for t_order_task.task_end_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setTaskEndTime(Date taskEndTime) {
 		this.taskEndTime = taskEndTime;
@@ -457,7 +467,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.project_status
 	 * @return  the value of t_order_task.project_status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getProjectStatus() {
 		return projectStatus;
@@ -466,7 +476,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.project_status
 	 * @param projectStatus  the value for t_order_task.project_status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
@@ -475,7 +485,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.accept_time
 	 * @return  the value of t_order_task.accept_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Date getAcceptTime() {
 		return acceptTime;
@@ -484,7 +494,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.accept_time
 	 * @param acceptTime  the value for t_order_task.accept_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setAcceptTime(Date acceptTime) {
 		this.acceptTime = acceptTime;
@@ -493,7 +503,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.review_time
 	 * @return  the value of t_order_task.review_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Date getReviewTime() {
 		return reviewTime;
@@ -502,7 +512,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.review_time
 	 * @param reviewTime  the value for t_order_task.review_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setReviewTime(Date reviewTime) {
 		this.reviewTime = reviewTime;
@@ -511,7 +521,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.publicity_time
 	 * @return  the value of t_order_task.publicity_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Date getPublicityTime() {
 		return publicityTime;
@@ -520,7 +530,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.publicity_time
 	 * @param publicityTime  the value for t_order_task.publicity_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setPublicityTime(Date publicityTime) {
 		this.publicityTime = publicityTime;
@@ -529,7 +539,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.licence_time
 	 * @return  the value of t_order_task.licence_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Date getLicenceTime() {
 		return licenceTime;
@@ -538,7 +548,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.licence_time
 	 * @param licenceTime  the value for t_order_task.licence_time
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setLicenceTime(Date licenceTime) {
 		this.licenceTime = licenceTime;
@@ -547,7 +557,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.certificate_number
 	 * @return  the value of t_order_task.certificate_number
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getCertificateNumber() {
 		return certificateNumber;
@@ -556,7 +566,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.certificate_number
 	 * @param certificateNumber  the value for t_order_task.certificate_number
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setCertificateNumber(String certificateNumber) {
 		this.certificateNumber = certificateNumber;
@@ -565,7 +575,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.status
 	 * @return  the value of t_order_task.status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -574,7 +584,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.status
 	 * @param status  the value for t_order_task.status
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -583,7 +593,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.form_retrieve
 	 * @return  the value of t_order_task.form_retrieve
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getFormRetrieve() {
 		return formRetrieve;
@@ -592,52 +602,16 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.form_retrieve
 	 * @param formRetrieve  the value for t_order_task.form_retrieve
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setFormRetrieve(Integer formRetrieve) {
 		this.formRetrieve = formRetrieve;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.declare_user
-	 * @return  the value of t_order_task.declare_user
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
-	 */
-	public String getDeclareUser() {
-		return declareUser;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.declare_user
-	 * @param declareUser  the value for t_order_task.declare_user
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
-	 */
-	public void setDeclareUser(String declareUser) {
-		this.declareUser = declareUser;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.declare_pwd
-	 * @return  the value of t_order_task.declare_pwd
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
-	 */
-	public String getDeclarePwd() {
-		return declarePwd;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.declare_pwd
-	 * @param declarePwd  the value for t_order_task.declare_pwd
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
-	 */
-	public void setDeclarePwd(String declarePwd) {
-		this.declarePwd = declarePwd;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_refund
 	 * @return  the value of t_order_task.task_refund
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getTaskRefund() {
 		return taskRefund;
@@ -646,7 +620,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_refund
 	 * @param taskRefund  the value for t_order_task.task_refund
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setTaskRefund(Integer taskRefund) {
 		this.taskRefund = taskRefund;
@@ -655,7 +629,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.refund_content
 	 * @return  the value of t_order_task.refund_content
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getRefundContent() {
 		return refundContent;
@@ -664,16 +638,70 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.refund_content
 	 * @param refundContent  the value for t_order_task.refund_content
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setRefundContent(String refundContent) {
 		this.refundContent = refundContent;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.retrieve_content
+	 * @return  the value of t_order_task.retrieve_content
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	public String getRetrieveContent() {
+		return retrieveContent;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.retrieve_content
+	 * @param retrieveContent  the value for t_order_task.retrieve_content
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	public void setRetrieveContent(String retrieveContent) {
+		this.retrieveContent = retrieveContent;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.declare_user
+	 * @return  the value of t_order_task.declare_user
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	public String getDeclareUser() {
+		return declareUser;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.declare_user
+	 * @param declareUser  the value for t_order_task.declare_user
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	public void setDeclareUser(String declareUser) {
+		this.declareUser = declareUser;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.declare_pwd
+	 * @return  the value of t_order_task.declare_pwd
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	public String getDeclarePwd() {
+		return declarePwd;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.declare_pwd
+	 * @param declarePwd  the value for t_order_task.declare_pwd
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	public void setDeclarePwd(String declarePwd) {
+		this.declarePwd = declarePwd;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.set_up_amount
 	 * @return  the value of t_order_task.set_up_amount
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public BigDecimal getSetUpAmount() {
 		return setUpAmount;
@@ -682,7 +710,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.set_up_amount
 	 * @param setUpAmount  the value for t_order_task.set_up_amount
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setSetUpAmount(BigDecimal setUpAmount) {
 		this.setUpAmount = setUpAmount;
@@ -691,7 +719,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.arrival_money
 	 * @return  the value of t_order_task.arrival_money
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Integer getArrivalMoney() {
 		return arrivalMoney;
@@ -700,34 +728,52 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.arrival_money
 	 * @param arrivalMoney  the value for t_order_task.arrival_money
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setArrivalMoney(Integer arrivalMoney) {
 		this.arrivalMoney = arrivalMoney;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.retrieve_content
-	 * @return  the value of t_order_task.retrieve_content
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.outsource_name
+	 * @return  the value of t_order_task.outsource_name
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
-	public String getRetrieveContent() {
-		return retrieveContent;
+	public String getOutsourceName() {
+		return outsourceName;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.retrieve_content
-	 * @param retrieveContent  the value for t_order_task.retrieve_content
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.outsource_name
+	 * @param outsourceName  the value for t_order_task.outsource_name
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
-	public void setRetrieveContent(String retrieveContent) {
-		this.retrieveContent = retrieveContent;
+	public void setOutsourceName(String outsourceName) {
+		this.outsourceName = outsourceName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.outsource_price
+	 * @return  the value of t_order_task.outsource_price
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	public BigDecimal getOutsourcePrice() {
+		return outsourcePrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.outsource_price
+	 * @param outsourcePrice  the value for t_order_task.outsource_price
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
+	 */
+	public void setOutsourcePrice(BigDecimal outsourcePrice) {
+		this.outsourcePrice = outsourcePrice;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.attachment_url
 	 * @return  the value of t_order_task.attachment_url
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -736,7 +782,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.attachment_url
 	 * @param attachmentUrl  the value for t_order_task.attachment_url
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;

+ 282 - 152
src/main/java/com/goafanti/common/model/TOrderTaskExample.java

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public TOrderTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1721,273 +1721,343 @@ public class TOrderTaskExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserIsNull() {
-			addCriterion("declare_user is null");
+		public Criteria andTaskRefundIsNull() {
+			addCriterion("task_refund is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserIsNotNull() {
-			addCriterion("declare_user is not null");
+		public Criteria andTaskRefundIsNotNull() {
+			addCriterion("task_refund is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserEqualTo(String value) {
-			addCriterion("declare_user =", value, "declareUser");
+		public Criteria andTaskRefundEqualTo(Integer value) {
+			addCriterion("task_refund =", value, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserNotEqualTo(String value) {
-			addCriterion("declare_user <>", value, "declareUser");
+		public Criteria andTaskRefundNotEqualTo(Integer value) {
+			addCriterion("task_refund <>", value, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserGreaterThan(String value) {
-			addCriterion("declare_user >", value, "declareUser");
+		public Criteria andTaskRefundGreaterThan(Integer value) {
+			addCriterion("task_refund >", value, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserGreaterThanOrEqualTo(String value) {
-			addCriterion("declare_user >=", value, "declareUser");
+		public Criteria andTaskRefundGreaterThanOrEqualTo(Integer value) {
+			addCriterion("task_refund >=", value, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserLessThan(String value) {
-			addCriterion("declare_user <", value, "declareUser");
+		public Criteria andTaskRefundLessThan(Integer value) {
+			addCriterion("task_refund <", value, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserLessThanOrEqualTo(String value) {
-			addCriterion("declare_user <=", value, "declareUser");
+		public Criteria andTaskRefundLessThanOrEqualTo(Integer value) {
+			addCriterion("task_refund <=", value, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserLike(String value) {
-			addCriterion("declare_user like", value, "declareUser");
+		public Criteria andTaskRefundIn(List<Integer> values) {
+			addCriterion("task_refund in", values, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserNotLike(String value) {
-			addCriterion("declare_user not like", value, "declareUser");
+		public Criteria andTaskRefundNotIn(List<Integer> values) {
+			addCriterion("task_refund not in", values, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserIn(List<String> values) {
-			addCriterion("declare_user in", values, "declareUser");
+		public Criteria andTaskRefundBetween(Integer value1, Integer value2) {
+			addCriterion("task_refund between", value1, value2, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserNotIn(List<String> values) {
-			addCriterion("declare_user not in", values, "declareUser");
+		public Criteria andTaskRefundNotBetween(Integer value1, Integer value2) {
+			addCriterion("task_refund not between", value1, value2, "taskRefund");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserBetween(String value1, String value2) {
-			addCriterion("declare_user between", value1, value2, "declareUser");
+		public Criteria andRefundContentIsNull() {
+			addCriterion("refund_content is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclareUserNotBetween(String value1, String value2) {
-			addCriterion("declare_user not between", value1, value2, "declareUser");
+		public Criteria andRefundContentIsNotNull() {
+			addCriterion("refund_content is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdIsNull() {
-			addCriterion("declare_pwd is null");
+		public Criteria andRefundContentEqualTo(String value) {
+			addCriterion("refund_content =", value, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdIsNotNull() {
-			addCriterion("declare_pwd is not null");
+		public Criteria andRefundContentNotEqualTo(String value) {
+			addCriterion("refund_content <>", value, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdEqualTo(String value) {
-			addCriterion("declare_pwd =", value, "declarePwd");
+		public Criteria andRefundContentGreaterThan(String value) {
+			addCriterion("refund_content >", value, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdNotEqualTo(String value) {
-			addCriterion("declare_pwd <>", value, "declarePwd");
+		public Criteria andRefundContentGreaterThanOrEqualTo(String value) {
+			addCriterion("refund_content >=", value, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdGreaterThan(String value) {
-			addCriterion("declare_pwd >", value, "declarePwd");
+		public Criteria andRefundContentLessThan(String value) {
+			addCriterion("refund_content <", value, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdGreaterThanOrEqualTo(String value) {
-			addCriterion("declare_pwd >=", value, "declarePwd");
+		public Criteria andRefundContentLessThanOrEqualTo(String value) {
+			addCriterion("refund_content <=", value, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdLessThan(String value) {
-			addCriterion("declare_pwd <", value, "declarePwd");
+		public Criteria andRefundContentLike(String value) {
+			addCriterion("refund_content like", value, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdLessThanOrEqualTo(String value) {
-			addCriterion("declare_pwd <=", value, "declarePwd");
+		public Criteria andRefundContentNotLike(String value) {
+			addCriterion("refund_content not like", value, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdLike(String value) {
-			addCriterion("declare_pwd like", value, "declarePwd");
+		public Criteria andRefundContentIn(List<String> values) {
+			addCriterion("refund_content in", values, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdNotLike(String value) {
-			addCriterion("declare_pwd not like", value, "declarePwd");
+		public Criteria andRefundContentNotIn(List<String> values) {
+			addCriterion("refund_content not in", values, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdIn(List<String> values) {
-			addCriterion("declare_pwd in", values, "declarePwd");
+		public Criteria andRefundContentBetween(String value1, String value2) {
+			addCriterion("refund_content between", value1, value2, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdNotIn(List<String> values) {
-			addCriterion("declare_pwd not in", values, "declarePwd");
+		public Criteria andRefundContentNotBetween(String value1, String value2) {
+			addCriterion("refund_content not between", value1, value2, "refundContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdBetween(String value1, String value2) {
-			addCriterion("declare_pwd between", value1, value2, "declarePwd");
+		public Criteria andRetrieveContentIsNull() {
+			addCriterion("retrieve_content is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeclarePwdNotBetween(String value1, String value2) {
-			addCriterion("declare_pwd not between", value1, value2, "declarePwd");
+		public Criteria andRetrieveContentIsNotNull() {
+			addCriterion("retrieve_content is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundIsNull() {
-			addCriterion("task_refund is null");
+		public Criteria andRetrieveContentEqualTo(String value) {
+			addCriterion("retrieve_content =", value, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundIsNotNull() {
-			addCriterion("task_refund is not null");
+		public Criteria andRetrieveContentNotEqualTo(String value) {
+			addCriterion("retrieve_content <>", value, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundEqualTo(Integer value) {
-			addCriterion("task_refund =", value, "taskRefund");
+		public Criteria andRetrieveContentGreaterThan(String value) {
+			addCriterion("retrieve_content >", value, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundNotEqualTo(Integer value) {
-			addCriterion("task_refund <>", value, "taskRefund");
+		public Criteria andRetrieveContentGreaterThanOrEqualTo(String value) {
+			addCriterion("retrieve_content >=", value, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundGreaterThan(Integer value) {
-			addCriterion("task_refund >", value, "taskRefund");
+		public Criteria andRetrieveContentLessThan(String value) {
+			addCriterion("retrieve_content <", value, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundGreaterThanOrEqualTo(Integer value) {
-			addCriterion("task_refund >=", value, "taskRefund");
+		public Criteria andRetrieveContentLessThanOrEqualTo(String value) {
+			addCriterion("retrieve_content <=", value, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundLessThan(Integer value) {
-			addCriterion("task_refund <", value, "taskRefund");
+		public Criteria andRetrieveContentLike(String value) {
+			addCriterion("retrieve_content like", value, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundLessThanOrEqualTo(Integer value) {
-			addCriterion("task_refund <=", value, "taskRefund");
+		public Criteria andRetrieveContentNotLike(String value) {
+			addCriterion("retrieve_content not like", value, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundIn(List<Integer> values) {
-			addCriterion("task_refund in", values, "taskRefund");
+		public Criteria andRetrieveContentIn(List<String> values) {
+			addCriterion("retrieve_content in", values, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundNotIn(List<Integer> values) {
-			addCriterion("task_refund not in", values, "taskRefund");
+		public Criteria andRetrieveContentNotIn(List<String> values) {
+			addCriterion("retrieve_content not in", values, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundBetween(Integer value1, Integer value2) {
-			addCriterion("task_refund between", value1, value2, "taskRefund");
+		public Criteria andRetrieveContentBetween(String value1, String value2) {
+			addCriterion("retrieve_content between", value1, value2, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andTaskRefundNotBetween(Integer value1, Integer value2) {
-			addCriterion("task_refund not between", value1, value2, "taskRefund");
+		public Criteria andRetrieveContentNotBetween(String value1, String value2) {
+			addCriterion("retrieve_content not between", value1, value2, "retrieveContent");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentIsNull() {
-			addCriterion("refund_content is null");
+		public Criteria andDeclareUserIsNull() {
+			addCriterion("declare_user is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentIsNotNull() {
-			addCriterion("refund_content is not null");
+		public Criteria andDeclareUserIsNotNull() {
+			addCriterion("declare_user is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentEqualTo(String value) {
-			addCriterion("refund_content =", value, "refundContent");
+		public Criteria andDeclareUserEqualTo(String value) {
+			addCriterion("declare_user =", value, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentNotEqualTo(String value) {
-			addCriterion("refund_content <>", value, "refundContent");
+		public Criteria andDeclareUserNotEqualTo(String value) {
+			addCriterion("declare_user <>", value, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentGreaterThan(String value) {
-			addCriterion("refund_content >", value, "refundContent");
+		public Criteria andDeclareUserGreaterThan(String value) {
+			addCriterion("declare_user >", value, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentGreaterThanOrEqualTo(String value) {
-			addCriterion("refund_content >=", value, "refundContent");
+		public Criteria andDeclareUserGreaterThanOrEqualTo(String value) {
+			addCriterion("declare_user >=", value, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentLessThan(String value) {
-			addCriterion("refund_content <", value, "refundContent");
+		public Criteria andDeclareUserLessThan(String value) {
+			addCriterion("declare_user <", value, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentLessThanOrEqualTo(String value) {
-			addCriterion("refund_content <=", value, "refundContent");
+		public Criteria andDeclareUserLessThanOrEqualTo(String value) {
+			addCriterion("declare_user <=", value, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentLike(String value) {
-			addCriterion("refund_content like", value, "refundContent");
+		public Criteria andDeclareUserLike(String value) {
+			addCriterion("declare_user like", value, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentNotLike(String value) {
-			addCriterion("refund_content not like", value, "refundContent");
+		public Criteria andDeclareUserNotLike(String value) {
+			addCriterion("declare_user not like", value, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentIn(List<String> values) {
-			addCriterion("refund_content in", values, "refundContent");
+		public Criteria andDeclareUserIn(List<String> values) {
+			addCriterion("declare_user in", values, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentNotIn(List<String> values) {
-			addCriterion("refund_content not in", values, "refundContent");
+		public Criteria andDeclareUserNotIn(List<String> values) {
+			addCriterion("declare_user not in", values, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentBetween(String value1, String value2) {
-			addCriterion("refund_content between", value1, value2, "refundContent");
+		public Criteria andDeclareUserBetween(String value1, String value2) {
+			addCriterion("declare_user between", value1, value2, "declareUser");
 			return (Criteria) this;
 		}
 
-		public Criteria andRefundContentNotBetween(String value1, String value2) {
-			addCriterion("refund_content not between", value1, value2, "refundContent");
+		public Criteria andDeclareUserNotBetween(String value1, String value2) {
+			addCriterion("declare_user not between", value1, value2, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIsNull() {
+			addCriterion("declare_pwd is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIsNotNull() {
+			addCriterion("declare_pwd is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdEqualTo(String value) {
+			addCriterion("declare_pwd =", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotEqualTo(String value) {
+			addCriterion("declare_pwd <>", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdGreaterThan(String value) {
+			addCriterion("declare_pwd >", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdGreaterThanOrEqualTo(String value) {
+			addCriterion("declare_pwd >=", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLessThan(String value) {
+			addCriterion("declare_pwd <", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLessThanOrEqualTo(String value) {
+			addCriterion("declare_pwd <=", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLike(String value) {
+			addCriterion("declare_pwd like", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotLike(String value) {
+			addCriterion("declare_pwd not like", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIn(List<String> values) {
+			addCriterion("declare_pwd in", values, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotIn(List<String> values) {
+			addCriterion("declare_pwd not in", values, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdBetween(String value1, String value2) {
+			addCriterion("declare_pwd between", value1, value2, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotBetween(String value1, String value2) {
+			addCriterion("declare_pwd not between", value1, value2, "declarePwd");
 			return (Criteria) this;
 		}
 
@@ -2111,80 +2181,140 @@ public class TOrderTaskExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentIsNull() {
-			addCriterion("retrieve_content is null");
+		public Criteria andOutsourceNameIsNull() {
+			addCriterion("outsource_name is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentIsNotNull() {
-			addCriterion("retrieve_content is not null");
+		public Criteria andOutsourceNameIsNotNull() {
+			addCriterion("outsource_name is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentEqualTo(String value) {
-			addCriterion("retrieve_content =", value, "retrieveContent");
+		public Criteria andOutsourceNameEqualTo(String value) {
+			addCriterion("outsource_name =", value, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentNotEqualTo(String value) {
-			addCriterion("retrieve_content <>", value, "retrieveContent");
+		public Criteria andOutsourceNameNotEqualTo(String value) {
+			addCriterion("outsource_name <>", value, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentGreaterThan(String value) {
-			addCriterion("retrieve_content >", value, "retrieveContent");
+		public Criteria andOutsourceNameGreaterThan(String value) {
+			addCriterion("outsource_name >", value, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentGreaterThanOrEqualTo(String value) {
-			addCriterion("retrieve_content >=", value, "retrieveContent");
+		public Criteria andOutsourceNameGreaterThanOrEqualTo(String value) {
+			addCriterion("outsource_name >=", value, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentLessThan(String value) {
-			addCriterion("retrieve_content <", value, "retrieveContent");
+		public Criteria andOutsourceNameLessThan(String value) {
+			addCriterion("outsource_name <", value, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentLessThanOrEqualTo(String value) {
-			addCriterion("retrieve_content <=", value, "retrieveContent");
+		public Criteria andOutsourceNameLessThanOrEqualTo(String value) {
+			addCriterion("outsource_name <=", value, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentLike(String value) {
-			addCriterion("retrieve_content like", value, "retrieveContent");
+		public Criteria andOutsourceNameLike(String value) {
+			addCriterion("outsource_name like", value, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentNotLike(String value) {
-			addCriterion("retrieve_content not like", value, "retrieveContent");
+		public Criteria andOutsourceNameNotLike(String value) {
+			addCriterion("outsource_name not like", value, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentIn(List<String> values) {
-			addCriterion("retrieve_content in", values, "retrieveContent");
+		public Criteria andOutsourceNameIn(List<String> values) {
+			addCriterion("outsource_name in", values, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentNotIn(List<String> values) {
-			addCriterion("retrieve_content not in", values, "retrieveContent");
+		public Criteria andOutsourceNameNotIn(List<String> values) {
+			addCriterion("outsource_name not in", values, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentBetween(String value1, String value2) {
-			addCriterion("retrieve_content between", value1, value2, "retrieveContent");
+		public Criteria andOutsourceNameBetween(String value1, String value2) {
+			addCriterion("outsource_name between", value1, value2, "outsourceName");
 			return (Criteria) this;
 		}
 
-		public Criteria andRetrieveContentNotBetween(String value1, String value2) {
-			addCriterion("retrieve_content not between", value1, value2, "retrieveContent");
+		public Criteria andOutsourceNameNotBetween(String value1, String value2) {
+			addCriterion("outsource_name not between", value1, value2, "outsourceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceIsNull() {
+			addCriterion("outsource_price is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceIsNotNull() {
+			addCriterion("outsource_price is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceEqualTo(BigDecimal value) {
+			addCriterion("outsource_price =", value, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceNotEqualTo(BigDecimal value) {
+			addCriterion("outsource_price <>", value, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceGreaterThan(BigDecimal value) {
+			addCriterion("outsource_price >", value, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("outsource_price >=", value, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceLessThan(BigDecimal value) {
+			addCriterion("outsource_price <", value, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("outsource_price <=", value, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceIn(List<BigDecimal> values) {
+			addCriterion("outsource_price in", values, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceNotIn(List<BigDecimal> values) {
+			addCriterion("outsource_price not in", values, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("outsource_price between", value1, value2, "outsourcePrice");
+			return (Criteria) this;
+		}
+
+		public Criteria andOutsourcePriceNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("outsource_price not between", value1, value2, "outsourcePrice");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 * @mbg.generated  Mon Aug 12 11:12:48 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -60,8 +60,28 @@ public class TOrderTaskDetailBo {
 	 * 申报密码
 	 */
 	private String declarePwd;
+	/**
+	 * 外包公司名称
+	 */
+	private String outsourceName;
+	/**
+	 * 外包价格
+	 */
+	private String outsourcePrice;
 	
 	
+	public String getOutsourceName() {
+		return outsourceName;
+	}
+	public void setOutsourceName(String outsourceName) {
+		this.outsourceName = outsourceName;
+	}
+	public String getOutsourcePrice() {
+		return outsourcePrice;
+	}
+	public void setOutsourcePrice(String outsourcePrice) {
+		this.outsourcePrice = outsourcePrice;
+	}
 	public Integer getLocationProvince() {
 		return locationProvince;
 	}

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

@@ -159,6 +159,21 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		}
 		return res;
 	}
+	/**
+	 * 财务特批审核
+	 */
+	@RequestMapping(value="/financeApproval", method = RequestMethod.POST)
+	public Result financeApproval(String orderNo) {
+		Result res=new Result();
+		if (StringUtils.isBlank(orderNo)) {
+			res.getError().add(buildError("","订单必须指定。"));
+		}
+		if(fundManageOrderServiceImpl.checkFinanceApproval(orderNo)) {
+			res.getError().add(buildError("","订单非特批或流程不正确。"));
+		}
+		res.data(fundManageOrderServiceImpl.updateFinanceApproval(orderNo));
+		return res;
+	}
 	
 	/**
 	 * 财务专员查看自己要处理的退单数据

+ 5 - 4
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -119,10 +119,11 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 任务工时列表
 	 */
 	@RequestMapping(value="/taskHoursList" ,method = RequestMethod.GET)
-	public Result taskHoursList(String name, String taskId ,String starTime,String endTime ,
+	public Result taskHoursList(String name, String taskId ,String starTime,String endTime ,Integer type,
 			Integer pageNo, Integer pageSize){
 		Result res=new Result();
-		res.setData(orderProjectService.taskHoursList(name,taskId,  starTime, endTime ,pageNo, pageSize));
+		//type 1 个人
+		res.setData(orderProjectService.taskHoursList(name,taskId,  starTime, endTime ,type,pageNo, pageSize));
 		return res;
 	}
 	
@@ -184,9 +185,9 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @throws IOException 
 	 */
 	@RequestMapping(value = "/exportTaskHoursListData", method = RequestMethod.GET)
-	public Result exportTaskHoursListData(String name, String taskId ,String starTime,String endTime ,HttpServletResponse response) throws IOException{
+	public Result exportTaskHoursListData(String name, String taskId ,String starTime,String endTime ,Integer type,HttpServletResponse response) throws IOException{
 		 Result res = new Result();
-		 XSSFWorkbook wb = orderProjectService.exportTaskHoursListData( name, taskId, starTime, endTime);
+		 XSSFWorkbook wb = orderProjectService.exportTaskHoursListData( name, taskId, starTime, endTime,type);
 		 if(null == wb){
 			 res.getError().add(buildError("", "没有找到数据"));
 			 return res;

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

@@ -91,5 +91,17 @@ public interface FundManageOrderService {
 	 * @return
 	 */
 	int updateContractNo(TOrderNew orderNew);
+	/**
+	 * 财务特批审核
+	 * @param orderNo
+	 * @return
+	 */
+	int updateFinanceApproval(String orderNo);
+	/**
+	 * 财务特批审核检查
+	 * @param orderNo
+	 * @return
+	 */
+	boolean checkFinanceApproval(String orderNo);
 	
 }

+ 3 - 2
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -24,10 +24,9 @@ public interface OrderProjectService {
 
 	int addTaskHours(TTaskHours t);
 	
-	Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId,String starTime,String endTime ,
+	Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId,String starTime,String endTime ,Integer type,
 			Integer pageNo, Integer pageSize);
 
-	XSSFWorkbook exportTaskHoursListData(String name, String taskId, String starTime, String endTime);
 
 	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
 			Integer specially,String depId  , Integer pageNo, Integer pageSize);
@@ -41,5 +40,7 @@ public interface OrderProjectService {
 	List<TaskProgressBo> selectTaskProgress(Integer tid);
 
 	XSSFWorkbook exportMyTaskList();
+
+	XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime, Integer type);
 	
 }

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

@@ -35,7 +35,6 @@ import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.model.TOrderBonus;
 import com.goafanti.common.model.TOrderLog;
-import com.goafanti.common.model.TOrderMonthReport;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderRefund;
 import com.goafanti.common.model.TOrderTask;
@@ -55,7 +54,6 @@ import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.FundManageOrderService;
-import com.goafanti.order.service.OrderNewService;
 
 @Service
 public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper> implements FundManageOrderService {
@@ -106,11 +104,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		onew.setOrderNo(orderNo);
 		onew.setDeleteSign(0);//正常
 		onew.setApproval(approval);//特批状态
-		if(approval == ApprovalNewState.FTP.getCode()){
-			onew.setProcessStatus(ProcessStatus.YPCWGLY.getCode());//已派财务管理员
-		}
+		onew.setProcessStatus(ProcessStatus.YPCWGLY.getCode());//已派财务管理员
 		onew.setOrderStatus(OrderNewState.QDSHTG.getCode());//营销管理员审核通过
-		
 		int idCount = tOrderNewMapper.getCountByIdAndStatus(onew);
 		int fidCount = adminMapper.getCountById(financeId);
 		Integer r = null;
@@ -168,6 +163,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		TOrderNew orderNew = new  TOrderNew();
 		orderNew.setOrderNo(back.getOrderNo());
 		orderNew.setOrderStatus(OrderNewState.YBH.getCode());
+		orderNew.setProcessStatus(ProcessStatus.YPYXY.getCode());
 		orderNew.setFinanceId("");
 		int c = tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 		
@@ -488,6 +484,26 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 	public int updateContractNo(TOrderNew orderNew) {
 		return tOrderNewMapper.updateByPrimaryKeySelective(orderNew);
 	}
+
+	@Override
+	public int updateFinanceApproval(String orderNo) {
+		TOrderNew t=new TOrderNew();
+		t.setOrderNo(orderNo);
+		t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+		return tOrderNewMapper.updateByPrimaryKeySelective(t);
+	}
+
+	@Override
+	public boolean checkFinanceApproval(String orderNo) {
+		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
+		if (t.getApproval()!=ApprovalNewState.TG.getCode()) {
+			return true;
+		}
+		if (t.getProcessStatus()!=ProcessStatus.YPCWZY.getCode()) {
+			return true;
+		}
+		return false;
+	}
 }
 
 

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

@@ -146,6 +146,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setDeleteSign(0);//0-正常,1-作废,2-锁定
 		t.setSalesmanId(TokenManager.getAdminId());
 		t.setCreater(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+		t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
 		t.setCreateTime(new Date());
 		t.setUpdateTime(new Date());
 		t.setBuyerId(uid);
@@ -421,7 +422,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNew t2= tOrderNewMapper.selectByPrimaryKey(orderNo);
 		t.setOrderNo(orderNo);
 		if (orderStatus==OrderNewState.QDSHTG.getCode()) {
-			if (t2.getApproval()==ApprovalNewState.FTP.getCode()) {//如果通过分配给财务管理员
+			if (t2.getApproval()==ApprovalNewState.FTP.getCode()||t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
 				t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
 			}else {
 				t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
@@ -550,7 +551,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setOrderNo(orderNo);
 		if (confirm==2) {
 			t.setApproval(2);
-			if(t2.getOutsource()==0)t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
+			if(t2.getOutsource()==0)t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
 			addOrderLog(orderNo, OrderLogProcess.TP.getCode());
 		} else {
 			t.setApproval(3);
@@ -742,6 +743,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			return -1;
 		}
 		t.setOrderStatus(OrderNewState.YBH.getCode());
+		t.setProcessStatus(ProcessStatus.YPYXY.getCode());
 		t.setFinanceId("");
 		addBackOrder(orderNo, reason);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);

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

@@ -1,5 +1,6 @@
 package com.goafanti.order.service.impl;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -179,6 +180,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setDeclarePwd(t.getDeclarePwd());
 		task.setArrivalMoney(t.getArrivalMoney());
 		task.setSetUpAmount(t.getSetUpAmount());
+		task.setOutsourceName(t.getOutsourceName());
+		task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
 		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		//根据修改的修改订单法人与联系人
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());
@@ -335,7 +338,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId, String starTime,String endTime , Integer pageNo,
+	public Pagination<TOrderTaskListBo> taskHoursList(String name, String taskId, String starTime,String endTime ,Integer type, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
@@ -344,6 +347,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
+		if(type!=null&&type==1)params.put("fid", TokenManager.getAdminId());
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskHoursListByPage", "selectTaskHoursListCount", params, pageNo, pageSize);
 		
 		return p;
@@ -351,9 +355,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 	
 	@Override
-	public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime) {
+	public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime,Integer type) {
 		if(StringUtils.isNoneBlank(endTime)) endTime=endTime+" 23:59:59";
-		List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime);
+		String fid=null;
+		if(type!=null&&type==1)fid=TokenManager.getAdminId();
+		List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime,fid);
 		if (list==null || list.size()==0) return null;
 		String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","工时","合同编号","签单日期","派单日期"};
 		String filePath = uploadPath + "/TaskHours";

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

@@ -91,11 +91,10 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 	public int updateAuditOutsource(OrderOutsourceDtails o) {
 		o.setAuditTime(new Date());
 		TOrderNew t=new TOrderNew();
-		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(o.getOrderNo());
 		if (o.getRefundStatus()==1) {
 			t.setOrderNo(o.getOrderNo());
 			t.setOrderStatus(2);//订单审核标记通过
-			t.setProcessStatus(t2.getApproval()==0?ProcessStatus.YPCWGLY.getCode():ProcessStatus.YPZXSGLY.getCode());
+			t.setProcessStatus(ProcessStatus.YPCWGLY.getCode());
 			addOrderLog(o.getOrderNo(),OrderLogProcess.WBSH.getCode());
 			tOrderNewMapper.updateByPrimaryKeySelective(t);
 		}else {

+ 9 - 1
src/main/java/com/goafanti/patent/controller/AdminPatentNewApiController.java

@@ -38,6 +38,10 @@ public class AdminPatentNewApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "专利", "专利"));
 			return res;
 		}
+		if (StringUtils.isBlank(p.getEmail())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "邮箱", "邮箱"));
+			return res;
+		}
 		if ( StringUtils.isBlank(p.getApplyDates())|| StringUtils.isBlank(p.getAuthorizationDates())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "时间", "时间"));
 			return res;
@@ -60,10 +64,14 @@ public class AdminPatentNewApiController extends CertifyApiController {
 	@RequestMapping(value = "/updatePatentNew", method = RequestMethod.POST)
 	public Result updatePatentNew(PatentNewBo p){
 		Result res = new Result();
-		if (StringUtils.isBlank(p.getPatentNo())|| StringUtils.isBlank(p.getName())||StringUtils.isBlank(p.getCertificateUrl())) {
+		if (StringUtils.isBlank(p.getPatentNo())|| StringUtils.isBlank(p.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "专利", "专利"));
 			return res;
 		}
+		if ( StringUtils.isBlank(p.getEmail())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "邮箱", "邮箱"));
+			return res;
+		}
 		SimpleDateFormat sdf = new SimpleDateFormat( AFTConstants.YYYYMMDD);
 		try {
 			p.setApplyDate(sdf.parse(p.getApplyDates()));

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

@@ -65,7 +65,7 @@ avatar.host=//sb.jishutao.com
 
 #连测试
 #avatar.host=//static.jishutao.com
-#static.host=//static.jishutao.com/1.1.13
+#static.host=//static.jishutao.com/1.1.14
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload
 

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

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.13
+static.host=//static.jishutao.com/1.1.14
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload