Browse Source

修改列表参数

anderx 3 years ago
parent
commit
203d6ae235

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

@@ -7,10 +7,10 @@
     <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" />
+    <result column="stop_id" jdbcType="INTEGER" property="stopId" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, content, create_time, task_id, aid, sotp_id
+    id, content, create_time, task_id, aid, stop_id
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -24,9 +24,9 @@
   </delete>
   <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)
+      aid, stop_id)
     values (#{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{taskId,jdbcType=INTEGER},
-      #{aid,jdbcType=VARCHAR}, #{sotpId,jdbcType=INTEGER})
+      #{aid,jdbcType=VARCHAR}, #{stopId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskLog" useGeneratedKeys="true">
     insert into task_log
@@ -43,8 +43,8 @@
       <if test="aid != null">
         aid,
       </if>
-      <if test="sotpId != null">
-        sotp_id,
+      <if test="stopId != null">
+        stop_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -60,8 +60,8 @@
       <if test="aid != null">
         #{aid,jdbcType=VARCHAR},
       </if>
-      <if test="sotpId != null">
-        #{sotpId,jdbcType=INTEGER},
+      <if test="stopId != null">
+        #{stopId,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -80,8 +80,8 @@
       <if test="aid != null">
         aid = #{aid,jdbcType=VARCHAR},
       </if>
-      <if test="sotpId != null">
-        sotp_id = #{sotpId,jdbcType=INTEGER},
+      <if test="stopId != null">
+        stop_id = #{stopId,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -92,14 +92,14 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       task_id = #{taskId,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
-      sotp_id = #{sotpId,jdbcType=INTEGER}
+      stop_id = #{stopId,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,
-           a.sotp_id ,c.reason
-    from task_log a left join admin b on a.aid=b.id left join task_sopt c on a.sotp_id =c.id
+           a.stop_id ,c.reason
+    from task_log a left join admin b on a.aid=b.id left join task_stop c on a.stop_id =c.id
     where a.task_id= #{id,jdbcType=INTEGER} order by a.create_time
   </select>
 </mapper>

+ 7 - 11
src/main/java/com/goafanti/common/model/TaskLog.java

@@ -5,7 +5,7 @@ import java.util.Date;
 
 /**
  * task_log
- * @author
+ * @author 
  */
 public class TaskLog implements Serializable {
     private Integer id;
@@ -33,7 +33,7 @@ public class TaskLog implements Serializable {
     /**
      * 发起暂停编号
      */
-    private Long sotpId;
+    private Integer stopId;
 
     private static final long serialVersionUID = 1L;
 
@@ -77,15 +77,11 @@ public class TaskLog implements Serializable {
         this.aid = aid;
     }
 
-    public Long getSotpId() {
-        return sotpId;
+    public Integer getStopId() {
+        return stopId;
     }
 
-    public void setSotpId(Long sotpId) {
-        this.sotpId = sotpId;
+    public void setStopId(Integer stopId) {
+        this.stopId = stopId;
     }
-
-    public void setTaskId(String taskId) {
-        this.taskId = Integer.valueOf(taskId);
-    }
-}
+}