ソースを参照

新增任务流程

anderx 6 年 前
コミット
931c80f6b8

+ 1 - 1
GeneratorConfig.xml

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

+ 60 - 77
src/main/java/com/goafanti/common/dao/TaskLogMapper.java

@@ -2,95 +2,78 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TaskLog;
 import com.goafanti.common.model.TaskLogExample;
+import com.goafanti.order.bo.TaskLogBo;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TaskLogMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    long countByExample(TaskLogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    int deleteByExample(TaskLogExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	long countByExample(TaskLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int deleteByExample(TaskLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    int deleteByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int insert(TaskLog record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    int insert(TaskLog record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int insertSelective(TaskLog record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    int insertSelective(TaskLog record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	List<TaskLog> selectByExample(TaskLogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    List<TaskLog> selectByExample(TaskLogExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	TaskLog selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    TaskLog selectByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TaskLog record, @Param("example") TaskLogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    int updateByExampleSelective(@Param("record") TaskLog record, @Param("example") TaskLogExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int updateByExample(@Param("record") TaskLog record, @Param("example") TaskLogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    int updateByExample(@Param("record") TaskLog record, @Param("example") TaskLogExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TaskLog record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    int updateByPrimaryKeySelective(TaskLog record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int updateByPrimaryKey(TaskLog record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table task_log
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    int updateByPrimaryKey(TaskLog record);
+	List<TaskLogBo> selectTaskLogList(Integer id);
 }

+ 40 - 20
src/main/java/com/goafanti/common/mapper/TaskLogMapper.xml

@@ -5,18 +5,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="content" jdbcType="VARCHAR" property="content" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="task_id" jdbcType="INTEGER" property="taskId" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -50,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:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -84,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:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
-    id, content, create_time, task_id
+    id, content, create_time, task_id, aid
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TaskLogExample" 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:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     select
     <if test="distinct">
@@ -111,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:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -122,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:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     delete from task_log
     where id = #{id,jdbcType=INTEGER}
@@ -131,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:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     delete from task_log
     <if test="_parameter != null">
@@ -142,18 +143,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     insert into task_log (id, content, create_time, 
-      task_id)
+      task_id, aid)
     values (#{id,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{taskId,jdbcType=INTEGER})
+      #{taskId,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TaskLog">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     insert into task_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -169,6 +170,9 @@
       <if test="taskId != null">
         task_id,
       </if>
+      <if test="aid != null">
+        aid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -183,13 +187,16 @@
       <if test="taskId != null">
         #{taskId,jdbcType=INTEGER},
       </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TaskLogExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     select count(*) from task_log
     <if test="_parameter != null">
@@ -200,7 +207,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:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     update task_log
     <set>
@@ -216,6 +223,9 @@
       <if test="record.taskId != null">
         task_id = #{record.taskId,jdbcType=INTEGER},
       </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -225,13 +235,14 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     update task_log
     set id = #{record.id,jdbcType=INTEGER},
       content = #{record.content,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      task_id = #{record.taskId,jdbcType=INTEGER}
+      task_id = #{record.taskId,jdbcType=INTEGER},
+      aid = #{record.aid,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -240,7 +251,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:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     update task_log
     <set>
@@ -253,6 +264,9 @@
       <if test="taskId != null">
         task_id = #{taskId,jdbcType=INTEGER},
       </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -260,12 +274,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 11:03:37 CST 2019.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
     -->
     update task_log
     set content = #{content,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      task_id = #{taskId,jdbcType=INTEGER}
+      task_id = #{taskId,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </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}
+  </select>
 </mapper>

+ 106 - 118
src/main/java/com/goafanti/common/model/TaskLog.java

@@ -4,134 +4,122 @@ import java.util.Date;
 
 public class TaskLog {
     /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_log.id
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    private Integer id;
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.content
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private String content;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.create_time
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.task_id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private Integer taskId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.aid
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private String aid;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_log.content
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    private String content;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.id
+	 * @return  the value of task_log.id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_log.create_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    private Date createTime;
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.id
+	 * @param id  the value for task_log.id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column task_log.task_id
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    private Integer taskId;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.content
+	 * @return  the value of task_log.content
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public String getContent() {
+		return content;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_log.id
-     *
-     * @return the value of task_log.id
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.content
+	 * @param content  the value for task_log.content
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setContent(String content) {
+		this.content = content;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_log.id
-     *
-     * @param id the value for task_log.id
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 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_log.create_time
+	 * @return  the value of task_log.create_time
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_log.content
-     *
-     * @return the value of task_log.content
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    public String getContent() {
-        return content;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.create_time
+	 * @param createTime  the value for task_log.create_time
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_log.content
-     *
-     * @param content the value for task_log.content
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    public void setContent(String content) {
-        this.content = content;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.task_id
+	 * @return  the value of task_log.task_id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public Integer getTaskId() {
+		return taskId;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_log.create_time
-     *
-     * @return the value of task_log.create_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.task_id
+	 * @param taskId  the value for task_log.task_id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setTaskId(Integer taskId) {
+		this.taskId = taskId;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_log.create_time
-     *
-     * @param createTime the value for task_log.create_time
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.aid
+	 * @return  the value of task_log.aid
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public String getAid() {
+		return aid;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column task_log.task_id
-     *
-     * @return the value of task_log.task_id
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    public Integer getTaskId() {
-        return taskId;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.aid
+	 * @param aid  the value for task_log.aid
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column task_log.task_id
-     *
-     * @param taskId the value for task_log.task_id
-     *
-     * @mbg.generated Mon Jun 03 11:03:37 CST 2019
-     */
-    public void setTaskId(Integer taskId) {
-        this.taskId = taskId;
+	public void setTaskId(String taskId) {
+        this.taskId = Integer.valueOf(taskId);
     }
 }

File diff suppressed because it is too large
+ 562 - 533
src/main/java/com/goafanti/common/model/TaskLogExample.java


+ 25 - 0
src/main/java/com/goafanti/order/bo/TaskLogBo.java

@@ -0,0 +1,25 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TaskLog;
+
+public class TaskLogBo extends TaskLog{
+		private String aName;
+		
+		private String createTimes;
+
+		public String getaName() {
+			return aName;
+		}
+
+		public void setaName(String aName) {
+			this.aName = aName;
+		}
+
+		public String getCreateTimes() {
+			return createTimes;
+		}
+
+		public void setCreateTimes(String createTimes) {
+			this.createTimes = createTimes;
+		}
+}

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

@@ -123,6 +123,16 @@ public class OrderProjectApiController extends CertifyApiController {
 		res.setData(orderProjectService.taskHoursList(name,taskId,  starTime, endTime ,pageNo, pageSize));
 		return res;
 	}
+	
+	/**
+	 * 任务操作日志
+	 */
+	@RequestMapping(value="/TaskLogList" ,method = RequestMethod.GET)
+	public Result TaskLogList(Integer id){
+		Result res=new Result();
+		res.setData(orderProjectService.TaskLogList(id));
+		return res;
+	}
 	/** 任务文件上传 **/
 	@RequestMapping(value = "/uploadOrderTaskFile", method = RequestMethod.POST)
 	public Result uploadOrderTaskFile(HttpServletRequest req,String sign){

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

@@ -1,11 +1,15 @@
 package com.goafanti.order.service;
 
+import java.util.List;
+
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.goafanti.common.model.TTaskHours;
+import com.goafanti.common.model.TaskLog;
 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;
 
 public interface OrderProjectService {
 
@@ -27,5 +31,7 @@ public interface OrderProjectService {
 
 	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
 			Integer specially,String depId  , Integer pageNo, Integer pageSize);
+
+	List<TaskLogBo> TaskLogList(Integer id);
 	
 }

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

@@ -28,6 +28,7 @@ import com.goafanti.common.dao.TOrderNewMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TTaskHoursMapper;
 import com.goafanti.common.dao.TTaskLogMapper;
+import com.goafanti.common.dao.TaskLogMapper;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.TOrderBonus;
@@ -36,6 +37,7 @@ import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.model.TTaskLog;
+import com.goafanti.common.model.TaskLog;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -43,6 +45,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 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.enums.BonusSubject;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.ProjectNewStage;
@@ -64,6 +67,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private TOrderLogMapper	tOrderLogMapper;
 	@Autowired
 	private OrganizationContactBookMapper	organizationContactBookMapper;
+	@Autowired
+	private TaskLogMapper	taskLogMapper;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
 	
@@ -195,8 +200,35 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
-		tOrderTaskMapper.updateByPrimaryKeySelective(task);
 		TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(task.getId());//查询出项目信息
+		tOrderTaskMapper.updateByPrimaryKeySelective(task);
+		TaskLog tl=new TaskLog();
+		tl.setCreateTime(new Date());
+		tl.setTaskId(t.getId());
+		tl.setAid(TokenManager.getAdminId());
+		if (t.getStatus()!=task2.getStatus()) {
+			String s="将当前项目状态修改为";
+			if (t.getStatus()==0)s+="开启";
+			if (t.getStatus()==1)s+="暂停";
+			tl.setContent(s);
+			taskLogMapper.insertSelective(tl);
+		}
+		if (t.getTaskRefund()!=task2.getTaskRefund()) {
+			String s="将当前项目退单修改为";
+			if (t.getTaskRefund()==0)s+="未完成";
+			if (t.getTaskRefund()==1)s+="已完成";
+			if (t.getTaskRefund()==2)s+="其他";
+			tl.setContent(s);
+			taskLogMapper.insertSelective(tl);
+		}
+		if (t.getFormRetrieve()!=task2.getFormRetrieve()) {
+			String s="将当前满意度表格回收修改为";
+			if (t.getFormRetrieve()==0)s+="未回收";
+			if (t.getFormRetrieve()==1)s+="已回收";
+			if (t.getFormRetrieve()==2)s+="其他";
+			tl.setContent(s);
+			taskLogMapper.insertSelective(tl);
+		}
 		if (task2.getSuperId()!=null) {//是否有父项目
 			TOrderTask task3 =tOrderTaskMapper.selectBySuperId(task2.getSuperId());
 			task3.setId(Integer.valueOf(task2.getSuperId()));
@@ -324,6 +356,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskListByPage", "selectTaskListCount", params, pageNo, pageSize);
 		return p;
 	}
+	@Override
+	public List<TaskLogBo> TaskLogList(Integer id) {
+		return taskLogMapper.selectTaskLogList(id);
+	}
 	
 	
 }