Browse Source

任务派单

wanghui 8 years ago
parent
commit
e476e2d370

+ 84 - 111
src/main/java/com/goafanti/common/dao/ContractTaskMapper.java

@@ -6,115 +6,88 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface ContractTaskMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 CST 2018
-     */
-    long countByExample(ContractTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 CST 2018
-     */
-    int deleteByExample(ContractTaskExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 CST 2018
-     */
-    int deleteByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 CST 2018
-     */
-    int insert(ContractTask record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 CST 2018
-     */
-    int insertSelective(ContractTask record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    ContractTask selectByPrimaryKey(String id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    int updateByPrimaryKeySelective(ContractTask record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 CST 2018
-     */
-    int updateByPrimaryKeyWithBLOBs(ContractTask record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table contract_task
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 CST 2018
-     */
-    int updateByPrimaryKey(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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	int updateByPrimaryKey(ContractTask record);
 }

+ 3 - 0
src/main/java/com/goafanti/common/dao/TechProjectMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import com.goafanti.app.bo.ProjectDetailBo;
 import com.goafanti.common.model.TechProject;
+import com.goafanti.techproject.bo.TaskListBo;
 import com.goafanti.techproject.bo.TechProjectContractListBo;
 import com.goafanti.techproject.bo.TechProjectDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
@@ -42,4 +43,6 @@ public interface TechProjectMapper {
 	int batchDeleteByContractId(List<String> id);
 
 	ProjectDetailBo selectTechProjectDetail(String contractId);
+
+	List<TaskListBo> selectProjectTask(String contractId);
 }

+ 1 - 1
src/main/java/com/goafanti/common/enums/DeleteStatus.java

@@ -9,7 +9,7 @@ public enum DeleteStatus {
 	
 	UNDELETE(0, "未删除"),
 	DELETED(1, "已删除"),
-	
+	LOCKING(2,"已锁定"),
 	OTHER(6, "其他");
 
 	private DeleteStatus(Integer code, String desc) {

+ 44 - 25
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 Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="contract_id" jdbcType="VARCHAR" property="contractId" />
@@ -20,12 +20,13 @@
     <result column="task_distribution_time" jdbcType="TIMESTAMP" property="taskDistributionTime" />
     <result column="task_allocator" jdbcType="VARCHAR" property="taskAllocator" />
     <result column="task_receiver" jdbcType="VARCHAR" property="taskReceiver" />
+    <result column="delete_sign" jdbcType="INTEGER" property="deleteSign" />
   </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 Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -33,7 +34,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -67,7 +68,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -101,17 +102,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 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
+    task_receiver, delete_sign
   </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 Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     attachment_url
   </sql>
@@ -119,7 +120,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     select
     <if test="distinct">
@@ -140,7 +141,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     select
     <if test="distinct">
@@ -159,7 +160,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -172,7 +173,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     delete from contract_task
     where id = #{id,jdbcType=VARCHAR}
@@ -181,7 +182,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     delete from contract_task
     <if test="_parameter != null">
@@ -192,24 +193,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 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, attachment_url)
+      task_receiver, delete_sign, 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}, #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{taskReceiver,jdbcType=VARCHAR}, #{deleteSign,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 Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     insert into contract_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -252,6 +255,9 @@
       <if test="taskReceiver != null">
         task_receiver,
       </if>
+      <if test="deleteSign != null">
+        delete_sign,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -296,6 +302,9 @@
       <if test="taskReceiver != null">
         #{taskReceiver,jdbcType=VARCHAR},
       </if>
+      <if test="deleteSign != null">
+        #{deleteSign,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -305,7 +314,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     select count(*) from contract_task
     <if test="_parameter != null">
@@ -316,7 +325,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     update contract_task
     <set>
@@ -359,6 +368,9 @@
       <if test="record.taskReceiver != null">
         task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
       </if>
+      <if test="record.deleteSign != null">
+        delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -371,7 +383,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     update contract_task
     set id = #{record.id,jdbcType=VARCHAR},
@@ -387,6 +399,7 @@
       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},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -396,7 +409,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     update contract_task
     set id = #{record.id,jdbcType=VARCHAR},
@@ -411,7 +424,8 @@
       task_status = #{record.taskStatus,jdbcType=INTEGER},
       task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
-      task_receiver = #{record.taskReceiver,jdbcType=VARCHAR}
+      task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
+      delete_sign = #{record.deleteSign,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -420,7 +434,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     update contract_task
     <set>
@@ -460,6 +474,9 @@
       <if test="taskReceiver != null">
         task_receiver = #{taskReceiver,jdbcType=VARCHAR},
       </if>
+      <if test="deleteSign != null">
+        delete_sign = #{deleteSign,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -470,7 +487,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     update contract_task
     set contract_id = #{contractId,jdbcType=VARCHAR},
@@ -485,6 +502,7 @@
       task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{taskReceiver,jdbcType=VARCHAR},
+      delete_sign = #{deleteSign,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -492,7 +510,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Jan 26 16:01:38 CST 2018.
+      This element was generated on Wed Jan 31 16:35:57 CST 2018.
     -->
     update contract_task
     set contract_id = #{contractId,jdbcType=VARCHAR},
@@ -506,7 +524,8 @@
       task_status = #{taskStatus,jdbcType=INTEGER},
       task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{taskAllocator,jdbcType=VARCHAR},
-      task_receiver = #{taskReceiver,jdbcType=VARCHAR}
+      task_receiver = #{taskReceiver,jdbcType=VARCHAR},
+      delete_sign = #{deleteSign,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 15 - 0
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -677,4 +677,19 @@
 		c.salesman_id = d.id
 	where a.id = #{contractId,jdbcType=VARCHAR}
   </select>
+  
+  <select id="selectProjectTask" resultType="com.goafanti.techproject.bo.TaskListBo">
+	select
+		a.id,
+		a.commodity_name as commodityName,
+		a.commodity_quantity as commodityQuantity,
+		a.task_status as taskStatus,
+		a.delete_sign as deleteSign,
+		a.task_comment as taskComment,
+		b.name as technicianName
+	from
+		contract_task a left join admin on
+		a.task_receiver = b.id
+	where a.contract_id = #{contractId,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 346 - 461
src/main/java/com/goafanti/common/model/ContractTask.java

@@ -3,465 +3,350 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class ContractTask {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column contract_task.id
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    private String taskReceiver;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column contract_task.attachment_url
-     *
-     * @mbg.generated Fri Jan 26 16:01:38 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getContractId() {
-        return contractId;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setContractId(String contractId) {
-        this.contractId = contractId;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getCommodityId() {
-        return commodityId;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setCommodityId(String commodityId) {
-        this.commodityId = commodityId;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getCommodityName() {
-        return commodityName;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setCommodityName(String commodityName) {
-        this.commodityName = commodityName;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public Integer getCommodityQuantity() {
-        return commodityQuantity;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setCommodityQuantity(Integer commodityQuantity) {
-        this.commodityQuantity = commodityQuantity;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public Integer getCommodityType() {
-        return commodityType;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setCommodityType(Integer commodityType) {
-        this.commodityType = commodityType;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getCommodityMode() {
-        return commodityMode;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setCommodityMode(String commodityMode) {
-        this.commodityMode = commodityMode;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getTaskComment() {
-        return taskComment;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setTaskComment(String taskComment) {
-        this.taskComment = taskComment;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public Integer getTaskStatus() {
-        return taskStatus;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setTaskStatus(Integer taskStatus) {
-        this.taskStatus = taskStatus;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public Date getTaskDistributionTime() {
-        return taskDistributionTime;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setTaskDistributionTime(Date taskDistributionTime) {
-        this.taskDistributionTime = taskDistributionTime;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getTaskAllocator() {
-        return taskAllocator;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setTaskAllocator(String taskAllocator) {
-        this.taskAllocator = taskAllocator;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getTaskReceiver() {
-        return taskReceiver;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setTaskReceiver(String taskReceiver) {
-        this.taskReceiver = taskReceiver;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public String getAttachmentUrl() {
-        return attachmentUrl;
-    }
-
-    /**
-     * 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 Fri Jan 26 16:01:38 CST 2018
-     */
-    public void setAttachmentUrl(String attachmentUrl) {
-        this.attachmentUrl = attachmentUrl;
-    }
+
+	/**
+	 * 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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	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
+	 */
+	private Integer deleteSign;
+	/**
+	 * 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
+	 */
+	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
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getContractId() {
+		return contractId;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setContractId(String contractId) {
+		this.contractId = contractId;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getCommodityId() {
+		return commodityId;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCommodityId(String commodityId) {
+		this.commodityId = commodityId;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getCommodityName() {
+		return commodityName;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getCommodityQuantity() {
+		return commodityQuantity;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCommodityQuantity(Integer commodityQuantity) {
+		this.commodityQuantity = commodityQuantity;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getCommodityType() {
+		return commodityType;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCommodityType(Integer commodityType) {
+		this.commodityType = commodityType;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getCommodityMode() {
+		return commodityMode;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCommodityMode(String commodityMode) {
+		this.commodityMode = commodityMode;
+	}
+
+	/**
+	 * 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
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getTaskComment() {
+		return taskComment;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setTaskComment(String taskComment) {
+		this.taskComment = taskComment;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getTaskStatus() {
+		return taskStatus;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setTaskStatus(Integer taskStatus) {
+		this.taskStatus = taskStatus;
+	}
+
+	/**
+	 * 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
+	 */
+	public Date getTaskDistributionTime() {
+		return taskDistributionTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setTaskDistributionTime(Date taskDistributionTime) {
+		this.taskDistributionTime = taskDistributionTime;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getTaskAllocator() {
+		return taskAllocator;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setTaskAllocator(String taskAllocator) {
+		this.taskAllocator = taskAllocator;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getTaskReceiver() {
+		return taskReceiver;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setTaskReceiver(String taskReceiver) {
+		this.taskReceiver = taskReceiver;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getDeleteSign() {
+		return deleteSign;
+	}
+
+	/**
+	 * 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
+	 */
+	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.attachment_url
+	 * @return  the value of contract_task.attachment_url
+	 * @mbg.generated  Wed Jan 31 16:35:57 CST 2018
+	 */
+	public String getAttachmentUrl() {
+		return attachmentUrl;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setAttachmentUrl(String attachmentUrl) {
+		this.attachmentUrl = attachmentUrl;
+	}
 }

File diff suppressed because it is too large
+ 1162 - 1143
src/main/java/com/goafanti/common/model/ContractTaskExample.java


+ 5 - 1
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -24,6 +24,7 @@ import com.goafanti.common.dao.OrganizationManagementMapper;
 import com.goafanti.common.dao.TOrderBillMapper;
 import com.goafanti.common.dao.TOrderDetailMapper;
 import com.goafanti.common.dao.TOrderMapper;
+import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Contract;
@@ -61,6 +62,7 @@ import com.goafanti.order.enums.ProjectStage;
 import com.goafanti.order.enums.TransactionMode;
 import com.goafanti.order.enums.TransactionSubject;
 import com.goafanti.order.service.OrderService;
+import com.goafanti.techproject.enums.TaskState;
 
 @Service
 public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements OrderService {
@@ -1345,7 +1347,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		for(TOrderDetail orderDetail: detailList){
 			for(int i=0; i<orderDetail.getCommodityQuantity();i++){
 				task = new ContractTask();
-				task.setId(UUID.randomUUID().toString());
+				task.setId(UUID.randomUUID().toString().replace("-", ""));
 				task.setCommodityId(orderDetail.getCommodityId());
 				task.setCommodityMode(orderDetail.getCommodityMode());
 				task.setCommodityName(orderDetail.getCommodityName());
@@ -1353,6 +1355,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				task.setCommodityQuantity(1);
 				task.setCreateTime(createTime);
 				task.setContractId(contractId);
+				task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
+				task.setDeleteSign(DeleteStatus.LOCKING.getCode());
 				taskList.add(task);
 			}
 		}

+ 5 - 0
src/main/java/com/goafanti/techproject/bo/TaskDetailBo.java

@@ -0,0 +1,5 @@
+package com.goafanti.techproject.bo;
+
+public class TaskDetailBo extends TaskListBo {
+	private String projectNo;
+}

+ 11 - 1
src/main/java/com/goafanti/techproject/bo/TaskListBo.java

@@ -1,5 +1,15 @@
 package com.goafanti.techproject.bo;
 
-public class TaskListBo {
+import com.goafanti.common.model.ContractTask;
 
+public class TaskListBo extends ContractTask{
+	private String 	technicianName;
+
+	public String getTechnicianName() {
+		return technicianName;
+	}
+
+	public void setTechnicianName(String technicianName) {
+		this.technicianName = technicianName;
+	}
 }

+ 37 - 4
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -607,7 +607,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 项目管理
+	 * 项目列表
 	 * @param bo
 	 * @param depId
 	 * @param orderStartTime
@@ -624,7 +624,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 
+	 * 创建项目
 	 * @param orderNo
 	 * @param uid
 	 * @param aid
@@ -660,13 +660,46 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 
+	 * 查看项目任务
 	 * @param contractId
 	 * @return
 	 */
 	public Result getProjectTask(String contractId){
 		Result res = new Result();
-		
+		if(StringUtils.isBlank(contractId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "合同ID"));
+			return res;
+		}
+		res.setData(techProjectService.selectProjectTask(contractId));
+		return res;
+	}
+	
+	/**
+	 * 添加项目任务
+	 * @param commodityId
+	 * @param commodityQuantity
+	 * @param commodityMode
+	 * @param taskComment
+	 * @return
+	 */
+	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){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目编号和服务编号"));
+			return res;
+		}
+		techProjectService.addProjectTask(contractId,commodityId,commodityName,commodityQuantity,commodityMode,taskComment);
+		return res;
+	}
+	
+	/**
+	 * 查询任务详情
+	 * @param taskId
+	 * @return
+	 */
+	public Result getProjectTaskDetail(String taskId){
+		Result res = new Result();
+		res.setData(techProjectService.selectProjectTaskDetail(taskId));
 		return res;
 	}
 }

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

@@ -0,0 +1,48 @@
+package com.goafanti.techproject.enums;
+
+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;
+		this.desc = desc;
+	}
+
+	private static Map<Integer, TaskState> status = new HashMap<Integer, TaskState>();
+
+	static {
+		for (TaskState value : TaskState.values()) {
+			status.put(value.getCode(), value);
+		}
+	}
+	public static TaskState getStatus(Integer code) {
+		if (containsType(code)) {
+			return status.get(code);
+		}
+		return INVALID;
+	}
+	public static boolean containsType(Integer code) {
+		return status.containsKey(code);
+	}
+	private Integer	code;
+	private String	desc;
+	public Integer getCode() {
+		return code;
+	}
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+	public String getDesc() {
+		return desc;
+	}
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+	
+}

+ 20 - 0
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -9,6 +9,7 @@ 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.TaskListBo;
 import com.goafanti.techproject.bo.TechProjectClientListBo;
 import com.goafanti.techproject.bo.TechProjectContractListBo;
 import com.goafanti.techproject.bo.TechProjectDetailBo;
@@ -69,4 +70,23 @@ public interface TechProjectService {
 	 * @return
 	 */
 	ProjectDetailBo selectTechProjectDetail(String contractId);
+
+	/**
+	 * 项目管理任务列表
+	 * @param contractId
+	 * @return
+	 */
+	List<TaskListBo> selectProjectTask(String contractId);
+
+	/**
+	 * 添加项目任务
+	 * @param commodityId
+	 * @param commodityQuantity
+	 * @param commodityMode
+	 * @param taskComment
+	 * @return
+	 */
+	int addProjectTask(String contractId,String commodityId, String commodityName,Integer commodityQuantity, String commodityMode, String taskComment);
+
+	Object selectProjectTaskDetail(String taskId);
 }

+ 29 - 0
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -17,6 +17,7 @@ import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.ContractMapper;
+import com.goafanti.common.dao.ContractTaskMapper;
 import com.goafanti.common.dao.NoticeMapper;
 import com.goafanti.common.dao.TOrderMapper;
 import com.goafanti.common.dao.TechProjectLogMapper;
@@ -29,6 +30,7 @@ import com.goafanti.common.enums.TechProjectStatus;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.Contract;
+import com.goafanti.common.model.ContractTask;
 import com.goafanti.common.model.Notice;
 import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TechProject;
@@ -43,10 +45,12 @@ 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.TaskListBo;
 import com.goafanti.techproject.bo.TechProjectClientListBo;
 import com.goafanti.techproject.bo.TechProjectContractListBo;
 import com.goafanti.techproject.bo.TechProjectDetailBo;
 import com.goafanti.techproject.bo.TechProjectManageListBo;
+import com.goafanti.techproject.enums.TaskState;
 import com.goafanti.techproject.service.TechProjectService;
 import com.goafanti.user.bo.OrgUnitNames;
 
@@ -64,6 +68,8 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	private TOrderMapper 			tOrderMapper;
 	@Autowired
 	private ContractMapper 			contractMapper;
+	@Autowired
+	private ContractTaskMapper 		contractTaskMapper;
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TechProjectClientListBo> listClientTechProject(String uid, Integer pageNo, Integer pageSize) {
@@ -361,4 +367,27 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		return techProjectMapper.selectTechProjectDetail(contractId);
 	}
 
+	@Override
+	public List<TaskListBo> selectProjectTask(String contractId) {
+		
+		return techProjectMapper.selectProjectTask(contractId);
+	}
+
+	@Override
+	public int addProjectTask(String contractId,String commodityId,String commodityName, Integer commodityQuantity, 
+			String commodityMode, String taskComment) {
+		ContractTask task = new ContractTask();
+		task.setId(UUID.randomUUID().toString().replace("-", ""));
+		task.setCommodityId(commodityId);
+		task.setCommodityMode(StringUtils.isBlank(commodityMode)?"NO_MODE":commodityMode);
+		task.setCommodityName(commodityName);
+		task.setCommodityType(CommodityType.SERVICE.getTypeCode());
+		task.setCommodityQuantity(1);
+		task.setCreateTime(new Date());
+		task.setContractId(contractId);
+		task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
+		task.setDeleteSign(DeleteStatus.LOCKING.getCode());
+		return contractTaskMapper.insert(task);
+	}
+
 }