Browse Source

项目暂停列表开发

anderx 3 years ago
parent
commit
2c233271ab

+ 8 - 63
src/main/java/com/goafanti/common/dao/TaskLogMapper.java

@@ -8,72 +8,17 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TaskLogMapper {
+    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
-	 */
-	long countByExample(TaskLogExample example);
+    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 deleteByExample(TaskLogExample example);
+    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
-	 */
-	int deleteByPrimaryKey(Integer id);
+    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 insert(TaskLog record);
+    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 insertSelective(TaskLog record);
+    int updateByPrimaryKey(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  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  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  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  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  Tue Jun 04 10:17:22 CST 2019
-	 */
-	int updateByPrimaryKey(TaskLog record);
-
-	List<TaskLogBo> selectTaskLogList(Integer id);
-}
+    List<TaskLogBo> selectTaskLogList(Integer id);
+}

+ 24 - 211
src/main/java/com/goafanti/common/mapper/TaskLogMapper.xml

@@ -2,165 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.TaskLogMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskLog">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      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" />
+    <result column="sotp_id" jdbcType="INTEGER" property="sotpId" />
   </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 Tue Jun 04 10:17:22 CST 2019.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 04 10:17:22 CST 2019.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 04 10:17:22 CST 2019.
-    -->
-    id, content, create_time, task_id, aid
+    id, content, create_time, task_id, aid, sotp_id
   </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 Tue Jun 04 10:17:22 CST 2019.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from task_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 04 10:17:22 CST 2019.
-    -->
-    select 
+    select
     <include refid="Base_Column_List" />
     from task_log
     where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 04 10:17:22 CST 2019.
-    -->
     delete from task_log
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TaskLogExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 04 10:17:22 CST 2019.
-    -->
-    delete from task_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" 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 Tue Jun 04 10:17:22 CST 2019.
-    -->
-    insert into task_log (id, content, create_time, 
-      task_id, aid)
-    values (#{id,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{taskId,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR})
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskLog" useGeneratedKeys="true">
+    insert into task_log (content, create_time, task_id,
+      aid, sotp_id)
+    values (#{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{taskId,jdbcType=INTEGER},
+      #{aid,jdbcType=VARCHAR}, #{sotpId,jdbcType=INTEGER})
   </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 Tue Jun 04 10:17:22 CST 2019.
-    -->
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskLog" useGeneratedKeys="true">
     insert into task_log
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="content != null">
         content,
       </if>
@@ -173,11 +43,11 @@
       <if test="aid != null">
         aid,
       </if>
+      <if test="sotpId != null">
+        sotp_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="content != null">
         #{content,jdbcType=VARCHAR},
       </if>
@@ -190,69 +60,12 @@
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="sotpId != null">
+        #{sotpId,jdbcType=INTEGER},
+      </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 Tue Jun 04 10:17:22 CST 2019.
-    -->
-    select count(*) from task_log
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 04 10:17:22 CST 2019.
-    -->
-    update task_log
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.content != null">
-        content = #{record.content,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <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" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on 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},
-      aid = #{record.aid,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
   <update id="updateByPrimaryKeySelective" 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 Tue Jun 04 10:17:22 CST 2019.
-    -->
     update task_log
     <set>
       <if test="content != null">
@@ -267,24 +80,24 @@
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
+      <if test="sotpId != null">
+        sotp_id = #{sotpId,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" 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 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},
-      aid = #{aid,jdbcType=VARCHAR}
+      aid = #{aid,jdbcType=VARCHAR},
+      sotp_id = #{sotpId,jdbcType=INTEGER}
     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} order by a.create_time
+    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} order by a.create_time
   </select>
-</mapper>
+</mapper>

+ 17 - 6
src/main/java/com/goafanti/common/mapper/TaskSoptMapper.xml

@@ -9,9 +9,10 @@
     <result column="reason" jdbcType="VARCHAR" property="reason" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="annex_url" jdbcType="VARCHAR" property="annexUrl" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, tid, `type`, `status`, reason, create_by, create_time
+    id, tid, `type`, `status`, reason, create_by, create_time, annex_url
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select
@@ -25,11 +26,11 @@
   </delete>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskSopt" useGeneratedKeys="true">
     insert into task_sopt (tid, `type`, `status`,
-      reason, create_by, create_time
-      )
+      reason, create_by, create_time,
+      annex_url)
     values (#{tid,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
-      #{reason,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{reason,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+      #{annexUrl,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskSopt" useGeneratedKeys="true">
     insert into task_sopt
@@ -52,6 +53,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="annexUrl != null">
+        annex_url,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="tid != null">
@@ -72,6 +76,9 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="annexUrl != null">
+        #{annexUrl,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TaskSopt">
@@ -95,6 +102,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="annexUrl != null">
+        annex_url = #{annexUrl,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -105,7 +115,8 @@
       `status` = #{status,jdbcType=INTEGER},
       reason = #{reason,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      annex_url = #{annexUrl,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 

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

@@ -1,125 +1,91 @@
 package com.goafanti.common.model;
 
+import java.io.Serializable;
 import java.util.Date;
 
-public class TaskLog {
+/**
+ * task_log
+ * @author
+ */
+public class TaskLog implements Serializable {
+    private Integer id;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 任务ID
+     */
+    private Integer taskId;
+
+    /**
+     * 操作人
+     */
+    private String aid;
+
     /**
-	 * 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 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 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 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 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 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 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 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 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 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 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;
-	}
-
-	public void setTaskId(String taskId) {
+     * 发起暂停编号
+     */
+    private Integer sotpId;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(Integer taskId) {
+        this.taskId = taskId;
+    }
+
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    public Integer getSotpId() {
+        return sotpId;
+    }
+
+    public void setSotpId(Integer sotpId) {
+        this.sotpId = sotpId;
+    }
+
+    public void setTaskId(String taskId) {
         this.taskId = Integer.valueOf(taskId);
     }
-}
+}

+ 13 - 0
src/main/java/com/goafanti/common/model/TaskSopt.java

@@ -40,6 +40,11 @@ public class TaskSopt implements Serializable {
      */
     private Date createTime;
 
+    /**
+     * 附件地址
+     */
+    private String annexUrl;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -97,4 +102,12 @@ public class TaskSopt implements Serializable {
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public String getAnnexUrl() {
+        return annexUrl;
+    }
+
+    public void setAnnexUrl(String annexUrl) {
+        this.annexUrl = annexUrl;
+    }
 }

+ 0 - 15
src/main/java/com/goafanti/order/bo/OutselectProjectSotp.java

@@ -1,35 +1,20 @@
 package com.goafanti.order.bo;
 
-import com.goafanti.common.utils.Param;
-import com.goafanti.common.utils.excel.Excel;
 
 public class OutselectProjectSotp {
 
-    @Excel(name = "时间")
     private String createTimes;
-    @Excel(name = "派单身份")
     private String province;
-    @Excel(name = "合同编号")
     private String contractNo;
-    @Excel(name = "订单编号")
     private String orderNo;
-    @Excel(name = "签单客户")
     private String userName;
-    @Excel(name = "项目类型")
     private String cname;
-    @Excel(name = "项目名称")
     private String projectName;
-    @Excel(name = "数量")
     private Integer commodityQuantity;
-    @Excel(name = "服务类型")
     private String serviceType;
-    @Excel(name = "咨询师/咨询师经理")
     private String receiverName;
-    @Excel(name = "项目状态")
     private Integer status;
-    @Excel(name = "项目金额")
     private String commodityPrice;
-    @Excel(name = "原因")
     private String reason;
     private Integer sotpType;
     private Integer sotpStatus;

+ 195 - 0
src/main/java/com/goafanti/order/bo/OutselectProjectSotpBo.java

@@ -0,0 +1,195 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.utils.excel.Excel;
+
+public class OutselectProjectSotpBo extends  OutselectProjectSotp{
+
+    @Excel(name = "时间")
+    private String createTimes;
+    @Excel(name = "派单省份")
+    private String province;
+    @Excel(name = "合同编号")
+    private String contractNo;
+    @Excel(name = "订单编号")
+    private String orderNo;
+    @Excel(name = "签单客户")
+    private String userName;
+    @Excel(name = "项目类型")
+    private String cname;
+    @Excel(name = "项目名称")
+    private String projectName;
+    @Excel(name = "数量")
+    private Integer commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "咨询师/咨询师经理")
+    private String receiverName;
+    @Excel(name = "项目状态")
+    private String statusName;
+    private Integer status;
+    @Excel(name = "项目金额")
+    private String commodityPrice;
+    @Excel(name = "原因")
+    private String reason;
+    private Integer sotpType;
+    private Integer sotpStatus;
+
+
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
+
+    @Override
+    public String getCreateTimes() {
+        return createTimes;
+    }
+
+    @Override
+    public void setCreateTimes(String createTimes) {
+        this.createTimes = createTimes;
+    }
+
+    @Override
+    public String getProvince() {
+        return province;
+    }
+
+    @Override
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    @Override
+    public String getContractNo() {
+        return contractNo;
+    }
+
+    @Override
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+
+    @Override
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    @Override
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    @Override
+    public String getUserName() {
+        return userName;
+    }
+
+    @Override
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    @Override
+    public String getCname() {
+        return cname;
+    }
+
+    @Override
+    public void setCname(String cname) {
+        this.cname = cname;
+    }
+
+    @Override
+    public String getProjectName() {
+        return projectName;
+    }
+
+    @Override
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    @Override
+    public Integer getCommodityQuantity() {
+        return commodityQuantity;
+    }
+
+    @Override
+    public void setCommodityQuantity(Integer commodityQuantity) {
+        this.commodityQuantity = commodityQuantity;
+    }
+
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getReceiverName() {
+        return receiverName;
+    }
+
+    @Override
+    public void setReceiverName(String receiverName) {
+        this.receiverName = receiverName;
+    }
+
+    @Override
+    public Integer getStatus() {
+        return status;
+    }
+
+    @Override
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    @Override
+    public String getCommodityPrice() {
+        return commodityPrice;
+    }
+
+    @Override
+    public void setCommodityPrice(String commodityPrice) {
+        this.commodityPrice = commodityPrice;
+    }
+
+    @Override
+    public String getReason() {
+        return reason;
+    }
+
+    @Override
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    @Override
+    public Integer getSotpType() {
+        return sotpType;
+    }
+
+    @Override
+    public void setSotpType(Integer sotpType) {
+        this.sotpType = sotpType;
+    }
+
+    @Override
+    public Integer getSotpStatus() {
+        return sotpStatus;
+    }
+
+    @Override
+    public void setSotpStatus(Integer sotpStatus) {
+        this.sotpStatus = sotpStatus;
+    }
+}

+ 6 - 0
src/main/java/com/goafanti/order/bo/TaskSoptLogBo.java

@@ -0,0 +1,6 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TaskSoptLog;
+
+public class TaskSoptLogBo extends TaskSoptLog {
+}

+ 58 - 2
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -4,6 +4,8 @@ package com.goafanti.order.controller;
 import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
@@ -12,8 +14,10 @@ import javax.validation.Valid;
 
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.ParamUtils;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.service.OrderNewService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
@@ -645,8 +649,25 @@ public class OrderProjectApiController extends CertifyApiController {
 		}
 		return res.data(orderProjectService.addProjectSotp( in));
 	}
+
+
 	/**
-	 * 项目暂停
+	 * 项目暂停日志列表
+	 *
+	 */
+	@RequestMapping(value = "/projectSotpList" ,method = RequestMethod.POST)
+	public Result projectSotpList(Integer taskSoptId){
+		Result res = new Result();
+		return res.data(orderProjectService.projectSotpList( taskSoptId));
+	}
+
+
+
+
+
+
+	/**
+	 * 项目暂停列表
 	 *
 	 */
 	@RequestMapping(value = "/selectProjectSotp" ,method = RequestMethod.GET)
@@ -655,6 +676,41 @@ public class OrderProjectApiController extends CertifyApiController {
 		Result res = new Result();
 
 		return res.data(orderProjectService.selectProjectSotp(  orderNo, userName, depId, contractNo,
-				 projectName, status,startTime,endTime,receiverId, pageNo, pageSize));
+				projectName, status,startTime,endTime,receiverId, pageNo, pageSize));
+	}
+
+	/**
+	 * 项目暂停列表
+	 *
+	 */
+	@RequestMapping(value = "/selectProjectSotp/export" ,method = RequestMethod.GET)
+	public Result selectProjectSotpExport(String orderNo,String userName,String depId,String contractNo, String projectName,Integer status,
+									String startTime, String endTime, String receiverId, Integer pageNo,Integer pageSize){
+		Result res = new Result();
+		NewExcelUtil newExcelUtil=new NewExcelUtil(OutselectProjectSotpBo.class);
+		Pagination<?> p = orderProjectService.selectProjectSotp(orderNo, userName, depId, contractNo,
+				projectName, status, startTime, endTime, receiverId, pageNo, pageSize);
+		List<OutselectProjectSotp> list = (List<OutselectProjectSotp>) p.getList();
+		List<OutselectProjectSotpBo> list2=new ArrayList<>();
+			for (OutselectProjectSotp use : list) {
+				OutselectProjectSotpBo o = new OutselectProjectSotpBo();
+				BeanUtils.copyProperties(use,o);
+				StringBuffer str =new StringBuffer();
+				if (o.getSotpStatus()==0){
+					str=str.append("已发起");
+				}else if (o.getSotpStatus()==1){
+					str=str.append("已完成");
+				}else if (o.getSotpStatus()==2){
+					str=str.append("已拒绝");
+				}
+				if (o.getSotpType()==0){
+					str=str.append("暂停");
+				}else if (o.getSotpStatus()==1){
+					str=str.append("重启");
+				}
+				o.setStatusName(str.toString());
+				list2.add(o);
+			}
+		return res.data(newExcelUtil.exportExcel(list2,"暂停项目列表",uploadPath));
 	}
 }

+ 4 - 1
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -7,6 +7,7 @@ import com.goafanti.common.bo.UserOrderTask;
 import com.goafanti.common.model.MemberLog;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
+import com.goafanti.common.model.TaskSoptLog;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.InputProjectCheck;
@@ -137,6 +138,8 @@ public interface OrderProjectService {
 
 	Integer addProjectSotp(InputProjectSotp in);
 
-    Object selectProjectSotp(String orderNo, String userName, String depId, String contractNo, String projectName,
+	Pagination<?> selectProjectSotp(String orderNo, String userName, String depId, String contractNo, String projectName,
 							 Integer status,String startTime,String endTime,String receiverId, Integer pageNo, Integer pageSize);
+
+	List<TaskSoptLogBo> projectSotpList(Integer taskSoptId);
 }

+ 16 - 3
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -117,6 +117,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	private NewOrderChangeMapper newOrderChangeMapper;
 	@Autowired
 	private TaskSoptMapper taskSoptMapper;
+	@Autowired
+	private TaskSoptLogMapper taskSoptLogMapper;
+
 
 
 	@Value(value = "${upload.path}")
@@ -1455,7 +1458,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	public Integer addProjectSotp(InputProjectSotp in) {
 		String[] split = in.getIds().split(",");
-		List<TaskSopt> list =new ArrayList<>();
 		Date date = new Date();
 		String adminId = TokenManager.getAdminId();
 		for (String s : split) {
@@ -1469,11 +1471,17 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			taskSopt.setType(0);
 			taskSopt.setStatus(0);
 			taskSopt.setReason(in.getReason());
+			taskSopt.setAnnexUrl(in.getAnnexUrl());
 			taskSopt.setCreateBy(adminId);
 			taskSopt.setCreateTime(date);
-			list.add(taskSopt);
+			taskSoptMapper.insertSelective(taskSopt);
+			TaskSoptLog log = new TaskSoptLog();
+			log.setTaskSoptId(taskSopt.getId());
+			log.setReason(in.getReason());
+			log.setCreateBy(adminId);
+			log.setCreateTime(date);
+			taskSoptLogMapper.insertSelective(log);
 		}
-		taskSoptMapper.insertList(list);
 		asyncUtils.addProjectSotpNotic(in.getOrderNo(),0,in.getIds());
 		return 1;
 	}
@@ -1505,5 +1513,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		return findPage("selectProjectSotpList","selectProjectSotpCount",params,pageNo,pageSize);
 	}
 
+	@Override
+	public List<TaskSoptLogBo> projectSotpList(Integer taskSoptId) {
+		return null;
+	}
+
 
 }