anderx лет назад: 6
Родитель
Сommit
0a8f5a7ddb

+ 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="temporary_receivables"/>
+    <table schema="aft" tableName="task_hours_count"/>
   </context>
 </generatorConfiguration>

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

@@ -12,85 +12,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

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

@@ -81,4 +81,6 @@ 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,@Param("fid")String fid);
+
+	List<TTaskHours> taskHoursDetailsList( @Param("taskId")String taskId,  @Param("aid")String aid);
 }

+ 101 - 0
src/main/java/com/goafanti/common/dao/TaskHoursCountMapper.java

@@ -0,0 +1,101 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TaskHoursCount;
+import com.goafanti.common.model.TaskHoursCountExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TaskHoursCountMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    long countByExample(TaskHoursCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    int deleteByExample(TaskHoursCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    int insert(TaskHoursCount record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    int insertSelective(TaskHoursCount record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    List<TaskHoursCount> selectByExample(TaskHoursCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    TaskHoursCount selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    int updateByExampleSelective(@Param("record") TaskHoursCount record, @Param("example") TaskHoursCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    int updateByExample(@Param("record") TaskHoursCount record, @Param("example") TaskHoursCountExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    int updateByPrimaryKeySelective(TaskHoursCount record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    int updateByPrimaryKey(TaskHoursCount record);
+
+	int selectByAidAndTid(@Param("aid") String aid, @Param("tid") String tid);
+
+	void updateByAidAndTid(@Param("aid") String aid, @Param("tid") String tid, @Param("hours") Double hours);
+
+}

+ 23 - 22
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 Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -47,7 +47,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -55,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -89,7 +89,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -123,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 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, 
@@ -136,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     attachment_url
   </sql>
@@ -144,7 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     select
     <if test="distinct">
@@ -165,7 +165,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     select
     <if test="distinct">
@@ -184,7 +184,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -197,7 +197,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -206,7 +206,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -217,7 +217,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -250,7 +250,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -478,7 +478,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -489,7 +489,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     update t_order_task
     <set>
@@ -610,7 +610,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -657,7 +657,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -703,7 +703,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     update t_order_task
     <set>
@@ -819,7 +819,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -863,7 +863,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Sep 26 15:38:54 CST 2019.
+      This element was generated on Wed Nov 20 10:18:39 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -917,12 +917,13 @@
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
   	    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.project_status as projectStatus,
     a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,
-    ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, j.name as outsourceName 
+    ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, j.name as outsourceName ,ifnull(k.hours,0) hours
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
   	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
     group by task_id) i on a.id=i.task_id  left join (select order_no,max(name)as name from outsource_organization group by order_no) j 
-    on a.order_no=j.order_no where e.delete_sign !=1  and e.order_status not in (5,7) and e.outsource= #{outsource,jdbcType=INTEGER}
+    on a.order_no=j.order_no left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid
+    where e.delete_sign !=1  and e.order_status not in (5,7)  and e.outsource= #{outsource,jdbcType=INTEGER}
     <if test="specially == 0 or specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>

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

@@ -346,4 +346,9 @@
   	</if>
   	order by  a.task_start_time desc
   </select>
+  <select id="taskHoursDetailsList" resultType="com.goafanti.common.model.TTaskHours">
+  select id,task_id taskId,hours,aid, date_format(create_time,'%Y-%m-%d %H:%i:%S') createTimes,remarks,
+  date_format(task_day,'%Y-%m-%d %H:%i:%S') taskDays from t_task_hours where aid= #{aid} and task_id =#{taskId}
+  
+  </select>
 </mapper>

+ 293 - 0
src/main/java/com/goafanti/common/mapper/TaskHoursCountMapper.xml

@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.TaskHoursCountMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskHoursCount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <result column="hours" jdbcType="DOUBLE" property="hours" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    id, tid, aid, hours, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TaskHoursCountExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from task_hours_count
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from task_hours_count
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    delete from task_hours_count
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TaskHoursCountExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    delete from task_hours_count
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TaskHoursCount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    insert into task_hours_count (id, tid, aid, 
+      hours, create_time)
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, 
+      #{hours,jdbcType=DOUBLE}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TaskHoursCount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    insert into task_hours_count
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="hours != null">
+        hours,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="hours != null">
+        #{hours,jdbcType=DOUBLE},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TaskHoursCountExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    select count(*) from task_hours_count
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    update task_hours_count
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.tid != null">
+        tid = #{record.tid,jdbcType=INTEGER},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.hours != null">
+        hours = #{record.hours,jdbcType=DOUBLE},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    update task_hours_count
+    set id = #{record.id,jdbcType=INTEGER},
+      tid = #{record.tid,jdbcType=INTEGER},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      hours = #{record.hours,jdbcType=DOUBLE},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TaskHoursCount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    update task_hours_count
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="hours != null">
+        hours = #{hours,jdbcType=DOUBLE},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TaskHoursCount">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Nov 20 10:55:29 CST 2019.
+    -->
+    update task_hours_count
+    set tid = #{tid,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR},
+      hours = #{hours,jdbcType=DOUBLE},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectByAidAndTid" resultType="java.lang.Integer">
+  	select count(*) from task_hours_count where aid=#{aid} and tid=#{tid}
+  </select>
+  <update id="updateByAidAndTid">
+    update task_hours_count set hours =hours + #{hours,jdbcType=DOUBLE}
+    where tid = #{tid,jdbcType=INTEGER} and aid = #{aid,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -8,188 +8,188 @@ 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	private Integer formRetrieve;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_refund
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	private Integer arrivalMoney;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.outsource_name
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	private String outsourceName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.outsource_price
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	private BigDecimal outsourcePrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.consultant_id
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	private String consultantId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.manager_id
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	private String managerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.attachment_url
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -198,7 +198,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -207,7 +207,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -216,7 +216,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -225,7 +225,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getMain() {
 		return main;
@@ -234,7 +234,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setMain(Integer main) {
 		this.main = main;
@@ -243,7 +243,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getSuperId() {
 		return superId;
@@ -252,7 +252,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setSuperId(String superId) {
 		this.superId = superId;
@@ -261,7 +261,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -270,7 +270,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -279,7 +279,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -288,7 +288,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -297,7 +297,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -306,7 +306,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -315,7 +315,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getCommodityMode() {
 		return commodityMode;
@@ -324,7 +324,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setCommodityMode(String commodityMode) {
 		this.commodityMode = commodityMode;
@@ -333,7 +333,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
@@ -342,7 +342,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
@@ -351,7 +351,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getTaskStatus() {
 		return taskStatus;
@@ -360,7 +360,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setTaskStatus(Integer taskStatus) {
 		this.taskStatus = taskStatus;
@@ -369,7 +369,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Date getTaskDistributionTime() {
 		return taskDistributionTime;
@@ -378,7 +378,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setTaskDistributionTime(Date taskDistributionTime) {
 		this.taskDistributionTime = taskDistributionTime;
@@ -387,7 +387,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getTaskAllocator() {
 		return taskAllocator;
@@ -396,7 +396,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setTaskAllocator(String taskAllocator) {
 		this.taskAllocator = taskAllocator;
@@ -405,7 +405,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getTaskReceiver() {
 		return taskReceiver;
@@ -414,7 +414,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
@@ -423,7 +423,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -432,7 +432,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -441,7 +441,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Date getTaskStartTime() {
 		return taskStartTime;
@@ -450,7 +450,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setTaskStartTime(Date taskStartTime) {
 		this.taskStartTime = taskStartTime;
@@ -459,7 +459,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Date getTaskEndTime() {
 		return taskEndTime;
@@ -468,7 +468,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setTaskEndTime(Date taskEndTime) {
 		this.taskEndTime = taskEndTime;
@@ -477,7 +477,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getProjectStatus() {
 		return projectStatus;
@@ -486,7 +486,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
@@ -495,7 +495,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Date getAcceptTime() {
 		return acceptTime;
@@ -504,7 +504,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setAcceptTime(Date acceptTime) {
 		this.acceptTime = acceptTime;
@@ -513,7 +513,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Date getReviewTime() {
 		return reviewTime;
@@ -522,7 +522,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setReviewTime(Date reviewTime) {
 		this.reviewTime = reviewTime;
@@ -531,7 +531,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Date getPublicityTime() {
 		return publicityTime;
@@ -540,7 +540,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setPublicityTime(Date publicityTime) {
 		this.publicityTime = publicityTime;
@@ -549,7 +549,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Date getLicenceTime() {
 		return licenceTime;
@@ -558,7 +558,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setLicenceTime(Date licenceTime) {
 		this.licenceTime = licenceTime;
@@ -567,7 +567,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getCertificateNumber() {
 		return certificateNumber;
@@ -576,7 +576,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setCertificateNumber(String certificateNumber) {
 		this.certificateNumber = certificateNumber;
@@ -585,7 +585,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -594,7 +594,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -603,7 +603,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getFormRetrieve() {
 		return formRetrieve;
@@ -612,7 +612,7 @@ 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setFormRetrieve(Integer formRetrieve) {
 		this.formRetrieve = formRetrieve;
@@ -621,7 +621,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getTaskRefund() {
 		return taskRefund;
@@ -630,7 +630,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setTaskRefund(Integer taskRefund) {
 		this.taskRefund = taskRefund;
@@ -639,7 +639,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getRefundContent() {
 		return refundContent;
@@ -648,7 +648,7 @@ 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setRefundContent(String refundContent) {
 		this.refundContent = refundContent;
@@ -657,7 +657,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getRetrieveContent() {
 		return retrieveContent;
@@ -666,7 +666,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setRetrieveContent(String retrieveContent) {
 		this.retrieveContent = retrieveContent;
@@ -675,7 +675,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getDeclareUser() {
 		return declareUser;
@@ -684,7 +684,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setDeclareUser(String declareUser) {
 		this.declareUser = declareUser;
@@ -693,7 +693,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getDeclarePwd() {
 		return declarePwd;
@@ -702,7 +702,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setDeclarePwd(String declarePwd) {
 		this.declarePwd = declarePwd;
@@ -711,7 +711,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public BigDecimal getSetUpAmount() {
 		return setUpAmount;
@@ -720,7 +720,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setSetUpAmount(BigDecimal setUpAmount) {
 		this.setUpAmount = setUpAmount;
@@ -729,7 +729,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public Integer getArrivalMoney() {
 		return arrivalMoney;
@@ -738,7 +738,7 @@ 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setArrivalMoney(Integer arrivalMoney) {
 		this.arrivalMoney = arrivalMoney;
@@ -747,7 +747,7 @@ public class TOrderTask {
 	/**
 	 * 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  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getOutsourceName() {
 		return outsourceName;
@@ -756,7 +756,7 @@ public class TOrderTask {
 	/**
 	 * 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  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setOutsourceName(String outsourceName) {
 		this.outsourceName = outsourceName;
@@ -765,7 +765,7 @@ public class TOrderTask {
 	/**
 	 * 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  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public BigDecimal getOutsourcePrice() {
 		return outsourcePrice;
@@ -774,7 +774,7 @@ public class TOrderTask {
 	/**
 	 * 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  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setOutsourcePrice(BigDecimal outsourcePrice) {
 		this.outsourcePrice = outsourcePrice;
@@ -783,7 +783,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.consultant_id
 	 * @return  the value of t_order_task.consultant_id
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getConsultantId() {
 		return consultantId;
@@ -792,7 +792,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.consultant_id
 	 * @param consultantId  the value for t_order_task.consultant_id
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setConsultantId(String consultantId) {
 		this.consultantId = consultantId;
@@ -801,7 +801,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.manager_id
 	 * @return  the value of t_order_task.manager_id
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getManagerId() {
 		return managerId;
@@ -810,7 +810,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.manager_id
 	 * @param managerId  the value for t_order_task.manager_id
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setManagerId(String managerId) {
 		this.managerId = managerId;
@@ -819,7 +819,7 @@ public class TOrderTask {
 	/**
 	 * 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -828,7 +828,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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;

+ 16 - 16
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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 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 Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2454,7 +2454,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Sep 26 15:38:54 CST 2019
+	 * @mbg.generated  Wed Nov 20 10:18:39 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 20 - 0
src/main/java/com/goafanti/common/model/TTaskHours.java

@@ -45,6 +45,10 @@ public class TTaskHours {
 	 * @return  the value of t_task_hours.id
 	 * @mbg.generated  Mon Nov 26 10:26:19 CST 2018
 	 */
+	
+	private String createTimes;
+	private String taskDays;
+	
 	public String getId() {
 		return id;
 	}
@@ -165,4 +169,20 @@ public class TTaskHours {
 	public void setTaskDay(Date taskDay) {
 		this.taskDay = taskDay;
 	}
+
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+
+	public String getTaskDays() {
+		return taskDays;
+	}
+
+	public void setTaskDays(String taskDays) {
+		this.taskDays = taskDays;
+	}
 }

+ 170 - 0
src/main/java/com/goafanti/common/model/TaskHoursCount.java

@@ -0,0 +1,170 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class TaskHoursCount {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_hours_count.id
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_hours_count.tid
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    private Integer tid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_hours_count.aid
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    private String aid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_hours_count.hours
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    private Double hours;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column task_hours_count.create_time
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_hours_count.id
+     *
+     * @return the value of task_hours_count.id
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_hours_count.id
+     *
+     * @param id the value for task_hours_count.id
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_hours_count.tid
+     *
+     * @return the value of task_hours_count.tid
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public Integer getTid() {
+        return tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_hours_count.tid
+     *
+     * @param tid the value for task_hours_count.tid
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_hours_count.aid
+     *
+     * @return the value of task_hours_count.aid
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public String getAid() {
+        return aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_hours_count.aid
+     *
+     * @param aid the value for task_hours_count.aid
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_hours_count.hours
+     *
+     * @return the value of task_hours_count.hours
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public Double getHours() {
+        return hours;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_hours_count.hours
+     *
+     * @param hours the value for task_hours_count.hours
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void setHours(Double hours) {
+        this.hours = hours;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column task_hours_count.create_time
+     *
+     * @return the value of task_hours_count.create_time
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column task_hours_count.create_time
+     *
+     * @param createTime the value for task_hours_count.create_time
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 613 - 0
src/main/java/com/goafanti/common/model/TaskHoursCountExample.java

@@ -0,0 +1,613 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TaskHoursCountExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public TaskHoursCountExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNull() {
+            addCriterion("tid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIsNotNull() {
+            addCriterion("tid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidEqualTo(Integer value) {
+            addCriterion("tid =", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotEqualTo(Integer value) {
+            addCriterion("tid <>", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThan(Integer value) {
+            addCriterion("tid >", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("tid >=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThan(Integer value) {
+            addCriterion("tid <", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidLessThanOrEqualTo(Integer value) {
+            addCriterion("tid <=", value, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidIn(List<Integer> values) {
+            addCriterion("tid in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotIn(List<Integer> values) {
+            addCriterion("tid not in", values, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidBetween(Integer value1, Integer value2) {
+            addCriterion("tid between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andTidNotBetween(Integer value1, Integer value2) {
+            addCriterion("tid not between", value1, value2, "tid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNull() {
+            addCriterion("aid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNotNull() {
+            addCriterion("aid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidEqualTo(String value) {
+            addCriterion("aid =", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotEqualTo(String value) {
+            addCriterion("aid <>", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThan(String value) {
+            addCriterion("aid >", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThanOrEqualTo(String value) {
+            addCriterion("aid >=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThan(String value) {
+            addCriterion("aid <", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThanOrEqualTo(String value) {
+            addCriterion("aid <=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLike(String value) {
+            addCriterion("aid like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotLike(String value) {
+            addCriterion("aid not like", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIn(List<String> values) {
+            addCriterion("aid in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotIn(List<String> values) {
+            addCriterion("aid not in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidBetween(String value1, String value2) {
+            addCriterion("aid between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotBetween(String value1, String value2) {
+            addCriterion("aid not between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursIsNull() {
+            addCriterion("hours is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursIsNotNull() {
+            addCriterion("hours is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursEqualTo(Double value) {
+            addCriterion("hours =", value, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursNotEqualTo(Double value) {
+            addCriterion("hours <>", value, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursGreaterThan(Double value) {
+            addCriterion("hours >", value, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursGreaterThanOrEqualTo(Double value) {
+            addCriterion("hours >=", value, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursLessThan(Double value) {
+            addCriterion("hours <", value, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursLessThanOrEqualTo(Double value) {
+            addCriterion("hours <=", value, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursIn(List<Double> values) {
+            addCriterion("hours in", values, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursNotIn(List<Double> values) {
+            addCriterion("hours not in", values, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursBetween(Double value1, Double value2) {
+            addCriterion("hours between", value1, value2, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andHoursNotBetween(Double value1, Double value2) {
+            addCriterion("hours not between", value1, value2, "hours");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_hours_count
+     *
+     * @mbg.generated do_not_delete_during_merge Wed Nov 20 10:55:29 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_hours_count
+     *
+     * @mbg.generated Wed Nov 20 10:55:29 CST 2019
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

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

@@ -499,7 +499,7 @@ public class ExportExcelUtil {
 					case "客户名称": o = ob.getUserName(); break;
 					case "任务负责人": o = ob.getReceiverName(); break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); break;
-					case "工时": o = ob.getHours(); break;
+					case "工时": o = ob.getHours().toString(); break;
 					case "合同编号":o =ob.getContractNo();break;
 					case "签单日期":o =ob.getSignTime();break;
 					case "派单日期":o =ob.getCreteTime();break;

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

@@ -11,7 +11,7 @@ public class TOrderTaskListBo {
 	private Integer taskStatus;
 	private String taskDate;
 	private Integer commodityQuantity;
-	private String hours;
+	private Double hours;
 	private String depName;
 	private String contractNo;
 	private String creteTime;
@@ -97,10 +97,10 @@ public class TOrderTaskListBo {
 	public void setUserName(String userName) {
 		this.userName = userName;
 	}
-	public String getHours() {
+	public Double getHours() {
 		return hours;
 	}
-	public void setHours(String hours) {
+	public void setHours(Double hours) {
 		this.hours = hours;
 	}
 	public String getDepName() {

+ 15 - 1
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -31,8 +31,8 @@ import com.goafanti.order.service.OrderProjectService;
 public class OrderProjectApiController extends CertifyApiController {
 	
 	@Autowired
-	private OrderProjectService	orderProjectService;
 	
+	private OrderProjectService	orderProjectService;
 	
 	/**
 	 * 项目分配
@@ -129,6 +129,20 @@ public class OrderProjectApiController extends CertifyApiController {
 		res.setData(orderProjectService.taskHoursList(name,taskId,  starTime, endTime ,type,pageNo, pageSize));
 		return res;
 	}
+	/**
+	 * 任务工时详情列表
+	 */
+	@RequestMapping(value="/taskHoursDetailsList" ,method = RequestMethod.GET)
+	public Result taskHoursDetailsList( String taskId ){
+		Result res=new Result();
+		if (StringUtils.isBlank(taskId)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目编号"));
+			return res;
+		}
+		res.setData(orderProjectService.taskHoursDetailsList(taskId));
+		return res;
+	}
+	
 	
 	/**
 	 * 任务操作日志

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

@@ -42,5 +42,7 @@ public interface OrderProjectService {
 	XSSFWorkbook exportMyTaskList();
 
 	XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime, Integer type);
+
+	List<TTaskHours> taskHoursDetailsList(String taskId);
 	
 }

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

@@ -182,11 +182,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						}
 				}
 				 if(nb.getProcessState()==1){//营销管理通过则设置技术管理员通过表
-					 nb.setProcessState(nb.getProcessState()+1);
-					 if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) insertOrderExamine(orderNo);
-						if (orderExamineMapper.checkCountStatus(orderNo,0,0)<1) {
-							nb.setProcessState(nb.getProcessState()+1);
-						}
+					 if (orderExamineMapper.checkCountStatus(orderNo,null,null)<1) {
+						 insertOrderExamine(orderNo);
+					 } 
 					}
 				 if(nb.getProcessState()==2){//咨询师
 						//找出当时人的审核改为通过
@@ -195,9 +193,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						if (orderExamineMapper.checkCountStatus(orderNo,0,0)<1) {
 							nb.setProcessState(nb.getProcessState()+1);
 						}
-						if (orderExamineMapper.checkCountStatus(orderNo,1,0)<1) {
-							nb.setProcessState(nb.getProcessState()+1);
-						}
 					}
 				 if(nb.getProcessState()==3){//咨询师经理
 						//找出当时人的审核改为通过

+ 18 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -29,6 +29,7 @@ import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TTaskHoursMapper;
 import com.goafanti.common.dao.TTaskLogMapper;
+import com.goafanti.common.dao.TaskHoursCountMapper;
 import com.goafanti.common.dao.TaskLogMapper;
 import com.goafanti.common.dao.TaskProgressMapper;
 import com.goafanti.common.enums.NoticeStatus;
@@ -43,6 +44,7 @@ import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.model.TTaskLog;
+import com.goafanti.common.model.TaskHoursCount;
 import com.goafanti.common.model.TaskLog;
 import com.goafanti.common.model.TaskProgress;
 import com.goafanti.common.utils.DateUtils;
@@ -86,6 +88,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Autowired
 	private OrderNewService	orderNewService;
 	@Autowired
+	private TaskHoursCountMapper	taskHoursCountMapper;
+	@Autowired
 	private AdminMapper	adminMapper;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
@@ -359,6 +363,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		t.setId(UUID.randomUUID().toString());
 		t.setCreateTime(new Date());
+		if(taskHoursCountMapper.selectByAidAndTid(TokenManager.getAdminId(),t.getTaskId())>0) {
+			taskHoursCountMapper.updateByAidAndTid(TokenManager.getAdminId(),t.getTaskId(),t.getHours());
+		}else {
+			TaskHoursCount tc=new TaskHoursCount();
+			tc.setAid(TokenManager.getAdminId());
+			tc.setTid(Integer.valueOf(t.getTaskId()));
+			tc.setHours(t.getHours());
+			taskHoursCountMapper.insertSelective(tc);
+		}
 		return tTaskHoursMapper.insertSelective(t);
 	}
 
@@ -456,6 +469,11 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		XSSFWorkbook wb = ExportExcelUtil.exportSelectMyTaskList(list, comment, filePath);
 		return wb;
 	}
+	@Override
+	public List<TTaskHours> taskHoursDetailsList(String taskId) {
+		String aid=TokenManager.getAdminId();
+		return tTaskHoursMapper.taskHoursDetailsList(taskId,aid);
+	}
 	
 	
 }