wanghui лет назад: 8
Родитель
Сommit
c60d469f37

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

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.ContractTask;
 import com.goafanti.common.model.ContractTaskExample;
+import com.goafanti.techproject.bo.TaskDetailBo;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,85 +11,87 @@ public interface ContractTaskMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	long countByExample(ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int deleteByExample(ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int insert(ContractTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int insertSelective(ContractTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	List<ContractTask> selectByExampleWithBLOBs(ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	List<ContractTask> selectByExample(ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	ContractTask selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") ContractTask record, @Param("example") ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int updateByExampleWithBLOBs(@Param("record") ContractTask record, @Param("example") ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int updateByExample(@Param("record") ContractTask record, @Param("example") ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int updateByPrimaryKeySelective(ContractTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int updateByPrimaryKeyWithBLOBs(ContractTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	int updateByPrimaryKey(ContractTask record);
+
+	TaskDetailBo selectProjectTaskDetail(String taskId);
 }

+ 69 - 27
src/main/java/com/goafanti/common/mapper/ContractTaskMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="contract_id" jdbcType="VARCHAR" property="contractId" />
@@ -21,12 +21,13 @@
     <result column="task_allocator" jdbcType="VARCHAR" property="taskAllocator" />
     <result column="task_receiver" jdbcType="VARCHAR" property="taskReceiver" />
     <result column="delete_sign" jdbcType="INTEGER" property="deleteSign" />
+    <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.ContractTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -34,7 +35,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -68,7 +69,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -102,17 +103,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     id, contract_id, commodity_id, commodity_name, commodity_quantity, commodity_type, 
     commodity_mode, create_time, task_comment, task_status, task_distribution_time, task_allocator, 
-    task_receiver, delete_sign
+    task_receiver, delete_sign, serial_number
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     attachment_url
   </sql>
@@ -120,7 +121,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     select
     <if test="distinct">
@@ -141,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     select
     <if test="distinct">
@@ -160,7 +161,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -173,7 +174,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     delete from contract_task
     where id = #{id,jdbcType=VARCHAR}
@@ -182,7 +183,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     delete from contract_task
     <if test="_parameter != null">
@@ -193,26 +194,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     insert into contract_task (id, contract_id, commodity_id, 
       commodity_name, commodity_quantity, commodity_type, 
       commodity_mode, create_time, task_comment, 
       task_status, task_distribution_time, task_allocator, 
-      task_receiver, delete_sign, attachment_url
-      )
+      task_receiver, delete_sign, serial_number, 
+      attachment_url)
     values (#{id,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, 
       #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityType,jdbcType=INTEGER}, 
       #{commodityMode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{taskComment,jdbcType=VARCHAR}, 
       #{taskStatus,jdbcType=INTEGER}, #{taskDistributionTime,jdbcType=TIMESTAMP}, #{taskAllocator,jdbcType=VARCHAR}, 
-      #{taskReceiver,jdbcType=VARCHAR}, #{deleteSign,jdbcType=INTEGER}, #{attachmentUrl,jdbcType=LONGVARCHAR}
-      )
+      #{taskReceiver,jdbcType=VARCHAR}, #{deleteSign,jdbcType=INTEGER}, #{serialNumber,jdbcType=INTEGER}, 
+      #{attachmentUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.ContractTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     insert into contract_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -258,6 +259,9 @@
       <if test="deleteSign != null">
         delete_sign,
       </if>
+      <if test="serialNumber != null">
+        serial_number,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -305,6 +309,9 @@
       <if test="deleteSign != null">
         #{deleteSign,jdbcType=INTEGER},
       </if>
+      <if test="serialNumber != null">
+        #{serialNumber,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -314,7 +321,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     select count(*) from contract_task
     <if test="_parameter != null">
@@ -325,7 +332,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     update contract_task
     <set>
@@ -371,6 +378,9 @@
       <if test="record.deleteSign != null">
         delete_sign = #{record.deleteSign,jdbcType=INTEGER},
       </if>
+      <if test="record.serialNumber != null">
+        serial_number = #{record.serialNumber,jdbcType=INTEGER},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -383,7 +393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     update contract_task
     set id = #{record.id,jdbcType=VARCHAR},
@@ -400,6 +410,7 @@
       task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
       delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      serial_number = #{record.serialNumber,jdbcType=INTEGER},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -409,7 +420,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     update contract_task
     set id = #{record.id,jdbcType=VARCHAR},
@@ -425,7 +436,8 @@
       task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
-      delete_sign = #{record.deleteSign,jdbcType=INTEGER}
+      delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      serial_number = #{record.serialNumber,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -434,7 +446,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     update contract_task
     <set>
@@ -477,6 +489,9 @@
       <if test="deleteSign != null">
         delete_sign = #{deleteSign,jdbcType=INTEGER},
       </if>
+      <if test="serialNumber != null">
+        serial_number = #{serialNumber,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -487,7 +502,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     update contract_task
     set contract_id = #{contractId,jdbcType=VARCHAR},
@@ -503,6 +518,7 @@
       task_allocator = #{taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{taskReceiver,jdbcType=VARCHAR},
       delete_sign = #{deleteSign,jdbcType=INTEGER},
+      serial_number = #{serialNumber,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -510,7 +526,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Jan 31 16:35:57 CST 2018.
+      This element was generated on Thu Feb 01 15:10:35 CST 2018.
     -->
     update contract_task
     set contract_id = #{contractId,jdbcType=VARCHAR},
@@ -525,7 +541,33 @@
       task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{taskReceiver,jdbcType=VARCHAR},
-      delete_sign = #{deleteSign,jdbcType=INTEGER}
+      delete_sign = #{deleteSign,jdbcType=INTEGER},
+      serial_number = #{serialNumber,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
+  <select id="selectProjectTaskDetail" parameterType="java.lang.String" resultType="com.goafanti.techproject.bo.TaskDetailBo">
+		select
+			a.id as taskId,
+			a.commodity_id as commodityId,
+			a.serial_number as taskNo,
+			a.task_distribution_time  as taskDistributionTime,
+			a.task_comment as taskComment,
+			b.bname as commodityName ,
+			c.cname as categoryName,
+			c.id as categoryId,
+			d.serial_number as projectNo,
+			d.status,
+			d.deleted_sign as deletedSign,
+			e.name as taskAllocatorName,
+			f.name as taskReceiverName
+		from
+			contract_task a left join business_project b on
+			a.commodity_id = b.id left join business_varieties c on
+			b.cid = c.id left join contract d on
+			a.contract_id = d.id left join admin e on 
+			a.task_allocator = e.id left join admin f on 
+			a.task_receiver = f.id
+		where 
+			a.id = #{taskId,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -644,7 +644,7 @@
 	<if test="salesmanName != null and salesmanName !=''">
 		and d.name = #{salesmanName,jdbcType=VARCHAR}
 	</if>
-	<if test="depId != null adn depId != ''">
+	<if test="depId != null and depId != ''">
 		and d.department_id = #{depId,jdbcType=VARCHAR}
 	</if>
 	<if test="orderStartDate != null and orderStartDate != ''">
@@ -692,4 +692,91 @@
 		a.task_receiver = b.id
 	where a.contract_id = #{contractId,jdbcType=VARCHAR}
   </select>
+  <select id="selectProjectTaskByPage" resultType="com.goafanti.techproject.bo.TaskListBo">
+		select
+			a.id as taskId,
+			a.commodity_id as commodityId,
+			a.serial_number as taskNo,
+			a.task_distribution_time  as taskDistributionTime,
+			a.task_comment as taskComment,
+			b.bname as commodityName ,
+			c.cname as categoryName,
+			c.id as categoryId,
+			d.serial_number as projectNo,
+			d.status,
+			d.deleted_sign as deletedSign,
+			e.name as buyerName,
+			f.name as taskReceiverName
+		from
+			contract_task a left join business_project b on
+			a.commodity_id = b.id left join business_varieties c on
+			b.cid = c.id left join contract d on
+			a.contract_id = d.id left join user e on
+			b.uid = e.id left join admin f on 
+			a.task_receiver = f.id
+		where 1=1
+		<if test="taskReceiverId != null and taskReceiverId != ''">
+			a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
+		</if>
+		<if test="taskStatus != null">
+			a.task_status = #{taskStatus,jdbcType=VARCHAR}
+		</if>
+		<if test="startDate != null">
+			a.task_distribution_time &gt; #{startDate,jdbcType=TIMESTAMP}
+		</if>
+		<if test="endDate != null">
+			a.task_distribution_time &lt; #{endDate,jdbcType=TIMESTAMP}
+		</if>
+		<if test="projectNo != null and projectNo != ''">
+			d.serial_number = #{projectNo,jdbcType=VARCHAR}
+		</if>
+		<if test="buyerName != null and buyerName != ''">
+			e.name = #{buyerName,jdbcType=VARCHAR}
+		</if>
+		
+		<if test="taskReceiverName != null and taskReceiverName != ''">
+			f.name = #{taskReceiverName,jdbcType=VARCHAR}
+		</if>
+		<if test="categoryId != null and categoryId != ''">
+			c.id = #{categoryId,jdbcType=VARCHAR}
+		</if>
+  </select>
+  
+  <select id="selectProjectTaskCount" resultType="java.lang.Integer">
+  		select
+			count(0)
+		from
+			contract_task a left join business_project b on
+			a.commodity_id = b.id left join business_varieties c on
+			b.cid = c.id left join contract d on
+			a.contract_id = d.id left join user e on
+			b.uid = e.id left join admin f on 
+			a.task_receiver = f.id
+		where 1=1
+		<if test="taskReceiverId != null and taskReceiverId != ''">
+			a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
+		</if>
+		<if test="taskStatus != null">
+			a.task_status = #{taskStatus,jdbcType=VARCHAR}
+		</if>
+		<if test="startDate != null">
+			a.task_distribution_time &gt; #{startDate,jdbcType=TIMESTAMP}
+		</if>
+		<if test="endDate != null">
+			a.task_distribution_time &lt; #{endDate,jdbcType=TIMESTAMP}
+		</if>
+		<if test="projectNo != null and projectNo != ''">
+			d.serial_number = #{projectNo,jdbcType=VARCHAR}
+		</if>
+		<if test="buyerName != null and buyerName != ''">
+			e.name = #{buyerName,jdbcType=VARCHAR}
+		</if>
+		
+		<if test="taskReceiverName != null and taskReceiverName != ''">
+			f.name = #{taskReceiverName,jdbcType=VARCHAR}
+		</if>
+		<if test="categoryId != null and categoryId != ''">
+			c.id = #{categoryId,jdbcType=VARCHAR}
+		</if>
+  </select>
 </mapper>

+ 68 - 45
src/main/java/com/goafanti/common/model/ContractTask.java

@@ -6,84 +6,89 @@ public class ContractTask {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.contract_id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String contractId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String commodityId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_name
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String commodityName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_quantity
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private Integer commodityQuantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_type
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private Integer commodityType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_mode
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String commodityMode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.create_time
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_comment
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String taskComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_status
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private Integer taskStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_distribution_time
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private Date taskDistributionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_allocator
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String taskAllocator;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_receiver
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String taskReceiver;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.delete_sign
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private Integer deleteSign;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.serial_number
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 */
+	private Integer serialNumber;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.attachment_url
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	private String attachmentUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.id
 	 * @return  the value of contract_task.id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -92,7 +97,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.id
 	 * @param id  the value for contract_task.id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -101,7 +106,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.contract_id
 	 * @return  the value of contract_task.contract_id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getContractId() {
 		return contractId;
@@ -110,7 +115,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.contract_id
 	 * @param contractId  the value for contract_task.contract_id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setContractId(String contractId) {
 		this.contractId = contractId;
@@ -119,7 +124,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_id
 	 * @return  the value of contract_task.commodity_id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -128,7 +133,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_id
 	 * @param commodityId  the value for contract_task.commodity_id
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -137,7 +142,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_name
 	 * @return  the value of contract_task.commodity_name
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -146,7 +151,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_name
 	 * @param commodityName  the value for contract_task.commodity_name
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -155,7 +160,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_quantity
 	 * @return  the value of contract_task.commodity_quantity
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -164,7 +169,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_quantity
 	 * @param commodityQuantity  the value for contract_task.commodity_quantity
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -173,7 +178,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_type
 	 * @return  the value of contract_task.commodity_type
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public Integer getCommodityType() {
 		return commodityType;
@@ -182,7 +187,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_type
 	 * @param commodityType  the value for contract_task.commodity_type
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setCommodityType(Integer commodityType) {
 		this.commodityType = commodityType;
@@ -191,7 +196,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_mode
 	 * @return  the value of contract_task.commodity_mode
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getCommodityMode() {
 		return commodityMode;
@@ -200,7 +205,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_mode
 	 * @param commodityMode  the value for contract_task.commodity_mode
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setCommodityMode(String commodityMode) {
 		this.commodityMode = commodityMode;
@@ -209,7 +214,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.create_time
 	 * @return  the value of contract_task.create_time
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -218,7 +223,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.create_time
 	 * @param createTime  the value for contract_task.create_time
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -227,7 +232,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_comment
 	 * @return  the value of contract_task.task_comment
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -236,7 +241,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_comment
 	 * @param taskComment  the value for contract_task.task_comment
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -245,7 +250,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_status
 	 * @return  the value of contract_task.task_status
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public Integer getTaskStatus() {
 		return taskStatus;
@@ -254,7 +259,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_status
 	 * @param taskStatus  the value for contract_task.task_status
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setTaskStatus(Integer taskStatus) {
 		this.taskStatus = taskStatus;
@@ -263,7 +268,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_distribution_time
 	 * @return  the value of contract_task.task_distribution_time
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public Date getTaskDistributionTime() {
 		return taskDistributionTime;
@@ -272,7 +277,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_distribution_time
 	 * @param taskDistributionTime  the value for contract_task.task_distribution_time
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setTaskDistributionTime(Date taskDistributionTime) {
 		this.taskDistributionTime = taskDistributionTime;
@@ -281,7 +286,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_allocator
 	 * @return  the value of contract_task.task_allocator
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getTaskAllocator() {
 		return taskAllocator;
@@ -290,7 +295,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_allocator
 	 * @param taskAllocator  the value for contract_task.task_allocator
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setTaskAllocator(String taskAllocator) {
 		this.taskAllocator = taskAllocator;
@@ -299,7 +304,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_receiver
 	 * @return  the value of contract_task.task_receiver
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getTaskReceiver() {
 		return taskReceiver;
@@ -308,7 +313,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_receiver
 	 * @param taskReceiver  the value for contract_task.task_receiver
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
@@ -317,7 +322,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.delete_sign
 	 * @return  the value of contract_task.delete_sign
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -326,16 +331,34 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.delete_sign
 	 * @param deleteSign  the value for contract_task.delete_sign
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.serial_number
+	 * @return  the value of contract_task.serial_number
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 */
+	public Integer getSerialNumber() {
+		return serialNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.serial_number
+	 * @param serialNumber  the value for contract_task.serial_number
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 */
+	public void setSerialNumber(Integer serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.attachment_url
 	 * @return  the value of contract_task.attachment_url
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -344,7 +367,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.attachment_url
 	 * @param attachmentUrl  the value for contract_task.attachment_url
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class ContractTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public ContractTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1082,11 +1082,71 @@ public class ContractTaskExample {
 			addCriterion("delete_sign not between", value1, value2, "deleteSign");
 			return (Criteria) this;
 		}
+
+		public Criteria andSerialNumberIsNull() {
+			addCriterion("serial_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberIsNotNull() {
+			addCriterion("serial_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberEqualTo(Integer value) {
+			addCriterion("serial_number =", value, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberNotEqualTo(Integer value) {
+			addCriterion("serial_number <>", value, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberGreaterThan(Integer value) {
+			addCriterion("serial_number >", value, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberGreaterThanOrEqualTo(Integer value) {
+			addCriterion("serial_number >=", value, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberLessThan(Integer value) {
+			addCriterion("serial_number <", value, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberLessThanOrEqualTo(Integer value) {
+			addCriterion("serial_number <=", value, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberIn(List<Integer> values) {
+			addCriterion("serial_number in", values, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberNotIn(List<Integer> values) {
+			addCriterion("serial_number not in", values, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberBetween(Integer value1, Integer value2) {
+			addCriterion("serial_number between", value1, value2, "serialNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andSerialNumberNotBetween(Integer value1, Integer value2) {
+			addCriterion("serial_number not between", value1, value2, "serialNumber");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract_task
-	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -462,5 +462,4 @@ public class AdminOrderApiController extends CertifyApiController {
 		orderServiceImpl.updateBill(billNo, financialPayNo, financialPayTime, remarks);
 		return res;
 	}
-
 }

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

@@ -591,8 +591,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		bill.setTransactionSubject(transactionSubject.getCode());
 		bill.setTransactionChannel(payChannel.getCode());
 		bill.setCreateTime(new Date());
-		tOrderBillMapper.insert(bill);
-		return 1;
+		return tOrderBillMapper.insert(bill);
 	}
 	
 	@Override
@@ -1356,7 +1355,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				task.setCreateTime(createTime);
 				task.setContractId(contractId);
 				task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
-				task.setDeleteSign(DeleteStatus.LOCKING.getCode());
+				task.setDeleteSign(DeleteStatus.UNDELETE.getCode());
 				taskList.add(task);
 			}
 		}

+ 104 - 1
src/main/java/com/goafanti/techproject/bo/TaskDetailBo.java

@@ -1,5 +1,108 @@
 package com.goafanti.techproject.bo;
 
-public class TaskDetailBo extends TaskListBo {
+public class TaskDetailBo{
+	/** 任务ID **/
+	private String taskId;
+	/** 项目编号 **/
 	private String projectNo;
+	/** 任务编号 **/
+	private String taskNo;
+	/** 任务分配时间 **/
+	private String taskDistributionTime;
+	/** 任务说明 **/
+	private String taskComment;
+	/** 商品ID **/
+	private String commodityId;
+	/** 商品名称 **/
+	private String commodityName;
+	/** 类别ID **/
+	private String categoryId;
+	/** 类别名称 **/
+	private String categoryName;
+	/** 任务分配人 **/
+	private String taskAllocatorName;
+	/** 任务接收人 **/
+	private String taskReceiverName;
+	/** 任务状态 **/
+	private Integer status;
+	/** 锁定状态 **/
+	private Integer deletedSign;
+	public String getTaskId() {
+		return taskId;
+	}
+	public void setTaskId(String taskId) {
+		this.taskId = taskId;
+	}
+	public String getProjectNo() {
+		return projectNo;
+	}
+	public void setProjectNo(String projectNo) {
+		this.projectNo = projectNo;
+	}
+	public String getTaskNo() {
+		return taskNo;
+	}
+	public void setTaskNo(String taskNo) {
+		this.taskNo = taskNo;
+	}
+	public String getTaskDistributionTime() {
+		return taskDistributionTime;
+	}
+	public void setTaskDistributionTime(String taskDistributionTime) {
+		this.taskDistributionTime = taskDistributionTime;
+	}
+	public String getTaskComment() {
+		return taskComment;
+	}
+	public void setTaskComment(String taskComment) {
+		this.taskComment = taskComment;
+	}
+	public String getCommodityId() {
+		return commodityId;
+	}
+	public void setCommodityId(String commodityId) {
+		this.commodityId = commodityId;
+	}
+	public String getCommodityName() {
+		return commodityName;
+	}
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+	public String getCategoryId() {
+		return categoryId;
+	}
+	public void setCategoryId(String categoryId) {
+		this.categoryId = categoryId;
+	}
+	public String getCategoryName() {
+		return categoryName;
+	}
+	public void setCategoryName(String categoryName) {
+		this.categoryName = categoryName;
+	}
+	public String getTaskAllocatorName() {
+		return taskAllocatorName;
+	}
+	public void setTaskAllocatorName(String taskAllocatorName) {
+		this.taskAllocatorName = taskAllocatorName;
+	}
+	public String getTaskReceiverName() {
+		return taskReceiverName;
+	}
+	public void setTaskReceiverName(String taskReceiverName) {
+		this.taskReceiverName = taskReceiverName;
+	}
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getDeletedSign() {
+		return deletedSign;
+	}
+	public void setDeletedSign(Integer deletedSign) {
+		this.deletedSign = deletedSign;
+	}
 }

+ 142 - 0
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -32,6 +32,7 @@ import com.goafanti.common.enums.AttachmentType;
 import com.goafanti.common.enums.TechProjectFields;
 import com.goafanti.common.enums.TechProjectStatus;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.ContractTask;
 import com.goafanti.common.model.TechProject;
 import com.goafanti.common.model.TechProjectLog;
 import com.goafanti.common.model.TechWebsite;
@@ -49,6 +50,7 @@ import com.goafanti.techproject.bo.ProjectListBo;
 import com.goafanti.techproject.bo.TechProjectManageListBo;
 import com.goafanti.techproject.bo.TechWebsiteDetailBo;
 import com.goafanti.techproject.bo.TechWebsiteListBo;
+import com.goafanti.techproject.enums.TaskState;
 import com.goafanti.techproject.service.TechProjectLogService;
 import com.goafanti.techproject.service.TechProjectService;
 import com.goafanti.techproject.service.TechWebsiteService;
@@ -616,6 +618,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @param setUpEndDate
 	 * @return
 	 */
+	@RequestMapping(value = "/listProject",method = RequestMethod.POST)
 	public Result listProject(ProjectListBo bo,String depId,
 			String orderStartTime,String orderEndTime,String setUpStartDate,String setUpEndDate,Integer pageNo,Integer pageSize){
 		Result res = new Result();
@@ -632,6 +635,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @param signComment
 	 * @return
 	 */
+	@RequestMapping(value = "/createProject",method = RequestMethod.POST)
 	public Result createProject(String orderNo,String uid,String aid,Integer projectType,String signComment){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
@@ -649,6 +653,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @param contractId
 	 * @return
 	 */
+	@RequestMapping(value = "/getProjectDetail",method = RequestMethod.GET)
 	public Result getProjectDetail(String contractId){
 		Result res = new Result();
 		if(StringUtils.isBlank(contractId)){
@@ -664,6 +669,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @param contractId
 	 * @return
 	 */
+	@RequestMapping(value = "/getProjectTask",method = RequestMethod.GET)
 	public Result getProjectTask(String contractId){
 		Result res = new Result();
 		if(StringUtils.isBlank(contractId)){
@@ -682,6 +688,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @param taskComment
 	 * @return
 	 */
+	@RequestMapping(value = "/addProjectTask",method = RequestMethod.POST)
 	public Result addProjectTask(String contractId,String commodityId,String commodityName,Integer commodityQuantity,String commodityMode,String taskComment){
 		Result res = new Result();
 		if(StringUtils.isBlank(contractId) || StringUtils.isBlank(commodityId) || commodityQuantity == null){
@@ -697,9 +704,144 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @param taskId
 	 * @return
 	 */
+	@RequestMapping(value = "/getProjectTaskDetail",method = RequestMethod.GET)
 	public Result getProjectTaskDetail(String taskId){
 		Result res = new Result();
+		if(StringUtils.isBlank(taskId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号"));
+			return res;
+		}
 		res.setData(techProjectService.selectProjectTaskDetail(taskId));
 		return res;
 	}
+	
+	/**
+	 * 修改项目任务
+	 * @param taskId
+	 * @param commodityId
+	 * @param commodityMode
+	 * @param taskComment
+	 * @return
+	 */
+	@RequestMapping(value = "/updateProjectTask",method = RequestMethod.POST)
+	public Result updateProjectTask(String taskId,String commodityId,String commodityMode,String taskComment){
+		Result res = new Result();
+		if(StringUtils.isBlank(taskId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号"));
+			return res;
+		}
+		ContractTask task = new ContractTask();
+		task.setCommodityId(commodityId);
+		task.setTaskComment(taskComment);
+		task.setCommodityMode(commodityMode);
+		techProjectService.updateProjectTask(task);
+		return res;
+	}
+	
+	/**
+	 * 派单
+	 * @param taskId
+	 * @param taskReceiver
+	 * @return
+	 */
+	@RequestMapping(value = "/distributionTask",method = RequestMethod.POST)
+	public Result distributionTask(String taskId,String taskReceiverId){
+		Result res = new Result();
+		if(StringUtils.isBlank(taskId) || StringUtils.isBlank(taskReceiverId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号和制定派单人"));
+			return res;
+		}
+		ContractTask task = new ContractTask();
+		task.setTaskReceiver(taskReceiverId);
+		task.setTaskAllocator(TokenManager.getAdminId());
+		task.setTaskDistributionTime(new Date());
+		techProjectService.updateProjectTask(task);
+		return res;
+	}
+	
+	/**
+	 * 
+	 * @param projectNo 项目编号
+	 * @param buyerName 客户名称
+	 * @param startDate 开始时间
+	 * @param endDate 结束时间
+	 * @param taskStatus 任务状态
+	 * @param categoryId 业务分类
+	 * @return
+	 */
+	@RequestMapping(value = "/listMyTask",method = RequestMethod.POST)
+	public Result listMyTask(String projectNo,String buyerName,String startDate,String endDate, Integer taskStatus,String categoryId,
+			Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(techProjectService.selectProjectTask(projectNo, buyerName, TokenManager.getAdminId(), "", 
+				startDate, endDate, taskStatus, categoryId, pageNo, pageSize));
+		return res;
+	}
+	
+	/**
+	 * 
+	 * @param projectNo 项目编号
+	 * @param buyerName 客户名称 
+	 * @param taskReceiverName 任务负责人
+	 * @param startDate 开始时间
+	 * @param endDate 结束时间
+	 * @param taskStatus 任务状态
+	 * @param categoryId 任务分类
+	 * @param pageNo 
+	 * @param pageSize
+	 * @return
+	 */
+	@RequestMapping(value = "/listTask",method = RequestMethod.POST)
+	public Result listTask(String projectNo,String buyerName,String taskReceiverName, String startDate,String endDate, 
+			Integer taskStatus,String categoryId,Integer pageNo, Integer pageSize){
+		Result res = new Result();
+		res.setData(techProjectService.selectProjectTask(projectNo, buyerName, "", taskReceiverName, startDate, endDate, 
+				taskStatus, categoryId, pageNo, pageSize));
+		return res;
+	}
+	
+	
+	/**
+	 * 启动资料
+	 * @param taskId
+	 * @return
+	 */
+	@RequestMapping(value = "/startTask",method = RequestMethod.GET)
+	public Result startTask(String taskId){
+		Result res = new Result();
+		if(StringUtils.isBlank(taskId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号"));
+			return res;
+		}
+		ContractTask task = techProjectService.selectTaskById(taskId);
+		if(task != null){
+			if(task.getTaskStatus() != TaskState.DISTRIBUTION.getCode());
+			res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+		}
+		task.setTaskStatus(TaskState.STARTED.getCode());
+		techProjectService.updateProjectTask(task);
+		return res;
+	}
+	
+	/**
+	 * 完成任务
+	 * @param taskId
+	 * @return
+	 */
+	@RequestMapping(value = "/completeTask",method = RequestMethod.GET)
+	public Result completeTask(String taskId){
+		Result res = new Result();
+		if(StringUtils.isBlank(taskId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号"));
+			return res;
+		}
+		ContractTask task = techProjectService.selectTaskById(taskId);
+		if(task != null){
+			if(task.getTaskStatus() != TaskState.STARTED.getCode());
+			res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+		}
+		task.setTaskStatus(TaskState.COMPLETE.getCode());
+		techProjectService.updateProjectTask(task);
+		return res;
+	} 
 }

+ 5 - 0
src/main/java/com/goafanti/techproject/enums/TaskState.java

@@ -4,10 +4,15 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum TaskState {
+	/** 未分配 **/
 	UN_DISTRIBUTION(0,"未分配"),
+	/** 已分配 **/
 	DISTRIBUTION(1,"已分配"),
+	/** 材料已启动 **/
 	STARTED(2,"材料已启动"),
+	/** 材料已完成 **/
 	COMPLETE(3,"材料已完成"),
+	/** **/
 	INVALID(10,"未定义");
 	private TaskState(Integer code, String desc) {
 		this.code = code;

+ 41 - 1
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -5,10 +5,12 @@ import java.util.List;
 
 import com.goafanti.app.bo.ProjectDetailBo;
 import com.goafanti.common.model.Contract;
+import com.goafanti.common.model.ContractTask;
 import com.goafanti.common.model.TechProject;
 import com.goafanti.common.model.TechProjectLog;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.techproject.bo.ProjectListBo;
+import com.goafanti.techproject.bo.TaskDetailBo;
 import com.goafanti.techproject.bo.TaskListBo;
 import com.goafanti.techproject.bo.TechProjectClientListBo;
 import com.goafanti.techproject.bo.TechProjectContractListBo;
@@ -88,5 +90,43 @@ public interface TechProjectService {
 	 */
 	int addProjectTask(String contractId,String commodityId, String commodityName,Integer commodityQuantity, String commodityMode, String taskComment);
 
-	Object selectProjectTaskDetail(String taskId);
+	/**
+	 * 查询任务详情
+	 * @param taskId
+	 * @return
+	 */
+	TaskDetailBo selectProjectTaskDetail(String taskId);
+
+	/**
+	 * 修改任务
+	 * @param taskId
+	 * @param commodityId
+	 * @param commodityMode
+	 * @param taskComment
+	 * @return
+	 */
+	int updateProjectTask(ContractTask task);
+	
+	/**
+	 * 项目任务列表
+	 * @param projectNo	
+	 * @param buyerName
+	 * @param taskReceiver
+	 * @param startDate
+	 * @param endDate
+	 * @param taskStatus
+	 * @param categoryId
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	Pagination<TaskListBo> selectProjectTask(String projectNo,String buyerName,String taskReceiverId, String taskReceiverName,
+			String startDate,String endDate, Integer taskStatus,String categoryId,Integer pageNo, Integer pageSize);
+	
+	/**
+	 * 根据任务id查询任务
+	 * @param taskId
+	 * @return
+	 */
+	ContractTask selectTaskById(String taskId);
 }

+ 35 - 2
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -45,6 +45,7 @@ import com.goafanti.order.enums.ActiveState;
 import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.enums.ProjectStage;
 import com.goafanti.techproject.bo.ProjectListBo;
+import com.goafanti.techproject.bo.TaskDetailBo;
 import com.goafanti.techproject.bo.TaskListBo;
 import com.goafanti.techproject.bo.TechProjectClientListBo;
 import com.goafanti.techproject.bo.TechProjectContractListBo;
@@ -391,9 +392,41 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	}
 
 	@Override
-	public Object selectProjectTaskDetail(String taskId) {
+	public TaskDetailBo selectProjectTaskDetail(String taskId) {
+		
+		return contractTaskMapper.selectProjectTaskDetail(taskId);
+	}
+
+	@Override
+	public int updateProjectTask(ContractTask task) {
+		return contractTaskMapper.updateByPrimaryKeySelective(task);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<TaskListBo> selectProjectTask(String projectNo, String buyerName, String taskReceiverId, String taskReceiverName,
+			String startDate,String endDate, Integer taskStatus, String categoryId, Integer pageNo, Integer pageSize) {
+		Map<String,Object> params = new HashMap<String,Object>();
+		if(StringUtils.isNotBlank(projectNo)) params.put("projectNo", projectNo);
+		if(StringUtils.isNotBlank(buyerName)) params.put("buyerName", buyerName);
+		if(StringUtils.isNotBlank(taskReceiverId)) params.put("taskReceiverId", taskReceiverId);
+		if(StringUtils.isNotBlank(taskReceiverName)) params.put("taskReceiverName", categoryId);
+		try {
+			if (StringUtils.isNotBlank(startDate))
+				params.put("startDate", DateUtils.parseDate(startDate + " 00:00:00", AFTConstants.YYYYMMDDHHMMSS));
+			if (StringUtils.isNotBlank(endDate))
+				params.put("endDate", DateUtils.parseDate(endDate + " 23:59:59", AFTConstants.YYYYMMDDHHMMSS));
+			} catch (ParseException e) {
+		}
+		if(StringUtils.isNotBlank(categoryId)) params.put("categoryId", categoryId);
+		if(taskStatus != null) params.put("taskStatus", taskStatus);
+		return (Pagination<TaskListBo>)findPage("selectProjectTaskByPage", "selectProjectTaskCount", params, pageNo, pageSize);
+	}
+
+	@Override
+	public ContractTask selectTaskById(String taskId) {
 		// TODO Auto-generated method stub
-		return null;
+		return contractTaskMapper.selectByPrimaryKey(taskId);
 	}
 
 }