Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20200603-zlp-1

Browse Source 
一日流程管理
This commit is contained in:
paidaxing444
2020-06-03 18:11:31 +08:00
parent aa7779ef6d
commit 78433edda9
8 changed files with 213 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java
View File

@ -16,179 +16,93 @@ import java.util.Date;
*/
public class ByDayFlowStandard extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 标识 */
private Long sid;
private Long id;
/** 任务名称 */
@Excel(name = "任务名称")
private String taskLable;
/** 任务id */
@Excel(name = "任务id")
private Long taskCode;
/** 标准的名称 */
@Excel(name = "标准的名称")
private String sname;
/** 标准的内容 */
@Excel(name = "标准的内容")
private String standardContent;
/** 标准的解读 */
@Excel(name = "标准的解读")
private String standardJiedu;
private String standardTitle;
/** 标准排序 */
@Excel(name = "标准排序")
private Long standardSort;
/** 照片 */
@Excel(name = "照片")
private String picture;
/** 视频 */
@Excel(name = "视频")
private String video;
/** 创建人 */
@Excel(name = "创建人")
private Long createuser;
/** 更新者 */
@Excel(name = "更新者")
private Long updateuser;
/** 创建时间 */
@Excel(name = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createtime;
/** 更新者 */
@Excel(name = "更新者")
private Long updateuser;
/** 更新时间 */
@Excel(name = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatetime;
/** 备用字段 */
@Excel(name = "备用字段")
private Long beiyong;
public void setSid(Long sid)
public void setId(Long id)
{
this.sid = sid;
this.id = id;
}
public Long getSid()
public Long getId()
{
return sid;
return id;
}
public void setTaskLable(String taskLable)
public void setTaskCode(Long taskCode)
{
this.taskLable = taskLable;
this.taskCode = taskCode;
}
public String getTaskLable()
public Long getTaskCode()
{
return taskLable;
return taskCode;
}
public void setSname(String sname)
public void setStandardTitle(String standardTitle)
{
this.sname = sname;
this.standardTitle = standardTitle;
}
public String getSname()
public String getStandardTitle()
{
return sname;
return standardTitle;
}
public void setStandardContent(String standardContent)
{
this.standardContent = standardContent;
}
public String getStandardContent()
{
return standardContent;
}
public void setStandardJiedu(String standardJiedu)
{
this.standardJiedu = standardJiedu;
}
public String getStandardJiedu()
{
return standardJiedu;
}
public void setStandardSort(Long standardSort)
public void setStandardSort(Long standardSort)
{
this.standardSort = standardSort;
}
public Long getStandardSort()
public Long getStandardSort()
{
return standardSort;
}
public void setPicture(String picture)
{
this.picture = picture;
}
public String getPicture()
{
return picture;
}
public void setVideo(String video)
{
this.video = video;
}
public String getVideo()
{
return video;
}
public void setCreateuser(Long createuser)
public void setCreateuser(Long createuser)
{
this.createuser = createuser;
}
public Long getCreateuser()
public Long getCreateuser()
{
return createuser;
}
public void setUpdateuser(Long updateuser)
public void setUpdateuser(Long updateuser)
{
this.updateuser = updateuser;
}
public Long getUpdateuser()
public Long getUpdateuser()
{
return updateuser;
}
public void setBeiyong(Long beiyong)
{
this.beiyong = beiyong;
}
public Long getBeiyong()
{
return beiyong;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("sid", getSid())
.append("taskLable", getTaskLable())
.append("sname", getSname())
.append("standardContent", getStandardContent())
.append("standardJiedu", getStandardJiedu())
.append("standardSort", getStandardSort())
.append("picture", getPicture())
.append("video", getVideo())
.append("createuser", getCreateuser())
.append("createtime", getCreatetime())
.append("updateuser", getUpdateuser())
.append("updatetime", getUpdatetime())
.append("beiyong", getBeiyong())
.toString();
}
public Date getCreatetime() {
return createtime;
@ -205,4 +119,19 @@ public class ByDayFlowStandard extends BaseEntity
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("sid", getId())
.append("taskCode", getTaskCode())
.append("standardTitle", getStandardTitle())
.append("standardSort", getStandardSort())
.append("createuser", getCreateuser())
.append("createtime", getCreatetime())
.append("updateuser", getUpdateuser())
.append("updatetime", getUpdatetime())
.toString();
}
}

126
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowTask.java
View File

@ -25,17 +25,9 @@ public class ByDayFlowTask extends BaseEntity
@Excel(name = "任务名称(标签)")
private String taskLable;
/** 任务键值 */
@Excel(name = "任务键值")
private String taskValue;
/** 流程名称 */
@Excel(name = "流程名称")
private String detailName;
/** 任务目的 */
@Excel(name = "任务目的")
private String taskTarget;
/** 一日流程id */
@Excel(name = "一日流程id")
private Long detailId;
/** 任务解读 */
@Excel(name = "任务解读")
@ -45,13 +37,9 @@ public class ByDayFlowTask extends BaseEntity
@Excel(name = "任务排序")
private Integer taskSort;
/** 样式属性（其他样式扩展) */
@Excel(name = "样式属性", readConverterExp = "样式属性（其他样式扩展)")
private String cssClass;
/** 表格回显样式 */
@Excel(name = "表格回显样式")
private String listClass;
/** 标签 */
@Excel(name = "标签")
private String label;
/** 创建人 */
@Excel(name = "创建人")
@ -80,117 +68,73 @@ public class ByDayFlowTask extends BaseEntity
{
return code;
}
public void setTaskLable(String taskLable)
public void setTaskLable(String taskLable)
{
this.taskLable = taskLable;
}
public String getTaskLable()
public String getTaskLable()
{
return taskLable;
}
public void setTaskValue(String taskValue)
public void setDetailId(Long detailId)
{
this.taskValue = taskValue;
this.detailId = detailId;
}
public String getTaskValue()
public Long getDetailId()
{
return taskValue;
}
public void setDetailName(String detailName)
{
this.detailName = detailName;
return detailId;
}
public String getDetailName()
{
return detailName;
}
public void setTaskTarget(String taskTarget)
{
this.taskTarget = taskTarget;
}
public String getTaskTarget()
{
return taskTarget;
}
public void setTaskContent(String taskContent)
public void setTaskContent(String taskContent)
{
this.taskContent = taskContent;
}
public String getTaskContent()
public String getTaskContent()
{
return taskContent;
}
public void setTaskSort(Integer taskSort)
public void setTaskSort(Integer taskSort)
{
this.taskSort = taskSort;
}
public Integer getTaskSort()
public Integer getTaskSort()
{
return taskSort;
}
public void setCssClass(String cssClass)
public void setLabel(String label)
{
this.cssClass = cssClass;
this.label = label;
}
public String getCssClass()
public String getLabel()
{
return cssClass;
}
public void setListClass(String listClass)
{
this.listClass = listClass;
return label;
}
public String getListClass()
{
return listClass;
}
public void setCreateuser(Long createuser)
public void setCreateuser(Long createuser)
{
this.createuser = createuser;
}
public Long getCreateuser()
public Long getCreateuser()
{
return createuser;
}
public void setUpdateuser(Long updateuser)
public void setUpdateuser(Long updateuser)
{
this.updateuser = updateuser;
}
public Long getUpdateuser()
public Long getUpdateuser()
{
return updateuser;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("code", getCode())
.append("taskLable", getTaskLable())
.append("taskValue", getTaskValue())
.append("detailName", getDetailName())
.append("taskTarget", getTaskTarget())
.append("taskContent", getTaskContent())
.append("taskSort", getTaskSort())
.append("cssClass", getCssClass())
.append("listClass", getListClass())
.append("createuser", getCreateuser())
.append("updateuser", getUpdateuser())
.append("createtime", getCreatetime())
.append("updatetime", getUpdatetime())
.append("remark", getRemark())
.toString();
}
public Date getCreatetime() {
return createtime;
}
@ -206,4 +150,22 @@ public class ByDayFlowTask extends BaseEntity
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("code", getCode())
.append("taskLable", getTaskLable())
.append("detailId", getDetailId())
.append("taskContent", getTaskContent())
.append("taskSort", getTaskSort())
.append("label", getLabel())
.append("createuser", getCreateuser())
.append("updateuser", getUpdateuser())
.append("createtime", getCreatetime())
.append("updatetime", getUpdatetime())
.append("remark", getRemark())
.toString();
}
}

78
ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml
View File

@ -3,111 +3,85 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.benyi.mapper.ByDayFlowStandardMapper">
<resultMap type="ByDayFlowStandard" id="ByDayFlowStandardResult">
<result property="sid" column="sid" />
<result property="taskLable" column="task_lable" />
<result property="sname" column="sname" />
<result property="standardContent" column="standard_content" />
<result property="standardJiedu" column="standard_jiedu" />
<result property="id" column="id" />
<result property="taskCode" column="task_code" />
<result property="standardTitle" column="standard_title" />
<result property="standardSort" column="standard_sort" />
<result property="picture" column="picture" />
<result property="video" column="video" />
<result property="createuser" column="createuser" />
<result property="createtime" column="createtime" />
<result property="updateuser" column="updateuser" />
<result property="updatetime" column="updatetime" />
<result property="beiyong" column="beiyong" />
</resultMap>
<sql id="selectByDayFlowStandardVo">
select sid, task_lable, sname, standard_content, standard_jiedu, standard_sort, picture, video, createuser, createtime, updateuser, updatetime, beiyong from by_day_flow_standard
select id, task_code, standard_title, standard_sort, createuser, createtime, updateuser, updatetime from by_day_flow_standard
</sql>
<select id="selectByDayFlowStandardList" parameterType="ByDayFlowStandard" resultMap="ByDayFlowStandardResult">
<include refid="selectByDayFlowStandardVo"/>
<where>
<if test="taskLable != null and taskLable != ''"> and task_lable = #{taskLable}</if>
<if test="sname != null and sname != ''"> and sname like concat('%', #{sname}, '%')</if>
<if test="standardContent != null and standardContent != ''"> and standard_content = #{standardContent}</if>
<if test="standardJiedu != null and standardJiedu != ''"> and standard_jiedu = #{standardJiedu}</if>
<where>
<if test="taskCode != null "> and task_code = #{taskCode}</if>
<if test="standardTitle != null and standardTitle != ''"> and standard_title = #{standardTitle}</if>
<if test="standardSort != null "> and standard_sort = #{standardSort}</if>
<if test="picture != null and picture != ''"> and picture = #{picture}</if>
<if test="video != null and video != ''"> and video = #{video}</if>
<if test="createuser != null "> and createuser = #{createuser}</if>
<if test="createtime != null "> and createtime = #{createtime}</if>
<if test="updateuser != null "> and updateuser = #{updateuser}</if>
<if test="updatetime != null "> and updatetime = #{updatetime}</if>
<if test="beiyong != null "> and beiyong = #{beiyong}</if>
</where>
order by standard_sort
</select>
<select id="selectByDayFlowStandardById" parameterType="Long" resultMap="ByDayFlowStandardResult">
<include refid="selectByDayFlowStandardVo"/>
where sid = #{sid}
where id = #{id}
</select>
<insert id="insertByDayFlowStandard" parameterType="ByDayFlowStandard" useGeneratedKeys="true" keyProperty="sid">
<insert id="insertByDayFlowStandard" parameterType="ByDayFlowStandard" useGeneratedKeys="true" keyProperty="id">
insert into by_day_flow_standard
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskLable != null and taskLable != ''">task_lable,</if>
<if test="sname != null and sname != ''">sname,</if>
<if test="standardContent != null and standardContent != ''">standard_content,</if>
<if test="standardJiedu != null and standardJiedu != ''">standard_jiedu,</if>
<if test="taskCode != null ">task_code,</if>
<if test="standardTitle != null and standardTitle != ''">standard_title,</if>
<if test="standardSort != null ">standard_sort,</if>
<if test="picture != null and picture != ''">picture,</if>
<if test="video != null and video != ''">video,</if>
<if test="createuser != null ">createuser,</if>
<if test="createtime != null ">createtime,</if>
<if test="updateuser != null ">updateuser,</if>
<if test="updatetime != null ">updatetime,</if>
<if test="beiyong != null ">beiyong,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskLable != null and taskLable != ''">#{taskLable},</if>
<if test="sname != null and sname != ''">#{sname},</if>
<if test="standardContent != null and standardContent != ''">#{standardContent},</if>
<if test="standardJiedu != null and standardJiedu != ''">#{standardJiedu},</if>
<if test="taskCode != null ">#{taskCode},</if>
<if test="standardTitle != null and standardTitle != ''">#{standardTitle},</if>
<if test="standardSort != null ">#{standardSort},</if>
<if test="picture != null and picture != ''">#{picture},</if>
<if test="video != null and video != ''">#{video},</if>
<if test="createuser != null ">#{createuser},</if>
<if test="createtime != null ">#{createtime},</if>
<if test="updateuser != null ">#{updateuser},</if>
<if test="updatetime != null ">#{updatetime},</if>
<if test="beiyong != null ">#{beiyong},</if>
</trim>
</trim>
</insert>
<update id="updateByDayFlowStandard" parameterType="ByDayFlowStandard">
update by_day_flow_standard
<trim prefix="SET" suffixOverrides=",">
<if test="taskLable != null and taskLable != ''">task_lable = #{taskLable},</if>
<if test="sname != null and sname != ''">sname = #{sname},</if>
<if test="standardContent != null and standardContent != ''">standard_content = #{standardContent},</if>
<if test="standardJiedu != null and standardJiedu != ''">standard_jiedu = #{standardJiedu},</if>
<if test="taskCode != null ">task_code = #{taskCode},</if>
<if test="standardTitle != null and standardTitle != ''">standard_title = #{standardTitle},</if>
<if test="standardSort != null ">standard_sort = #{standardSort},</if>
<if test="picture != null and picture != ''">picture = #{picture},</if>
<if test="video != null and video != ''">video = #{video},</if>
<if test="createuser != null ">createuser = #{createuser},</if>
<if test="createtime != null ">createtime = #{createtime},</if>
<if test="updateuser != null ">updateuser = #{updateuser},</if>
<if test="updatetime != null ">updatetime = #{updatetime},</if>
<if test="beiyong != null ">beiyong = #{beiyong},</if>
</trim>
where sid = #{sid}
where id = #{id}
</update>
<delete id="deleteByDayFlowStandardById" parameterType="Long">
delete from by_day_flow_standard where sid = #{sid}
delete from by_day_flow_standard where id = #{id}
</delete>
<delete id="deleteByDayFlowStandardByIds" parameterType="String">
delete from by_day_flow_standard where sid in
<foreach item="sid" collection="array" open="(" separator="," close=")">
#{sid}
delete from by_day_flow_standard where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

65
ruoyi/src/main/resources/mybatis/benyi/ByDayFlowTaskMapper.xml
View File

@ -1,19 +1,16 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.benyi.mapper.ByDayFlowTaskMapper">
<resultMap type="ByDayFlowTask" id="ByDayFlowTaskResult">
<result property="code" column="code" />
<result property="taskLable" column="task_lable" />
<result property="taskValue" column="task_value" />
<result property="detailName" column="detail_name" />
<result property="taskTarget" column="task_target" />
<result property="detailId" column="detail_id" />
<result property="taskContent" column="task_content" />
<result property="taskSort" column="task_sort" />
<result property="cssClass" column="css_class" />
<result property="listClass" column="list_class" />
<result property="label" column="label" />
<result property="createuser" column="createuser" />
<result property="updateuser" column="updateuser" />
<result property="createtime" column="createtime" />
@ -22,77 +19,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectByDayFlowTaskVo">
select code, task_lable, task_value, detail_name, task_target, task_content, task_sort, css_class, list_class, createuser, updateuser, createtime, updatetime, remark
from by_day_flow_task
select code, task_lable, detail_id, task_content, task_sort, label, createuser, updateuser, createtime, updatetime, remark from by_day_flow_task
</sql>
<select id="selectByDayFlowTaskList" parameterType="ByDayFlowTask" resultMap="ByDayFlowTaskResult">
<include refid="selectByDayFlowTaskVo"/>
<where>
<if test="taskLable != null and taskLable != ''"> and task_lable like concat('%', #{taskLable}, '%')</if>
<if test="taskValue != null and taskValue != ''"> and task_value = #{taskValue}</if>
<if test="detailName != null and detailName != ''"> and detail_name = #{detailName}</if>
<if test="taskTarget != null and taskTarget != ''"> and task_target = #{taskTarget}</if>
<where>
<if test="taskLable != null and taskLable != ''">and task_lable like concat('%', #{taskLable}, '%')</if>
<if test="detailId != null "> and detail_id = #{detailId}</if>
<if test="taskContent != null and taskContent != ''"> and task_content = #{taskContent}</if>
<if test="taskSort != null "> and task_sort = #{taskSort}</if>
<if test="cssClass != null and cssClass != ''"> and css_class = #{cssClass}</if>
<if test="listClass != null and listClass != ''"> and list_class = #{listClass}</if>
<if test="label != null and label != ''"> and label = #{label}</if>
<if test="createuser != null "> and createuser = #{createuser}</if>
<if test="updateuser != null "> and updateuser = #{updateuser}</if>
<if test="createtime != null "> and createtime = #{createtime}</if>
<if test="updatetime != null "> and updatetime = #{updatetime}</if>
</where>
order by task_sort
</select>
<select id="selectByDayFlowTaskByCode" parameterType="Long" resultMap="ByDayFlowTaskResult">
<include refid="selectByDayFlowTaskVo"/>
where code = #{code}
</select>
<insert id="insertByDayFlowTask" parameterType="ByDayFlowTask" useGeneratedKeys="true" keyProperty="code">
insert into by_day_flow_task
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="taskLable != null and taskLable != ''">task_lable,</if>
<if test="taskValue != null and taskValue != ''">task_value,</if>
<if test="detailName != null and detailName != ''">detail_name,</if>
<if test="taskTarget != null and taskTarget != ''">task_target,</if>
<if test="detailId != null ">detail_id,</if>
<if test="taskContent != null and taskContent != ''">task_content,</if>
<if test="taskSort != null ">task_sort,</if>
<if test="cssClass != null and cssClass != ''">css_class,</if>
<if test="listClass != null and listClass != ''">list_class,</if>
<if test="label != null and label != ''">label,</if>
<if test="createuser != null ">createuser,</if>
<if test="updateuser != null ">updateuser,</if>
<if test="createtime != null ">createtime,</if>
<if test="updatetime != null ">updatetime,</if>
<if test="remark != null and remark != ''">remark,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskLable != null and taskLable != ''">#{taskLable},</if>
<if test="taskValue != null and taskValue != ''">#{taskValue},</if>
<if test="detailName != null and detailName != ''">#{detailName},</if>
<if test="taskTarget != null and taskTarget != ''">#{taskTarget},</if>
<if test="detailId != null ">#{detailId},</if>
<if test="taskContent != null and taskContent != ''">#{taskContent},</if>
<if test="taskSort != null ">#{taskSort},</if>
<if test="cssClass != null and cssClass != ''">#{cssClass},</if>
<if test="listClass != null and listClass != ''">#{listClass},</if>
<if test="label != null and label != ''">#{label},</if>
<if test="createuser != null ">#{createuser},</if>
<if test="updateuser != null ">#{updateuser},</if>
<if test="createtime != null ">#{createtime},</if>
<if test="updatetime != null ">#{updatetime},</if>
<if test="remark != null and remark != ''">#{remark},</if>
</trim>
</trim>
</insert>
<update id="updateByDayFlowTask" parameterType="ByDayFlowTask">
update by_day_flow_task
<trim prefix="SET" suffixOverrides=",">
<if test="taskLable != null and taskLable != ''">task_lable = #{taskLable},</if>
<if test="taskValue != null and taskValue != ''">task_value = #{taskValue},</if>
<if test="detailName != null and detailName != ''">detail_name = #{detailName},</if>
<if test="taskTarget != null and taskTarget != ''">task_target = #{taskTarget},</if>
<if test="detailId != null ">detail_id = #{detailId},</if>
<if test="taskContent != null and taskContent != ''">task_content = #{taskContent},</if>
<if test="taskSort != null ">task_sort = #{taskSort},</if>
<if test="cssClass != null and cssClass != ''">css_class = #{cssClass},</if>
<if test="listClass != null and listClass != ''">list_class = #{listClass},</if>
<if test="label != null and label != ''">label = #{label},</if>
<if test="createuser != null ">createuser = #{createuser},</if>
<if test="updateuser != null ">updateuser = #{updateuser},</if>
<if test="createtime != null ">createtime = #{createtime},</if>
@ -102,15 +87,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where code = #{code}
</update>
<delete id="deleteByDayFlowTaskByCode" parameterType="Long">
<delete id="deleteByDayFlowTaskById" parameterType="Long">
delete from by_day_flow_task where code = #{code}
</delete>
<delete id="deleteByDayFlowTaskByCodes" parameterType="String">
<delete id="deleteByDayFlowTaskByIds" parameterType="String">
delete from by_day_flow_task where code in
<foreach item="code" collection="array" open="(" separator="," close=")">
#{code}
</foreach>
</delete>
</mapper>