Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

4 years ago · 4c870aaa39
12 changed files with 2912 additions and 34 deletions
--- a/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/dto/TaskDto.java
@ -44,6 +44,8 @@ public class TaskDto {
        private List<Long> pluginList;
        @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急  默认0")
        private Byte priority;
+        @ApiModelProperty("标签")
+        private String milestone;
        @ApiModelProperty("任务提醒消息")
        private TaskRemindByAdd taskRemind;
    }
@ -209,8 +211,8 @@ public class TaskDto {
        private Long delayTime;
        @ApiModelProperty("优先级 3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急  默认0")
        private Byte priority;
-        @ApiModelProperty("是否是里程碑 0否 1是 2普通任务 3关键任务")
-        private Byte milestone;
+        @ApiModelProperty("标签")
+        private String milestone;
        @ApiModelProperty("交付物id和修改后的名字")
        private List<UpdateTaskDeliverName> deliverList;
        @ApiModelProperty("输入文档的id和修改后的名字")
--- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetail.java
@ -58,7 +58,7 @@ public class ProTaskDetail implements Serializable {

    private Byte priority;

-    private Byte milestone;
+    private String milestone;

    private static final long serialVersionUID = 1L;

@ -278,12 +278,12 @@ public class ProTaskDetail implements Serializable {
        this.priority = priority;
    }

-    public Byte getMilestone() {
+    public String getMilestone() {
        return milestone;
    }

-    public void setMilestone(Byte milestone) {
-        this.milestone = milestone;
+    public void setMilestone(String milestone) {
+        this.milestone = milestone == null ? null : milestone.trim();
    }

    @Override
--- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDetailExample.java
@ -1785,52 +1785,62 @@ public class ProTaskDetailExample {
            return (Criteria) this;
        }

-        public Criteria andMilestoneEqualTo(Byte value) {
+        public Criteria andMilestoneEqualTo(String value) {
            addCriterion("milestone =", value, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneNotEqualTo(Byte value) {
+        public Criteria andMilestoneNotEqualTo(String value) {
            addCriterion("milestone <>", value, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneGreaterThan(Byte value) {
+        public Criteria andMilestoneGreaterThan(String value) {
            addCriterion("milestone >", value, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneGreaterThanOrEqualTo(Byte value) {
+        public Criteria andMilestoneGreaterThanOrEqualTo(String value) {
            addCriterion("milestone >=", value, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneLessThan(Byte value) {
+        public Criteria andMilestoneLessThan(String value) {
            addCriterion("milestone <", value, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneLessThanOrEqualTo(Byte value) {
+        public Criteria andMilestoneLessThanOrEqualTo(String value) {
            addCriterion("milestone <=", value, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneIn(List<Byte> values) {
+        public Criteria andMilestoneLike(String value) {
+            addCriterion("milestone like", value, "milestone");
+            return (Criteria) this;
+        }
+
+        public Criteria andMilestoneNotLike(String value) {
+            addCriterion("milestone not like", value, "milestone");
+            return (Criteria) this;
+        }
+
+        public Criteria andMilestoneIn(List<String> values) {
            addCriterion("milestone in", values, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneNotIn(List<Byte> values) {
+        public Criteria andMilestoneNotIn(List<String> values) {
            addCriterion("milestone not in", values, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneBetween(Byte value1, Byte value2) {
+        public Criteria andMilestoneBetween(String value1, String value2) {
            addCriterion("milestone between", value1, value2, "milestone");
            return (Criteria) this;
        }

-        public Criteria andMilestoneNotBetween(Byte value1, Byte value2) {
+        public Criteria andMilestoneNotBetween(String value1, String value2) {
            addCriterion("milestone not between", value1, value2, "milestone");
            return (Criteria) this;
        }
--- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketail.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketail.java
@ -0,0 +1,326 @@
+package com.ccsens.tall.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class ProTasketail implements Serializable {
+    private Long id;
+
+    private Long projectId;
+
+    private String name;
+
+    private String description;
+
+    private Long beginTime;
+
+    private Long endTime;
+
+    private String cycle;
+
+    private Long parentId;
+
+    private String subTask;
+
+    private Long subProjectId;
+
+    private String subProject;
+
+    private Long executorRole;
+
+    private Long checkerRole;
+
+    private Long money;
+
+    private Byte delay;
+
+    private Long delayTime;
+
+    private Long loopTo;
+
+    private Integer loopTimes;
+
+    private Byte virtual;
+
+    private Byte level;
+
+    private Byte hasGroup;
+
+    private Byte finishNeedAll;
+
+    private Byte allMember;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private Byte recStatus;
+
+    private Byte priority;
+
+    private String milestone;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public Long getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Long beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public Long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getCycle() {
+        return cycle;
+    }
+
+    public void setCycle(String cycle) {
+        this.cycle = cycle == null ? null : cycle.trim();
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getSubTask() {
+        return subTask;
+    }
+
+    public void setSubTask(String subTask) {
+        this.subTask = subTask == null ? null : subTask.trim();
+    }
+
+    public Long getSubProjectId() {
+        return subProjectId;
+    }
+
+    public void setSubProjectId(Long subProjectId) {
+        this.subProjectId = subProjectId;
+    }
+
+    public String getSubProject() {
+        return subProject;
+    }
+
+    public void setSubProject(String subProject) {
+        this.subProject = subProject == null ? null : subProject.trim();
+    }
+
+    public Long getExecutorRole() {
+        return executorRole;
+    }
+
+    public void setExecutorRole(Long executorRole) {
+        this.executorRole = executorRole;
+    }
+
+    public Long getCheckerRole() {
+        return checkerRole;
+    }
+
+    public void setCheckerRole(Long checkerRole) {
+        this.checkerRole = checkerRole;
+    }
+
+    public Long getMoney() {
+        return money;
+    }
+
+    public void setMoney(Long money) {
+        this.money = money;
+    }
+
+    public Byte getDelay() {
+        return delay;
+    }
+
+    public void setDelay(Byte delay) {
+        this.delay = delay;
+    }
+
+    public Long getDelayTime() {
+        return delayTime;
+    }
+
+    public void setDelayTime(Long delayTime) {
+        this.delayTime = delayTime;
+    }
+
+    public Long getLoopTo() {
+        return loopTo;
+    }
+
+    public void setLoopTo(Long loopTo) {
+        this.loopTo = loopTo;
+    }
+
+    public Integer getLoopTimes() {
+        return loopTimes;
+    }
+
+    public void setLoopTimes(Integer loopTimes) {
+        this.loopTimes = loopTimes;
+    }
+
+    public Byte getVirtual() {
+        return virtual;
+    }
+
+    public void setVirtual(Byte virtual) {
+        this.virtual = virtual;
+    }
+
+    public Byte getLevel() {
+        return level;
+    }
+
+    public void setLevel(Byte level) {
+        this.level = level;
+    }
+
+    public Byte getHasGroup() {
+        return hasGroup;
+    }
+
+    public void setHasGroup(Byte hasGroup) {
+        this.hasGroup = hasGroup;
+    }
+
+    public Byte getFinishNeedAll() {
+        return finishNeedAll;
+    }
+
+    public void setFinishNeedAll(Byte finishNeedAll) {
+        this.finishNeedAll = finishNeedAll;
+    }
+
+    public Byte getAllMember() {
+        return allMember;
+    }
+
+    public void setAllMember(Byte allMember) {
+        this.allMember = allMember;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Date updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Byte getRecStatus() {
+        return recStatus;
+    }
+
+    public void setRecStatus(Byte recStatus) {
+        this.recStatus = recStatus;
+    }
+
+    public Byte getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Byte priority) {
+        this.priority = priority;
+    }
+
+    public String getMilestone() {
+        return milestone;
+    }
+
+    public void setMilestone(String milestone) {
+        this.milestone = milestone == null ? null : milestone.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", projectId=").append(projectId);
+        sb.append(", name=").append(name);
+        sb.append(", description=").append(description);
+        sb.append(", beginTime=").append(beginTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", cycle=").append(cycle);
+        sb.append(", parentId=").append(parentId);
+        sb.append(", subTask=").append(subTask);
+        sb.append(", subProjectId=").append(subProjectId);
+        sb.append(", subProject=").append(subProject);
+        sb.append(", executorRole=").append(executorRole);
+        sb.append(", checkerRole=").append(checkerRole);
+        sb.append(", money=").append(money);
+        sb.append(", delay=").append(delay);
+        sb.append(", delayTime=").append(delayTime);
+        sb.append(", loopTo=").append(loopTo);
+        sb.append(", loopTimes=").append(loopTimes);
+        sb.append(", virtual=").append(virtual);
+        sb.append(", level=").append(level);
+        sb.append(", hasGroup=").append(hasGroup);
+        sb.append(", finishNeedAll=").append(finishNeedAll);
+        sb.append(", allMember=").append(allMember);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append(", priority=").append(priority);
+        sb.append(", milestone=").append(milestone);
+        sb.append("]");
+        return sb.toString();
+    }
+}
--- a/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketailExample.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/po/ProTasketailExample.java
--- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
+++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java
@ -156,7 +156,7 @@ public class TaskVo {
        @ApiModelProperty("优先级 默认0  3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急")
        private Byte priority;
        @ApiModelProperty("是否是里程碑 0否 1里程碑 2普通任务 3关键任务")
-        private Byte milestone;
+        private String milestone;
        @ApiModelProperty("提醒的信息")
        private List<RemindInfo> remindInfoList;
        public Long getDuration(){
@ -500,7 +500,7 @@ public class TaskVo {
        @ApiModelProperty("优先级 默认0  3,紧急重要 2,紧急不重要 1,重要不紧急 0,不重要不紧急")
        private Byte priority;
        @ApiModelProperty("是否是里程碑 0否 1是")
-        private Byte milestone;
+        private String milestone;
        @ApiModelProperty("二级任务")
        private List<TaskListByProjectId> secondTasks;
    }
--- a/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTasketailMapper.java
+++ b/tall/src/main/java/com/ccsens/tall/persist/mapper/ProTasketailMapper.java
@ -0,0 +1,30 @@
+package com.ccsens.tall.persist.mapper;
+
+import com.ccsens.tall.bean.po.ProTasketail;
+import com.ccsens.tall.bean.po.ProTasketailExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ProTasketailMapper {
+    long countByExample(ProTasketailExample example);
+
+    int deleteByExample(ProTasketailExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ProTasketail record);
+
+    int insertSelective(ProTasketail record);
+
+    List<ProTasketail> selectByExample(ProTasketailExample example);
+
+    ProTasketail selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") ProTasketail record, @Param("example") ProTasketailExample example);
+
+    int updateByExample(@Param("record") ProTasketail record, @Param("example") ProTasketailExample example);
+
+    int updateByPrimaryKeySelective(ProTasketail record);
+
+    int updateByPrimaryKey(ProTasketail record);
+}
--- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java
@ -851,15 +851,7 @@ public class ExcelService implements IExcelService {
                taskDetail.setLevel((byte) WebConstant.TASK_LEVEL.SecondTask.value);
                taskDetail.setHasGroup((byte) 0);
                taskDetail.setAllMember((byte) 1);
-
-                if("关键任务".equals(label)){
-                    taskDetail.setMilestone((byte) 3);
-                }else if("里程碑".equals(label)){
-                    taskDetail.setMilestone((byte) 1);
-                }else {
-                    //设置成默认的普通任务
-                    taskDetail.setMilestone((byte) 2);
-                }
+                taskDetail.setMilestone(label);
                //子项目
                if (StrUtil.isNotEmpty(subProject)) {
                    subProject = StringUtil.replaceComma(subProject);
--- a/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskSubTimeService.java
@ -362,6 +362,7 @@ public class TaskSubTimeService implements ITaskSubTimeService {
        detail.setCycle(addTask.getCycle());
        detail.setParentId(addTask.getParentTaskId());
        detail.setExecutorRole(addTask.getExecutorId());
+        detail.setMilestone(addTask.getMilestone());
        //添加任务优先级
        if(ObjectUtil.isNotNull(addTask.getPriority())){
            detail.setPriority(addTask.getPriority());
--- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
+++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml
@ -529,6 +529,7 @@
            t.cycle as cycle,
            t.money as money,
            t.project_id as projectId,
+            t.milestone,
            (SELECT `name` FROM t_sys_project WHERE id = t.project_id) as projectName,
            t.executor_role as executorRole,
            (SELECT `name` FROM t_pro_role WHERE id = t.executor_role) as executorRoleName,
--- a/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml
+++ b/tall/src/main/resources/mapper_raw/ProTaskDetailMapper.xml
@ -29,7 +29,7 @@
    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
    <result column="priority" jdbcType="TINYINT" property="priority" />
-    <result column="milestone" jdbcType="TINYINT" property="milestone" />
+    <result column="milestone" jdbcType="VARCHAR" property="milestone" />
  </resultMap>
  <sql id="Example_Where_Clause">
    <where>
@ -145,7 +145,7 @@
      #{virtual,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, #{hasGroup,jdbcType=TINYINT}, 
      #{finishNeedAll,jdbcType=TINYINT}, #{allMember,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, 
      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{priority,jdbcType=TINYINT}, 
-      #{milestone,jdbcType=TINYINT})
+      #{milestone,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProTaskDetail">
    insert into t_pro_task_detail
@ -318,7 +318,7 @@
        #{priority,jdbcType=TINYINT},
      </if>
      <if test="milestone != null">
-        #{milestone,jdbcType=TINYINT},
+        #{milestone,jdbcType=VARCHAR},
      </if>
    </trim>
  </insert>
@ -413,7 +413,7 @@
        priority = #{record.priority,jdbcType=TINYINT},
      </if>
      <if test="record.milestone != null">
-        milestone = #{record.milestone,jdbcType=TINYINT},
+        milestone = #{record.milestone,jdbcType=VARCHAR},
      </if>
    </set>
    <if test="_parameter != null">
@ -449,7 +449,7 @@
      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
      rec_status = #{record.recStatus,jdbcType=TINYINT},
      priority = #{record.priority,jdbcType=TINYINT},
-      milestone = #{record.milestone,jdbcType=TINYINT}
+      milestone = #{record.milestone,jdbcType=VARCHAR}
    <if test="_parameter != null">
      <include refid="Update_By_Example_Where_Clause" />
    </if>
@ -536,7 +536,7 @@
        priority = #{priority,jdbcType=TINYINT},
      </if>
      <if test="milestone != null">
-        milestone = #{milestone,jdbcType=TINYINT},
+        milestone = #{milestone,jdbcType=VARCHAR},
      </if>
    </set>
    where id = #{id,jdbcType=BIGINT}
@ -569,7 +569,7 @@
      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
      rec_status = #{recStatus,jdbcType=TINYINT},
      priority = #{priority,jdbcType=TINYINT},
-      milestone = #{milestone,jdbcType=TINYINT}
+      milestone = #{milestone,jdbcType=VARCHAR}
    where id = #{id,jdbcType=BIGINT}
  </update>
 </mapper>
--- a/tall/src/main/resources/mapper_raw/ProTasketailMapper.xml
+++ b/tall/src/main/resources/mapper_raw/ProTasketailMapper.xml
@ -0,0 +1,575 @@
+<?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.ccsens.tall.persist.mapper.ProTasketailMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProTasketail">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="project_id" jdbcType="BIGINT" property="projectId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="begin_time" jdbcType="BIGINT" property="beginTime" />
+    <result column="end_time" jdbcType="BIGINT" property="endTime" />
+    <result column="cycle" jdbcType="VARCHAR" property="cycle" />
+    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
+    <result column="sub_task" jdbcType="VARCHAR" property="subTask" />
+    <result column="sub_project_id" jdbcType="BIGINT" property="subProjectId" />
+    <result column="sub_project" jdbcType="VARCHAR" property="subProject" />
+    <result column="executor_role" jdbcType="BIGINT" property="executorRole" />
+    <result column="checker_role" jdbcType="BIGINT" property="checkerRole" />
+    <result column="money" jdbcType="BIGINT" property="money" />
+    <result column="delay" jdbcType="TINYINT" property="delay" />
+    <result column="delay_time" jdbcType="BIGINT" property="delayTime" />
+    <result column="loop_to" jdbcType="BIGINT" property="loopTo" />
+    <result column="loop_times" jdbcType="INTEGER" property="loopTimes" />
+    <result column="virtual" jdbcType="TINYINT" property="virtual" />
+    <result column="level" jdbcType="TINYINT" property="level" />
+    <result column="has_group" jdbcType="TINYINT" property="hasGroup" />
+    <result column="finish_need_all" jdbcType="TINYINT" property="finishNeedAll" />
+    <result column="all_member" jdbcType="TINYINT" property="allMember" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+    <result column="priority" jdbcType="TINYINT" property="priority" />
+    <result column="milestone" jdbcType="VARCHAR" property="milestone" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <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">
+    <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">
+    id, project_id, name, description, begin_time, end_time, cycle, parent_id, sub_task, 
+    sub_project_id, sub_project, executor_role, checker_role, money, delay, delay_time, 
+    loop_to, loop_times, virtual, level, has_group, finish_need_all, all_member, created_at, 
+    updated_at, rec_status, priority, milestone
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProTasketailExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_pro_task_detail
+    <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.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_pro_task_detail
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_pro_task_detail
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProTasketailExample">
+    delete from t_pro_task_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.tall.bean.po.ProTasketail">
+    insert into t_pro_task_detail (id, project_id, name, 
+      description, begin_time, end_time, 
+      cycle, parent_id, sub_task, 
+      sub_project_id, sub_project, executor_role, 
+      checker_role, money, delay, 
+      delay_time, loop_to, loop_times, 
+      virtual, level, has_group, 
+      finish_need_all, all_member, created_at, 
+      updated_at, rec_status, priority, 
+      milestone)
+    values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR}, #{beginTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, 
+      #{cycle,jdbcType=VARCHAR}, #{parentId,jdbcType=BIGINT}, #{subTask,jdbcType=VARCHAR}, 
+      #{subProjectId,jdbcType=BIGINT}, #{subProject,jdbcType=VARCHAR}, #{executorRole,jdbcType=BIGINT}, 
+      #{checkerRole,jdbcType=BIGINT}, #{money,jdbcType=BIGINT}, #{delay,jdbcType=TINYINT}, 
+      #{delayTime,jdbcType=BIGINT}, #{loopTo,jdbcType=BIGINT}, #{loopTimes,jdbcType=INTEGER}, 
+      #{virtual,jdbcType=TINYINT}, #{level,jdbcType=TINYINT}, #{hasGroup,jdbcType=TINYINT}, 
+      #{finishNeedAll,jdbcType=TINYINT}, #{allMember,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{priority,jdbcType=TINYINT}, 
+      #{milestone,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProTasketail">
+    insert into t_pro_task_detail
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="description != null">
+        description,
+      </if>
+      <if test="beginTime != null">
+        begin_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="cycle != null">
+        cycle,
+      </if>
+      <if test="parentId != null">
+        parent_id,
+      </if>
+      <if test="subTask != null">
+        sub_task,
+      </if>
+      <if test="subProjectId != null">
+        sub_project_id,
+      </if>
+      <if test="subProject != null">
+        sub_project,
+      </if>
+      <if test="executorRole != null">
+        executor_role,
+      </if>
+      <if test="checkerRole != null">
+        checker_role,
+      </if>
+      <if test="money != null">
+        money,
+      </if>
+      <if test="delay != null">
+        delay,
+      </if>
+      <if test="delayTime != null">
+        delay_time,
+      </if>
+      <if test="loopTo != null">
+        loop_to,
+      </if>
+      <if test="loopTimes != null">
+        loop_times,
+      </if>
+      <if test="virtual != null">
+        virtual,
+      </if>
+      <if test="level != null">
+        level,
+      </if>
+      <if test="hasGroup != null">
+        has_group,
+      </if>
+      <if test="finishNeedAll != null">
+        finish_need_all,
+      </if>
+      <if test="allMember != null">
+        all_member,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+      <if test="priority != null">
+        priority,
+      </if>
+      <if test="milestone != null">
+        milestone,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="beginTime != null">
+        #{beginTime,jdbcType=BIGINT},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=BIGINT},
+      </if>
+      <if test="cycle != null">
+        #{cycle,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        #{parentId,jdbcType=BIGINT},
+      </if>
+      <if test="subTask != null">
+        #{subTask,jdbcType=VARCHAR},
+      </if>
+      <if test="subProjectId != null">
+        #{subProjectId,jdbcType=BIGINT},
+      </if>
+      <if test="subProject != null">
+        #{subProject,jdbcType=VARCHAR},
+      </if>
+      <if test="executorRole != null">
+        #{executorRole,jdbcType=BIGINT},
+      </if>
+      <if test="checkerRole != null">
+        #{checkerRole,jdbcType=BIGINT},
+      </if>
+      <if test="money != null">
+        #{money,jdbcType=BIGINT},
+      </if>
+      <if test="delay != null">
+        #{delay,jdbcType=TINYINT},
+      </if>
+      <if test="delayTime != null">
+        #{delayTime,jdbcType=BIGINT},
+      </if>
+      <if test="loopTo != null">
+        #{loopTo,jdbcType=BIGINT},
+      </if>
+      <if test="loopTimes != null">
+        #{loopTimes,jdbcType=INTEGER},
+      </if>
+      <if test="virtual != null">
+        #{virtual,jdbcType=TINYINT},
+      </if>
+      <if test="level != null">
+        #{level,jdbcType=TINYINT},
+      </if>
+      <if test="hasGroup != null">
+        #{hasGroup,jdbcType=TINYINT},
+      </if>
+      <if test="finishNeedAll != null">
+        #{finishNeedAll,jdbcType=TINYINT},
+      </if>
+      <if test="allMember != null">
+        #{allMember,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="priority != null">
+        #{priority,jdbcType=TINYINT},
+      </if>
+      <if test="milestone != null">
+        #{milestone,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProTasketailExample" resultType="java.lang.Long">
+    select count(*) from t_pro_task_detail
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_pro_task_detail
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.description != null">
+        description = #{record.description,jdbcType=VARCHAR},
+      </if>
+      <if test="record.beginTime != null">
+        begin_time = #{record.beginTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.cycle != null">
+        cycle = #{record.cycle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parentId != null">
+        parent_id = #{record.parentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.subTask != null">
+        sub_task = #{record.subTask,jdbcType=VARCHAR},
+      </if>
+      <if test="record.subProjectId != null">
+        sub_project_id = #{record.subProjectId,jdbcType=BIGINT},
+      </if>
+      <if test="record.subProject != null">
+        sub_project = #{record.subProject,jdbcType=VARCHAR},
+      </if>
+      <if test="record.executorRole != null">
+        executor_role = #{record.executorRole,jdbcType=BIGINT},
+      </if>
+      <if test="record.checkerRole != null">
+        checker_role = #{record.checkerRole,jdbcType=BIGINT},
+      </if>
+      <if test="record.money != null">
+        money = #{record.money,jdbcType=BIGINT},
+      </if>
+      <if test="record.delay != null">
+        delay = #{record.delay,jdbcType=TINYINT},
+      </if>
+      <if test="record.delayTime != null">
+        delay_time = #{record.delayTime,jdbcType=BIGINT},
+      </if>
+      <if test="record.loopTo != null">
+        loop_to = #{record.loopTo,jdbcType=BIGINT},
+      </if>
+      <if test="record.loopTimes != null">
+        loop_times = #{record.loopTimes,jdbcType=INTEGER},
+      </if>
+      <if test="record.virtual != null">
+        virtual = #{record.virtual,jdbcType=TINYINT},
+      </if>
+      <if test="record.level != null">
+        level = #{record.level,jdbcType=TINYINT},
+      </if>
+      <if test="record.hasGroup != null">
+        has_group = #{record.hasGroup,jdbcType=TINYINT},
+      </if>
+      <if test="record.finishNeedAll != null">
+        finish_need_all = #{record.finishNeedAll,jdbcType=TINYINT},
+      </if>
+      <if test="record.allMember != null">
+        all_member = #{record.allMember,jdbcType=TINYINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="record.priority != null">
+        priority = #{record.priority,jdbcType=TINYINT},
+      </if>
+      <if test="record.milestone != null">
+        milestone = #{record.milestone,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_pro_task_detail
+    set id = #{record.id,jdbcType=BIGINT},
+      project_id = #{record.projectId,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      description = #{record.description,jdbcType=VARCHAR},
+      begin_time = #{record.beginTime,jdbcType=BIGINT},
+      end_time = #{record.endTime,jdbcType=BIGINT},
+      cycle = #{record.cycle,jdbcType=VARCHAR},
+      parent_id = #{record.parentId,jdbcType=BIGINT},
+      sub_task = #{record.subTask,jdbcType=VARCHAR},
+      sub_project_id = #{record.subProjectId,jdbcType=BIGINT},
+      sub_project = #{record.subProject,jdbcType=VARCHAR},
+      executor_role = #{record.executorRole,jdbcType=BIGINT},
+      checker_role = #{record.checkerRole,jdbcType=BIGINT},
+      money = #{record.money,jdbcType=BIGINT},
+      delay = #{record.delay,jdbcType=TINYINT},
+      delay_time = #{record.delayTime,jdbcType=BIGINT},
+      loop_to = #{record.loopTo,jdbcType=BIGINT},
+      loop_times = #{record.loopTimes,jdbcType=INTEGER},
+      virtual = #{record.virtual,jdbcType=TINYINT},
+      level = #{record.level,jdbcType=TINYINT},
+      has_group = #{record.hasGroup,jdbcType=TINYINT},
+      finish_need_all = #{record.finishNeedAll,jdbcType=TINYINT},
+      all_member = #{record.allMember,jdbcType=TINYINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT},
+      priority = #{record.priority,jdbcType=TINYINT},
+      milestone = #{record.milestone,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.ProTasketail">
+    update t_pro_task_detail
+    <set>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="description != null">
+        description = #{description,jdbcType=VARCHAR},
+      </if>
+      <if test="beginTime != null">
+        begin_time = #{beginTime,jdbcType=BIGINT},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=BIGINT},
+      </if>
+      <if test="cycle != null">
+        cycle = #{cycle,jdbcType=VARCHAR},
+      </if>
+      <if test="parentId != null">
+        parent_id = #{parentId,jdbcType=BIGINT},
+      </if>
+      <if test="subTask != null">
+        sub_task = #{subTask,jdbcType=VARCHAR},
+      </if>
+      <if test="subProjectId != null">
+        sub_project_id = #{subProjectId,jdbcType=BIGINT},
+      </if>
+      <if test="subProject != null">
+        sub_project = #{subProject,jdbcType=VARCHAR},
+      </if>
+      <if test="executorRole != null">
+        executor_role = #{executorRole,jdbcType=BIGINT},
+      </if>
+      <if test="checkerRole != null">
+        checker_role = #{checkerRole,jdbcType=BIGINT},
+      </if>
+      <if test="money != null">
+        money = #{money,jdbcType=BIGINT},
+      </if>
+      <if test="delay != null">
+        delay = #{delay,jdbcType=TINYINT},
+      </if>
+      <if test="delayTime != null">
+        delay_time = #{delayTime,jdbcType=BIGINT},
+      </if>
+      <if test="loopTo != null">
+        loop_to = #{loopTo,jdbcType=BIGINT},
+      </if>
+      <if test="loopTimes != null">
+        loop_times = #{loopTimes,jdbcType=INTEGER},
+      </if>
+      <if test="virtual != null">
+        virtual = #{virtual,jdbcType=TINYINT},
+      </if>
+      <if test="level != null">
+        level = #{level,jdbcType=TINYINT},
+      </if>
+      <if test="hasGroup != null">
+        has_group = #{hasGroup,jdbcType=TINYINT},
+      </if>
+      <if test="finishNeedAll != null">
+        finish_need_all = #{finishNeedAll,jdbcType=TINYINT},
+      </if>
+      <if test="allMember != null">
+        all_member = #{allMember,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+      <if test="priority != null">
+        priority = #{priority,jdbcType=TINYINT},
+      </if>
+      <if test="milestone != null">
+        milestone = #{milestone,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.ProTasketail">
+    update t_pro_task_detail
+    set project_id = #{projectId,jdbcType=BIGINT},
+      name = #{name,jdbcType=VARCHAR},
+      description = #{description,jdbcType=VARCHAR},
+      begin_time = #{beginTime,jdbcType=BIGINT},
+      end_time = #{endTime,jdbcType=BIGINT},
+      cycle = #{cycle,jdbcType=VARCHAR},
+      parent_id = #{parentId,jdbcType=BIGINT},
+      sub_task = #{subTask,jdbcType=VARCHAR},
+      sub_project_id = #{subProjectId,jdbcType=BIGINT},
+      sub_project = #{subProject,jdbcType=VARCHAR},
+      executor_role = #{executorRole,jdbcType=BIGINT},
+      checker_role = #{checkerRole,jdbcType=BIGINT},
+      money = #{money,jdbcType=BIGINT},
+      delay = #{delay,jdbcType=TINYINT},
+      delay_time = #{delayTime,jdbcType=BIGINT},
+      loop_to = #{loopTo,jdbcType=BIGINT},
+      loop_times = #{loopTimes,jdbcType=INTEGER},
+      virtual = #{virtual,jdbcType=TINYINT},
+      level = #{level,jdbcType=TINYINT},
+      has_group = #{hasGroup,jdbcType=TINYINT},
+      finish_need_all = #{finishNeedAll,jdbcType=TINYINT},
+      all_member = #{allMember,jdbcType=TINYINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT},
+      priority = #{priority,jdbcType=TINYINT},
+      milestone = #{milestone,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>