Browse Source

修改列表参数

anderx 3 years ago
parent
commit
dca1d22ccd

+ 0 - 22
src/main/java/com/goafanti/common/dao/TaskSoptLogMapper.java

@@ -1,22 +0,0 @@
-package com.goafanti.common.dao;
-
-import com.goafanti.common.model.TaskSoptLog;
-import com.goafanti.order.bo.TaskSoptLogBo;
-
-import java.util.List;
-
-public interface TaskSoptLogMapper {
-    int deleteByPrimaryKey(Long id);
-
-    int insert(TaskSoptLog record);
-
-    int insertSelective(TaskSoptLog record);
-
-    TaskSoptLog selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(TaskSoptLog record);
-
-    int updateByPrimaryKey(TaskSoptLog record);
-
-    List<TaskSoptLogBo> selectListBySoptId(Integer taskSoptId);
-}

+ 1 - 3
src/main/java/com/goafanti/common/dao/TaskSoptMapper.java

@@ -1,10 +1,8 @@
 package com.goafanti.common.dao;
 
-import com.goafanti.common.model.TaskSopt;
-
 import java.util.List;
 
-public interface TaskSoptMapper {
+public interface TaskStopMapper {
     int deleteByPrimaryKey(Long id);
 
     int insert(TaskSopt record);

+ 0 - 106
src/main/java/com/goafanti/common/mapper/TaskSoptLogMapper.xml

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.TaskSoptLogMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskSoptLog">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="task_sopt_id" jdbcType="INTEGER" property="taskSoptId" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <result column="reason" jdbcType="VARCHAR" property="reason" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, task_sopt_id, `status`, reason, create_by, create_time
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from task_sopt_log
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from task_sopt_log
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskSoptLog" useGeneratedKeys="true">
-    insert into task_sopt_log (task_sopt_id, `status`, reason,
-      create_by, create_time)
-    values (#{taskSoptId,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{reason,jdbcType=VARCHAR},
-      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
-  </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TaskSoptLog" useGeneratedKeys="true">
-    insert into task_sopt_log
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="taskSoptId != null">
-        task_sopt_id,
-      </if>
-      <if test="status != null">
-        `status`,
-      </if>
-      <if test="reason != null">
-        reason,
-      </if>
-      <if test="createBy != null">
-        create_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="taskSoptId != null">
-        #{taskSoptId,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="reason != null">
-        #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
-        #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TaskSoptLog">
-    update task_sopt_log
-    <set>
-      <if test="taskSoptId != null">
-        task_sopt_id = #{taskSoptId,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="reason != null">
-        reason = #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
-        create_by = #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TaskSoptLog">
-    update task_sopt_log
-    set task_sopt_id = #{taskSoptId,jdbcType=INTEGER},
-      `status` = #{status,jdbcType=INTEGER},
-      reason = #{reason,jdbcType=VARCHAR},
-      create_by = #{createBy,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-
-  <select id="selectListBySoptId" resultType="com.goafanti.order.bo.TaskSoptLogBo">
-    select a.id ,a.task_sopt_id taskSoptId,a.status ,a.reason ,a.create_by createBy ,a.create_time createTime,
-           b.name createName,DATE_FORMAT(a.create_time,'%Y-%m-%d %H:%i:%S') createTimes
-    from task_sopt_log a left join admin b on a.create_by =b.id
-    where a.task_sopt_id = #{taskSoptId}
-  </select>
-</mapper>

+ 0 - 139
src/main/java/com/goafanti/common/mapper/TaskSoptMapper.xml

@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.goafanti.common.dao.TaskSoptMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskSopt">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="tid" jdbcType="INTEGER" property="tid" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-    <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, annex_url
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from task_sopt
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from task_sopt
-    where id = #{id,jdbcType=BIGINT}
-  </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,
-      annex_url)
-    values (#{tid,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
-      #{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
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="tid != null">
-        tid,
-      </if>
-      <if test="type != null">
-        `type`,
-      </if>
-      <if test="status != null">
-        `status`,
-      </if>
-      <if test="reason != null">
-        reason,
-      </if>
-      <if test="createBy != null">
-        create_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="annexUrl != null">
-        annex_url,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="tid != null">
-        #{tid,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="reason != null">
-        #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
-        #{createBy,jdbcType=VARCHAR},
-      </if>
-      <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">
-    update task_sopt
-    <set>
-      <if test="tid != null">
-        tid = #{tid,jdbcType=INTEGER},
-      </if>
-      <if test="type != null">
-        `type` = #{type,jdbcType=INTEGER},
-      </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="reason != null">
-        reason = #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
-        create_by = #{createBy,jdbcType=VARCHAR},
-      </if>
-      <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>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TaskSopt">
-    update task_sopt
-    set tid = #{tid,jdbcType=INTEGER},
-      `type` = #{type,jdbcType=INTEGER},
-      `status` = #{status,jdbcType=INTEGER},
-      reason = #{reason,jdbcType=VARCHAR},
-      create_by = #{createBy,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      annex_url = #{annexUrl,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-
-  <insert id="insertList">
-    insert into task_sopt (`type`, `status`,tid,reason,
-                           create_by, create_time)
-    values
-    <foreach item="item" collection="list" separator="," index="">
-      (#{item.type,jdbcType=INTEGER}, #{item.status,jdbcType=INTEGER},#{item.tid,jdbcType=INTEGER},#{item.reason,jdbcType=VARCHAR},
-          #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP})
-    </foreach>
-  </insert>
-
-  <select id="selectByTid"  resultMap="BaseResultMap">
-  select
-  <include refid="Base_Column_List" />
-  from task_sopt
-  where tid = #{tid} and status in (0,2)
-  </select>
-</mapper>

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

@@ -1,113 +0,0 @@
-package com.goafanti.common.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * task_sopt
- * @author 
- */
-public class TaskSopt implements Serializable {
-    private Long id;
-
-    /**
-     * 任务编号
-     */
-    private Integer tid;
-
-    /**
-     * 类型 0=项目暂停,1=项目重启
-     */
-    private Integer type;
-
-    /**
-     * 审核状态 0=发起,1=通过,2=拒绝
-     */
-    private Integer status;
-
-    /**
-     * 原因
-     */
-    private String reason;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 附件地址
-     */
-    private String annexUrl;
-
-    private static final long serialVersionUID = 1L;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Integer getTid() {
-        return tid;
-    }
-
-    public void setTid(Integer tid) {
-        this.tid = tid;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getAnnexUrl() {
-        return annexUrl;
-    }
-
-    public void setAnnexUrl(String annexUrl) {
-        this.annexUrl = annexUrl;
-    }
-}

+ 0 - 87
src/main/java/com/goafanti/common/model/TaskSoptLog.java

@@ -1,87 +0,0 @@
-package com.goafanti.common.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * task_sopt_log
- * @author
- */
-public class TaskSoptLog implements Serializable {
-    private Long id;
-
-    /**
-     * 任务暂停编号
-     */
-    private Long taskSoptId;
-
-    /**
-     * 审核状态 0=发起,1=通过,2=拒绝
-     */
-    private Integer status;
-
-    /**
-     * 原因
-     */
-    private String reason;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    private static final long serialVersionUID = 1L;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getTaskSoptId() {
-        return taskSoptId;
-    }
-
-    public void setTaskSoptId(Long taskSoptId) {
-        this.taskSoptId = taskSoptId;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getReason() {
-        return reason;
-    }
-
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-}

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

@@ -4,10 +4,8 @@ import java.util.List;
 
 import com.goafanti.common.bo.Result;
 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;