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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/components/Editor/index.vue
View File

@ -147,7 +147,7 @@ export default {
<style> <style>
.editor { .editor {
line-height: normal !important; line-height: normal !important;
height: 192px; /* height: 192px; */
} }
.quill-img { .quill-img {
display: none; display: none;

38
ruoyi-ui/src/views/benyi/dayflow/index.vue
View File

@ -56,23 +56,17 @@
v-hasPermi="['benyi:dayflowmanger:remove']" v-hasPermi="['benyi:dayflowmanger:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['benyi:dayflowmanger:export']"
>导出</el-button>
</el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="流程ID" align="center" prop="id" /> <el-table-column label="流程ID" align="center" prop="id" />
<el-table-column label="流程名称" align="center" :show-overflow-tooltip="true"> <el-table-column label="流程名称" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope" > <template slot-scope="scope">
<router-link :to="'/dayflow/dayflowmanger/dayflowtask/' + scope.row.id" class="link-dayflow"> <router-link
:to="'/dayflow/dayflowmanger/dayflowtask/' + scope.row.id"
class="link-dayflow"
>
<span>{{ scope.row.name }}</span> <span>{{ scope.row.name }}</span>
</router-link> </router-link>
</template> </template>
@ -128,11 +122,12 @@
v-for="dict in dayflowtypeOptions" v-for="dict in dayflowtypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="导言" prop="content"> <el-form-item label="导言" prop="content">
<el-input v-model="form.content" type="textarea" placeholder="请输入导言" /> <Editor v-model="form.content" />
</el-form-item> </el-form-item>
<el-form-item label="目的" prop="note"> <el-form-item label="目的" prop="note">
@ -153,8 +148,7 @@ import {
getDetail, getDetail,
delDetail, delDetail,
addDetail, addDetail,
updateDetail, updateDetail
exportDetail
} from "@/api/benyi/dayflow/dayflowmanger"; } from "@/api/benyi/dayflow/dayflowmanger";
import Editor from "@/components/Editor"; import Editor from "@/components/Editor";
@ -330,22 +324,6 @@ export default {
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function() {}); .catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有一日流程数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(function() {
return exportDetail(queryParams);
})
.then(response => {
this.download(response.msg);
})
.catch(function() {});
} }
} }
}; };

54
ruoyi-ui/src/views/benyi/dayflow/standard.vue
View File

@ -56,15 +56,6 @@
v-hasPermi="['benyi:standard:remove']" v-hasPermi="['benyi:standard:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['benyi:standard:export']"
>导出</el-button>
</el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="standardList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="standardList" @selection-change="handleSelectionChange">
@ -161,8 +152,7 @@ import {
getStandard, getStandard,
delStandard, delStandard,
addStandard, addStandard,
updateStandard, updateStandard
exportStandard
} from "@/api/benyi/dayflow/biaozhun/standard"; } from "@/api/benyi/dayflow/biaozhun/standard";
import { import {
listDayflowtask, listDayflowtask,
@ -387,49 +377,7 @@ export default {
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}) })
.catch(function() {}); .catch(function() {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm("是否确认导出所有一日流程标准数据项?", "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(function() {
return exportStandard(queryParams);
})
.then(response => {
this.download(response.msg);
})
.catch(function() {});
} }
} }
}; };
</script> </script>
<style>
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
line-height: 178px;
text-align: center;
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
</style>

125
ruoyi-ui/src/views/benyi/dayflow/task.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="流程名称" prop="detailName"> <el-form-item label="流程名称" prop="detailId">
<el-select v-model="queryParams.detailName" size="small"> <el-select v-model="queryParams.detailId" size="small">
<el-option <el-option
v-for="item in detailOptions" v-for="item in detailOptions"
:key="item.id" :key="item.id"
:label="item.name" :label="item.name"
:value="item.name" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -56,31 +56,29 @@
v-hasPermi="['benyi:dayflowtask:remove']" v-hasPermi="['benyi:dayflowtask:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5">
<el-button
type="warning"
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['benyi:dayflowtask:export']"
>导出</el-button>
</el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="dayflowtaskList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="dayflowtaskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务名称" align="center" :show-overflow-tooltip="true"> <el-table-column label="任务名称" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope" > <template slot-scope="scope">
<router-link :to="'/dayflow/dayflowmanger/dayflowtask/standard/' + scope.row.code" class="link-dayflow"> <router-link
:to="'/dayflow/dayflowmanger/dayflowtask/standard/' + scope.row.code"
class="link-dayflow"
>
<span>{{ scope.row.taskLable }}</span> <span>{{ scope.row.taskLable }}</span>
</router-link> </router-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属流程" align="center" prop="detailName" /> <el-table-column
label="任务解读"
align="center"
prop="taskContent"
:show-overflow-tooltip="true"
/>
<el-table-column label="任务排序" align="center" prop="taskSort" /> <el-table-column label="任务排序" align="center" prop="taskSort" />
<el-table-column label="创建时间" align="center" prop="createtime" />
<el-table-column label="更新时间" align="center" prop="updatetime" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建时间" align="center" prop="createtime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -112,15 +110,19 @@
<!-- 添加或修改一日流程任务对话框 --> <!-- 添加或修改一日流程任务对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px"> <el-dialog :title="title" :visible.sync="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="流程名称" prop="detailName" > <el-form-item label="流程名称" prop="detailId">
<el-input v-model="form.detailName" :disabled="true" /> <el-select v-model="form.detailId" size="small" :disabled="true">
<el-option
v-for="item in detailOptions"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务名称" prop="taskLable"> <el-form-item label="任务名称" prop="taskLable">
<el-input v-model="form.taskLable" placeholder="请输入任务名称" /> <el-input v-model="form.taskLable" placeholder="请输入任务名称" />
</el-form-item> </el-form-item>
<el-form-item label="任务目的" prop="taskTarget">
<el-input v-model="form.taskTarget" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="任务解读" prop="taskContent"> <el-form-item label="任务解读" prop="taskContent">
<el-input v-model="form.taskContent" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.taskContent" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
@ -140,8 +142,14 @@
</template> </template>
<script> <script>
import { listDayflowtask, getDayflowtask, delDayflowtask, addDayflowtask, updateDayflowtask, exportDayflowtask } from "@/api/benyi/dayflow/dayflowtask"; import {
import {listDetail, getDetail} from "@/api/benyi/dayflow/dayflowmanger"; listDayflowtask,
getDayflowtask,
delDayflowtask,
addDayflowtask,
updateDayflowtask
} from "@/api/benyi/dayflow/dayflowtask";
import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
export default { export default {
name: "Dayflowtask", name: "Dayflowtask",
@ -172,15 +180,11 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
taskLable: undefined, taskLable: undefined,
taskValue: undefined, detailId: undefined,
detailName: undefined,
taskTarget: undefined,
taskContent: undefined, taskContent: undefined,
taskSort: undefined, taskSort: null,
cssClass: undefined,
listClass: undefined,
createuser: undefined, createuser: undefined,
updateuser: undefined, updateuser: undefined
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -189,6 +193,9 @@ export default {
taskLable: [ taskLable: [
{ required: true, message: "任务名称(标签)不能为空", trigger: "blur" } { required: true, message: "任务名称(标签)不能为空", trigger: "blur" }
], ],
taskSort: [
{ required: true, message: "任务排序不能为空", trigger: "blur" }
]
} }
}; };
}, },
@ -202,16 +209,17 @@ export default {
/**查询流程名称详细 */ /**查询流程名称详细 */
getDetail(detailId) { getDetail(detailId) {
getDetail(detailId).then(response => { getDetail(detailId).then(response => {
this.queryParams.detailName = response.data.name; console.log(response.data);
this.defaultDetailName = response.data.name; this.queryParams.detailId = response.data.id;
this.defaultDetailName = response.data.id;
this.getList(); this.getList();
}) });
}, },
/**查询流程名称列表 */ /**查询流程名称列表 */
getDetailList() { getDetailList() {
listDetail().then(response => { listDetail().then(response => {
this.detailOptions = response.rows; this.detailOptions = response.rows;
}) });
}, },
/** 查询一日流程任务列表 */ /** 查询一日流程任务列表 */
getList() { getList() {
@ -233,12 +241,9 @@ export default {
code: undefined, code: undefined,
taskLable: undefined, taskLable: undefined,
taskValue: undefined, taskValue: undefined,
detailName: undefined, detailId: undefined,
taskTarget: undefined,
taskContent: undefined, taskContent: undefined,
taskSort: undefined, taskSort: 0,
cssClass: undefined,
listClass: undefined,
createuser: undefined, createuser: undefined,
updateuser: undefined, updateuser: undefined,
createtime: undefined, createtime: undefined,
@ -255,14 +260,14 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.detailName = this.defaultDetailName; this.queryParams.detailId = this.defaultDetailName;
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.codes = selection.map(item => item.code) this.codes = selection.map(item => item.code);
this.single = selection.length!=1 this.single = selection.length != 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
@ -270,12 +275,12 @@ export default {
this.open = true; this.open = true;
this.title = "添加一日流程任务"; this.title = "添加一日流程任务";
//有可能是name //有可能是name
this.form.detailName = this.queryParams.detailName; this.form.detailId = this.queryParams.detailId;
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const code = row.code || this.codes const code = row.code || this.codes;
getDayflowtask(code).then(response => { getDayflowtask(code).then(response => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
@ -313,29 +318,23 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const codes = row.code || this.codes; const codes = row.code || this.codes;
this.$confirm('是否确认删除一日流程任务编号为"' + codes + '"的数据项?', "警告", { this.$confirm(
'是否确认删除一日流程任务编号为"' + codes + '"的数据项?',
"警告",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}).then(function() { }
)
.then(function() {
return delDayflowtask(codes); return delDayflowtask(codes);
}).then(() => { })
.then(() => {
this.getList(); this.getList();
this.msgSuccess("删除成功"); this.msgSuccess("删除成功");
}).catch(function() {}); })
}, .catch(function() {});
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
this.$confirm('是否确认导出所有一日流程任务数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return exportDayflowtask(queryParams);
}).then(response => {
this.download(response.msg);
}).catch(function() {});
} }
} }
}; };

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

@ -16,105 +16,65 @@ import java.util.Date;
*/ */
public class ByDayFlowStandard extends BaseEntity public class ByDayFlowStandard extends BaseEntity
{ {
private static final long serialVersionUID = 1L;
/** 标识 */ /** 标识 */
private Long sid; private Long id;
/** 任务名称 */ /** 任务id */
@Excel(name = "任务名称") @Excel(name = "任务id")
private String taskLable; private Long taskCode;
/** 标准的名称 */ /** 标准的名称 */
@Excel(name = "标准的名称") @Excel(name = "标准的名称")
private String sname; private String standardTitle;
/** 标准的内容 */
@Excel(name = "标准的内容")
private String standardContent;
/** 标准的解读 */
@Excel(name = "标准的解读")
private String standardJiedu;
/** 标准排序 */ /** 标准排序 */
@Excel(name = "标准排序") @Excel(name = "标准排序")
private Long standardSort; private Long standardSort;
/** 照片 */
@Excel(name = "照片")
private String picture;
/** 视频 */
@Excel(name = "视频")
private String video;
/** 创建人 */ /** 创建人 */
@Excel(name = "创建人") @Excel(name = "创建人")
private Long createuser; private Long createuser;
/** 更新者 */
@Excel(name = "更新者")
private Long updateuser;
/** 创建时间 */ /** 创建时间 */
@Excel(name = "创建时间") @Excel(name = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createtime; private Date createtime;
/** 更新者 */
@Excel(name = "更新者")
private Long updateuser;
/** 更新时间 */ /** 更新时间 */
@Excel(name = "更新时间") @Excel(name = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatetime; private Date updatetime;
/** 备用字段 */ public void setId(Long id)
@Excel(name = "备用字段")
private Long beiyong;
public void setSid(Long sid)
{ {
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)
{ {
@ -125,24 +85,6 @@ public class ByDayFlowStandard extends BaseEntity
{ {
return standardSort; 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; this.createuser = createuser;
@ -161,34 +103,6 @@ public class ByDayFlowStandard extends BaseEntity
{ {
return updateuser; 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() { public Date getCreatetime() {
return createtime; return createtime;
@ -205,4 +119,19 @@ public class ByDayFlowStandard extends BaseEntity
public void setUpdatetime(Date updatetime) { public void setUpdatetime(Date updatetime) {
this.updatetime = 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();
}
} }

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

@ -25,17 +25,9 @@ public class ByDayFlowTask extends BaseEntity
@Excel(name = "任务名称(标签)") @Excel(name = "任务名称(标签)")
private String taskLable; private String taskLable;
/** 任务键值 */ /** 一日流程id */
@Excel(name = "任务键值") @Excel(name = "一日流程id")
private String taskValue; private Long detailId;
/** 流程名称 */
@Excel(name = "流程名称")
private String detailName;
/** 任务目的 */
@Excel(name = "任务目的")
private String taskTarget;
/** 任务解读 */ /** 任务解读 */
@Excel(name = "任务解读") @Excel(name = "任务解读")
@ -45,13 +37,9 @@ public class ByDayFlowTask extends BaseEntity
@Excel(name = "任务排序") @Excel(name = "任务排序")
private Integer taskSort; private Integer taskSort;
/** 样式属性（其他样式扩展) */ /** 标签 */
@Excel(name = "样式属性", readConverterExp = "样式属性（其他样式扩展)") @Excel(name = "标签")
private String cssClass; private String label;
/** 表格回显样式 */
@Excel(name = "表格回显样式")
private String listClass;
/** 创建人 */ /** 创建人 */
@Excel(name = "创建人") @Excel(name = "创建人")
@ -89,33 +77,17 @@ public class ByDayFlowTask extends BaseEntity
{ {
return taskLable; 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; return detailId;
}
public void setDetailName(String detailName)
{
this.detailName = detailName;
} }
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; this.taskContent = taskContent;
@ -134,24 +106,17 @@ public class ByDayFlowTask extends BaseEntity
{ {
return taskSort; 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; return label;
}
public void setListClass(String listClass)
{
this.listClass = listClass;
} }
public String getListClass()
{
return listClass;
}
public void setCreateuser(Long createuser) public void setCreateuser(Long createuser)
{ {
this.createuser = createuser; this.createuser = createuser;
@ -170,27 +135,6 @@ public class ByDayFlowTask extends BaseEntity
{ {
return updateuser; 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() { public Date getCreatetime() {
return createtime; return createtime;
} }
@ -206,4 +150,22 @@ public class ByDayFlowTask extends BaseEntity
public void setUpdatetime(Date updatetime) { public void setUpdatetime(Date updatetime) {
this.updatetime = 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();
}
} }

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

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

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

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