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

+ 1 - 1
GeneratorConfig.xml

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

+ 76 - 87
src/main/java/com/goafanti/common/dao/TaskProgressMapper.java

@@ -2,95 +2,84 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TaskProgress;
 import com.goafanti.common.model.TaskProgressExample;
+import com.goafanti.order.bo.TOrderTaskListBo;
+import com.goafanti.order.bo.TaskProgressBo;
+
+import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TaskProgressMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    long countByExample(TaskProgressExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    int deleteByExample(TaskProgressExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    int deleteByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    int insert(TaskProgress record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    int insertSelective(TaskProgress record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    List<TaskProgress> selectByExample(TaskProgressExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    TaskProgress selectByPrimaryKey(Integer id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    int updateByExampleSelective(@Param("record") TaskProgress record, @Param("example") TaskProgressExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    int updateByExample(@Param("record") TaskProgress record, @Param("example") TaskProgressExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    int updateByPrimaryKeySelective(TaskProgress record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_progress
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    int updateByPrimaryKey(TaskProgress record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	long countByExample(TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int deleteByExample(TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int insert(TaskProgress record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int insertSelective(TaskProgress record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	List<TaskProgress> selectByExample(TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	TaskProgress selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TaskProgress record, @Param("example") TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int updateByExample(@Param("record") TaskProgress record, @Param("example") TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TaskProgress record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int updateByPrimaryKey(TaskProgress record);
+
+	List<TaskProgressBo> selectTaskProgress(Integer tid);
+
+	int AlreadyNuberCount(Integer taskId);
+
+	List<TOrderTaskListBo> selectMyTaskList(String aid);
 }

+ 7 - 9
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -825,16 +825,13 @@
   
   
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-  	     select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
+  	    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
     a.project_status as projectStatus,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName
-  	from t_order_task a left join business_project b on a.commodity_id=b.id
-  	left join business_category c on b.cid=c.id
-    left join admin d on a.task_receiver=d.id
-    left join t_order_new e on a.order_no=e.order_no
-    left join user f on e.buyer_id=f.id
-    left join department h on e.order_dep=h.id
-    where e.delete_sign=0  and e.order_status not in (5,7)
+    a.commodity_quantity as commodityQuantity,ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName
+  	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
+  	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
+    left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
+    group by task_id) i on a.id=i.task_id where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>
@@ -1062,4 +1059,5 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     update t_order_task set task_allocator= #{aid,jdbcType=VARCHAR},task_receiver= #{transferId,jdbcType=VARCHAR}
 	where task_receiver=#{aid,jdbcType=VARCHAR}
   </update>
+  
 </mapper>

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

@@ -285,7 +285,6 @@
   </update>
   <select id="selectTaskLogList" resultType="com.goafanti.order.bo.TaskLogBo">
   select a.id,a.task_id taskId,a.content,date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTimes,b.name as aName  
-  from task_log a left join admin b on a.aid=b.id
-	where a.task_id= #{id,jdbcType=INTEGER}
+  from task_log a left join admin b on a.aid=b.id where a.task_id= #{id,jdbcType=INTEGER} order by a.create_time
   </select>
 </mapper>

+ 55 - 29
src/main/java/com/goafanti/common/mapper/TaskProgressMapper.xml

@@ -5,10 +5,10 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="Number" jdbcType="INTEGER" property="number" />
+    <result column="already_number" jdbcType="INTEGER" property="alreadyNumber" />
     <result column="licence_time" jdbcType="TIMESTAMP" property="licenceTime" />
     <result column="task_id" jdbcType="INTEGER" property="taskId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
@@ -17,7 +17,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -51,7 +51,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -85,15 +85,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
-    id, Number, licence_time, task_id, create_time
+    id, already_number, licence_time, task_id, create_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TaskProgressExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     select
     <if test="distinct">
@@ -112,7 +112,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -123,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     delete from task_progress
     where id = #{id,jdbcType=INTEGER}
@@ -132,7 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     delete from task_progress
     <if test="_parameter != null">
@@ -143,26 +143,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
-    insert into task_progress (id, Number, licence_time, 
+    insert into task_progress (id, already_number, licence_time, 
       task_id, create_time)
-    values (#{id,jdbcType=INTEGER}, #{number,jdbcType=INTEGER}, #{licenceTime,jdbcType=TIMESTAMP}, 
+    values (#{id,jdbcType=INTEGER}, #{alreadyNumber,jdbcType=INTEGER}, #{licenceTime,jdbcType=TIMESTAMP}, 
       #{taskId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TaskProgress">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     insert into task_progress
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
       </if>
-      <if test="number != null">
-        Number,
+      <if test="alreadyNumber != null">
+        already_number,
       </if>
       <if test="licenceTime != null">
         licence_time,
@@ -178,8 +178,8 @@
       <if test="id != null">
         #{id,jdbcType=INTEGER},
       </if>
-      <if test="number != null">
-        #{number,jdbcType=INTEGER},
+      <if test="alreadyNumber != null">
+        #{alreadyNumber,jdbcType=INTEGER},
       </if>
       <if test="licenceTime != null">
         #{licenceTime,jdbcType=TIMESTAMP},
@@ -196,7 +196,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     select count(*) from task_progress
     <if test="_parameter != null">
@@ -207,15 +207,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     update task_progress
     <set>
       <if test="record.id != null">
         id = #{record.id,jdbcType=INTEGER},
       </if>
-      <if test="record.number != null">
-        Number = #{record.number,jdbcType=INTEGER},
+      <if test="record.alreadyNumber != null">
+        already_number = #{record.alreadyNumber,jdbcType=INTEGER},
       </if>
       <if test="record.licenceTime != null">
         licence_time = #{record.licenceTime,jdbcType=TIMESTAMP},
@@ -235,11 +235,11 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     update task_progress
     set id = #{record.id,jdbcType=INTEGER},
-      Number = #{record.number,jdbcType=INTEGER},
+      already_number = #{record.alreadyNumber,jdbcType=INTEGER},
       licence_time = #{record.licenceTime,jdbcType=TIMESTAMP},
       task_id = #{record.taskId,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP}
@@ -251,12 +251,12 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     update task_progress
     <set>
-      <if test="number != null">
-        Number = #{number,jdbcType=INTEGER},
+      <if test="alreadyNumber != null">
+        already_number = #{alreadyNumber,jdbcType=INTEGER},
       </if>
       <if test="licenceTime != null">
         licence_time = #{licenceTime,jdbcType=TIMESTAMP},
@@ -274,13 +274,39 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:50 CST 2019.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
     -->
     update task_progress
-    set Number = #{number,jdbcType=INTEGER},
+    set already_number = #{alreadyNumber,jdbcType=INTEGER},
       licence_time = #{licenceTime,jdbcType=TIMESTAMP},
       task_id = #{taskId,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selectTaskProgress" resultType="com.goafanti.order.bo.TaskProgressBo">
+  select a.id,a.task_id as taskId,a.already_number as alreadyNumber,date_format(a.licence_time,'%Y-%m-%d')as licenceTimes,
+date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTimes ,(b.commodity_quantity-a.already_number) as notCount
+from task_progress a left join t_order_task b on a.task_id=b.id
+where a.task_id=  #{id,jdbcType=INTEGER}
+order by a.create_time
+  </select>
+  <select id="AlreadyNuberCount" resultType="java.lang.Integer">
+  	select ifnull(sum(already_number),0) from task_progress
+	where task_id=  #{id,jdbcType=INTEGER}
+  </select>
+  <select id="selectMyTaskList" resultType="com.goafanti.order.bo.TOrderTaskListBo">
+ 	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
+    a.project_status as projectStatus,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
+    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName
+    from t_task_log x left join  t_order_task a on x.task_id=a.id 
+  	left join business_project b on a.commodity_id=b.id
+  	left join business_category c on b.cid=c.id
+    left join admin d on a.task_receiver=d.id
+    left join t_order_new e on a.order_no=e.order_no
+    left join user f on e.buyer_id=f.id
+    left join department h on e.order_dep=h.id
+    where e.delete_sign=0 
+    and x.task_receiver= #{aid,jdbcType=VARCHAR}
+    order by a.task_distribution_time desc 
+  </select>
 </mapper>

+ 118 - 163
src/main/java/com/goafanti/common/model/TaskProgress.java

@@ -3,168 +3,123 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class TaskProgress {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_progress.id
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    private Integer id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_progress.Number
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    private Integer number;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_progress.licence_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    private Date licenceTime;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_progress.task_id
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    private Integer taskId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_progress.create_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    private Date createTime;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_progress.id
-     *
-     * @return the value of task_progress.id
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_progress.id
-     *
-     * @param id the value for task_progress.id
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_progress.Number
-     *
-     * @return the value of task_progress.Number
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public Integer getNumber() {
-        return number;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_progress.Number
-     *
-     * @param number the value for task_progress.Number
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_progress.licence_time
-     *
-     * @return the value of task_progress.licence_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public Date getLicenceTime() {
-        return licenceTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_progress.licence_time
-     *
-     * @param licenceTime the value for task_progress.licence_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public void setLicenceTime(Date licenceTime) {
-        this.licenceTime = licenceTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_progress.task_id
-     *
-     * @return the value of task_progress.task_id
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public Integer getTaskId() {
-        return taskId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_progress.task_id
-     *
-     * @param taskId the value for task_progress.task_id
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public void setTaskId(Integer taskId) {
-        this.taskId = taskId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_progress.create_time
-     *
-     * @return the value of task_progress.create_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_progress.create_time
-     *
-     * @param createTime the value for task_progress.create_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:50 CST 2019
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.already_number
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Integer alreadyNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.licence_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Date licenceTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.task_id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Integer taskId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.create_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Date createTime;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.id
+	 * @return  the value of task_progress.id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.id
+	 * @param id  the value for task_progress.id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.already_number
+	 * @return  the value of task_progress.already_number
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Integer getAlreadyNumber() {
+		if (alreadyNumber==null) {
+			return 0;
+		}
+		return alreadyNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.already_number
+	 * @param alreadyNumber  the value for task_progress.already_number
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setAlreadyNumber(Integer alreadyNumber) {
+		this.alreadyNumber = alreadyNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.licence_time
+	 * @return  the value of task_progress.licence_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Date getLicenceTime() {
+		return licenceTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.licence_time
+	 * @param licenceTime  the value for task_progress.licence_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setLicenceTime(Date licenceTime) {
+		this.licenceTime = licenceTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.task_id
+	 * @return  the value of task_progress.task_id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Integer getTaskId() {
+		return taskId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.task_id
+	 * @param taskId  the value for task_progress.task_id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setTaskId(Integer taskId) {
+		this.taskId = taskId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.create_time
+	 * @return  the value of task_progress.create_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.create_time
+	 * @param createTime  the value for task_progress.create_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 }

Разница между файлами не показана из-за своего большого размера
+ 542 - 583
src/main/java/com/goafanti/common/model/TaskProgressExample.java


+ 16 - 0
src/main/java/com/goafanti/common/utils/DateUtils.java

@@ -456,6 +456,22 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 		return c.getTime();
 	}
 	
+	/**
+	 * 字符串转日期
+	 * @param date
+	 * @param ymd
+	 * @return
+	 * @throws ParseException
+	 */
+	public static Date StringToDate(String date,String ymd) throws ParseException
+	{
+	SimpleDateFormat dateFormat=new SimpleDateFormat(ymd);
+	
+	Date parse = dateFormat.parse(date);
+	return parse;
+
+	}
+	
 
 
 }

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

@@ -483,6 +483,57 @@ public class ExportExcelUtil {
 			}
 		return wb;
 	}
+	
+	public static XSSFWorkbook exportSelectMyTaskList(List<TOrderTaskListBo> list, String[] comment, String filePath) {
+		//map 数据 comment表头 (列名称)
+ 		//1,创建一个workbook,对应的是一个excel文件
+		XSSFWorkbook wb = new XSSFWorkbook();
+		//2.创建一个sheet
+			XSSFSheet sheet = wb.createSheet();
+			//创建表头
+			XSSFCellStyle style1 = setCellStyle1(wb);
+			XSSFRow row = sheet.createRow(0);
+			for(int i = 0; i < comment.length; i++){
+				sheet.autoSizeColumn(i);  
+				sheet.autoSizeColumn(i, true);
+				sheet.setColumnWidth(i, 3000);//设置列宽
+				XSSFCell c = row.createCell(i);
+				c.setCellValue(comment[i]);
+				c.setCellStyle(style1);
+			}
+			for (TOrderTaskListBo ob : list) {
+				//新增一行
+				XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
+				for (int i = 0; i < comment.length; i++) {
+					//当前列的只
+					String o ;
+					switch (comment[i]) {
+					//"任务编号","任务名称","订单编号","业务别类","客户名称","任务状态","项目状态","分配时间","订单部门"
+					case "任务编号": o = ob.getId(); setWidth(sheet, i, o,1); break;
+					case "任务名称": o = ob.getTaskName(); setWidth(sheet, i, o,2);break;
+					case "订单编号": o = ob.getOrderNo();setWidth(sheet, i, o,1); break;
+					case "业务别类": o = ob.getCname();setWidth(sheet, i, o,2);break;
+					case "客户名称": o = ob.getUserName(); setWidth(sheet, i, o,2);break;
+					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); setWidth(sheet, i, o,2);break;
+					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); setWidth(sheet, i, o,1);break;
+					case "分配时间": o = ob.getTaskDate();setWidth(sheet, i, o,1); break;
+					case "订单部门": o = ob.getDepName();setWidth(sheet, i, o,2);break;
+					default: o = ""; break;
+					}
+					XSSFCell c = r.createCell(i);
+					c.setCellValue(o);
+				}
+			}
+		return wb;
+	}
+
+	private static void setWidth(XSSFSheet sheet, int i, String o,int x) {
+		if (StringUtils.isNotBlank(o)) {
+			sheet.setColumnWidth(i, o.getBytes().length*x*265);
+			
+		}
+		
+	}
 	/**
 	 * 年度导出数据模板
 	 * @return

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

@@ -16,6 +16,7 @@ public class TOrderTaskListBo {
 	private String contractNo;
 	private String creteTime;
 	private String signTime;
+	private Integer alreadyNumber;
 	public String getContractNo() {
 		return contractNo;
 	}
@@ -106,5 +107,11 @@ public class TOrderTaskListBo {
 	public void setDepName(String depName) {
 		this.depName = depName;
 	}
+	public Integer getAlreadyNumber() {
+		return alreadyNumber;
+	}
+	public void setAlreadyNumber(Integer alreadyNumber) {
+		this.alreadyNumber = alreadyNumber;
+	}
 	
 }

+ 39 - 0
src/main/java/com/goafanti/order/bo/TaskProgressBo.java

@@ -0,0 +1,39 @@
+package com.goafanti.order.bo;
+
+
+import com.goafanti.common.model.TaskProgress;
+
+public class TaskProgressBo extends TaskProgress {
+	
+	private String licenceTimes;
+	
+	private String createTimes;
+	
+	private Integer notCount;
+
+	public String getLicenceTimes() {
+		return licenceTimes;
+	}
+
+	public void setLicenceTimes(String licenceTimes) {
+		this.licenceTimes = licenceTimes;
+	}
+
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+
+	public Integer getNotCount() {
+		return notCount;
+	}
+
+	public void setNotCount(Integer notCount) {
+		this.notCount = notCount;
+	}
+	
+	
+}

+ 68 - 0
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -20,8 +20,10 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TTaskHours;
+import com.goafanti.common.model.TaskProgress;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
+import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.service.OrderProjectService;
 
 @RestController
@@ -141,6 +143,43 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	/**
+	 * 	新增项目申报进度
+	 */
+	@RequestMapping(value="/createTaskProgress" ,method = RequestMethod.POST)
+	public Result createTaskProgress(TaskProgressBo t){
+		Result res=new Result();
+		if (StringUtils.isBlank(t.getLicenceTimes())|| null==t.getTaskId()|| null==t.getAlreadyNumber()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.createTaskProgress(t));
+		return res;
+	}
+	
+	/**
+	 * 	删除项目申报进度
+	 */
+	@RequestMapping(value="/delectTaskProgress" ,method = RequestMethod.POST)
+	public Result delectTaskProgress(Integer id){
+		Result res=new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.delectTaskProgress(id));
+		return res;
+	}
+	/**
+	 * 	查看项目申报进度
+	 */
+	@RequestMapping(value="/selectTaskProgress" ,method = RequestMethod.GET)
+	public Result selectTaskProgress(Integer tid){
+		Result res=new Result();
+		if (null==tid) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.selectTaskProgress(tid));
+		return res;
+	}
+	/**
 	 * 任务工时表
 	 * @throws IOException 
 	 */
@@ -168,4 +207,33 @@ public class OrderProjectApiController extends CertifyApiController {
 		
 		return res;
 	}
+	
+	/**
+	 * 我的任务列表导出xls
+	 * @throws IOException 
+	 */
+	@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
+	public Result exportMyTaskList(HttpServletResponse response) throws IOException{
+		 Result res = new Result();
+		 XSSFWorkbook wb = orderProjectService.exportMyTaskList();//个人列表
+		 if(null == wb){
+			 res.getError().add(buildError("", "没有找到数据"));
+			 return res;
+		 }
+		 String fileName = "我的任务列表  " + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + ".xls";
+		 OutputStream out = response.getOutputStream();
+		 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
+         response.setContentType("application/octet-stream;charset=utf-8");  
+		try {
+			// 返回数据流
+			wb.write(out);
+			out.flush();
+			out.close();
+		} finally {
+			out.flush();
+			out.close();
+		}
+		
+		return res;
+	}
 }

+ 6 - 0
src/main/java/com/goafanti/order/enums/ProjectNewStage.java

@@ -29,6 +29,12 @@ public enum ProjectNewStage {
 	YS(8,"项目验收"),
 	/** 项目拨款 **/
 	BK(9,"项目拨款"),
+
+	JD10(10,"项目进度10%"),
+	
+	JD30(11,"项目进度30%"),
+	
+	JD70(12,"项目进度70%"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
 	

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

@@ -6,10 +6,12 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.model.TaskLog;
+import com.goafanti.common.model.TaskProgress;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
 import com.goafanti.order.bo.TaskLogBo;
+import com.goafanti.order.bo.TaskProgressBo;
 
 public interface OrderProjectService {
 
@@ -33,5 +35,13 @@ public interface OrderProjectService {
 			Integer specially,String depId  , Integer pageNo, Integer pageSize);
 
 	List<TaskLogBo> TaskLogList(Integer id);
+
+	int createTaskProgress(TaskProgressBo t);
+
+	int delectTaskProgress(Integer id);
+
+	List<TaskProgressBo> selectTaskProgress(Integer tid);
+
+	XSSFWorkbook exportMyTaskList();
 	
 }

+ 53 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -14,13 +14,18 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.converters.DateConverter;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
 import com.goafanti.common.dao.TOrderLogMapper;
@@ -29,7 +34,9 @@ import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TTaskHoursMapper;
 import com.goafanti.common.dao.TTaskLogMapper;
 import com.goafanti.common.dao.TaskLogMapper;
+import com.goafanti.common.dao.TaskProgressMapper;
 import com.goafanti.common.enums.OrderLogProcess;
+import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.TOrderBonus;
 import com.goafanti.common.model.TOrderLog;
@@ -38,6 +45,8 @@ import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.model.TTaskLog;
 import com.goafanti.common.model.TaskLog;
+import com.goafanti.common.model.TaskProgress;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -46,6 +55,7 @@ import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
 import com.goafanti.order.bo.TaskLogBo;
+import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.ProjectNewStage;
@@ -66,6 +76,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Autowired
 	private TOrderLogMapper	tOrderLogMapper;
 	@Autowired
+	private TaskProgressMapper	taskProgressMapper;
+	@Autowired
 	private OrganizationContactBookMapper	organizationContactBookMapper;
 	@Autowired
 	private TaskLogMapper	taskLogMapper;
@@ -338,6 +350,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		XSSFWorkbook wb = ExportExcelUtil.exportTaskHoursListData(list, comment, filePath);
 		return wb;
 	}
+	
+
+
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -346,7 +361,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		params.put("aid", TokenManager.getAdminId()==null?"e82a4405-2104-481d-ba5f-72a639589efd":TokenManager.getAdminId());
+		params.put("aid", TokenManager.getAdminId()==null?"":TokenManager.getAdminId());
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
@@ -360,6 +375,43 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public List<TaskLogBo> TaskLogList(Integer id) {
 		return taskLogMapper.selectTaskLogList(id);
 	}
+	@Override
+	public int createTaskProgress(TaskProgressBo t) {
+		TaskProgress tp=new TaskProgress();
+		TOrderTask tt=tOrderTaskMapper.selectByPrimaryKey(t.getTaskId());
+		int count =taskProgressMapper.AlreadyNuberCount(t.getTaskId());
+		count +=t.getAlreadyNumber();
+		if(tt.getCommodityQuantity()<count)throw new BusinessException(new Error( "数量不能大于总量!" ,"数量不能大于总量!"));
+		tp.setAlreadyNumber(t.getAlreadyNumber());
+		try {
+			tp.setLicenceTime(DateUtils.StringToDate(t.getLicenceTimes(), AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
+			 throw new BusinessException(new Error( "日期错误" ,"日期错误"));
+		}
+		tp.setTaskId(t.getTaskId());
+		return taskProgressMapper.insertSelective(tp);
+	}
+	@Override
+	public int delectTaskProgress(Integer id) {
+		return taskProgressMapper.deleteByPrimaryKey(id);
+	}
+	@Override
+	public List<TaskProgressBo> selectTaskProgress(Integer tid) {
+		
+		return taskProgressMapper.selectTaskProgress(tid);
+	}
+	@Override
+	public XSSFWorkbook exportMyTaskList() {
+		//List<TOrderTaskListBo> list=taskProgressMapper.selectMyTaskList(TokenManager.getAdminId());
+		List<TOrderTaskListBo> list=taskProgressMapper.selectMyTaskList("a47f2728-215a-4e7a-ac88-6ec45c8fe962");
+		if (list==null && list.size()==0) {
+			return null;
+		}
+		String[] comment = {"任务编号","任务名称","订单编号","业务别类","客户名称","任务状态","项目状态","分配时间","订单部门"};
+		String filePath = uploadPath + "/MyTaskList";
+		XSSFWorkbook wb = ExportExcelUtil.exportSelectMyTaskList(list, comment, filePath);
+		return wb;
+	}
 	
 	
 }

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.05
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.06
+avatar.host=//sb.jishutao.com
 
 #连生产
-avatar.host=//static.kedexinxi.com
-static.host=//s.kedexinxi.com/1.1.05
+#avatar.host=//static.kedexinxi.com
+#static.host=//s.kedexinxi.com/1.1.06
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload