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

20200604-zlp-1

Browse Source 
一日流程管理
This commit is contained in:
paidaxing444 2020-06-04 18:01:22 +08:00
parent 78433edda9
commit 73baac31e1
15 changed files with 685 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-ui/src/router/index.js
View File

@ -114,6 +114,18 @@ export const constantRoutes = [{
meta: { title: '一日流程标准', icon: '' }
}]
},
{
path: '/dayflow/dayflowmanger/dayflowtask',
component: Layout,
hidden: true,
children: [{
path: 'standard/unscramble/:id(\\d+)',
component: () =>
import ('@/views/benyi/dayflow/unscramble'),
name: 'unscramble',
meta: { title: '一日流程标准解读', icon: '' }
}]
},
{
path: '/video_study',
component: Layout,

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

@ -1,19 +1,19 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
<el-form-item label="任务名称" prop="taskLable">
<el-select v-model="queryParams.taskLable" size="small">
<el-form-item label="任务名称" prop="taskCode">
<el-select v-model="queryParams.taskCode" size="small">
<el-option
v-for="item in taskOptions"
:key="item.code"
:label="item.taskLable"
:value="item.taskLable"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item label="标准名称" prop="sname">
<el-form-item label="标准名称" prop="standardTitle">
<el-input
v-model="queryParams.sname"
v-model="queryParams.standardTitle"
placeholder="请输入标准名称"
clearable
size="small"
@ -60,19 +60,23 @@
<el-table v-loading="loading" :data="standardList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="标准名称" align="center" prop="sname" />
<el-table-column label="所属任务" align="center" prop="taskLable" />
<el-table-column label="标准名称" align="center" prop="standardTitle" >
<template slot-scope="scope">
<router-link
:to="'/dayflow/dayflowmanger/dayflowtask/standard/unscramble/' + scope.row.id"
class="link-dayflow"
>
<span>{{ scope.row.standardTitle }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="标准排序" align="center" prop="standardSort" />
<el-table-column label="解读数量" align="center" prop="unscrambleCount" />
<el-table-column label="创建时间" align="center" prop="createtime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime) }}</span>
</template>
</el-table-column>
<el-table-column label="更新时间" align="center" prop="updatetime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updatetime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -104,38 +108,21 @@
<!-- 添加或修改一日流程标准对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="任务名称" prop="taskLable">
<el-input v-model="form.taskLable" :disabled="true" />
<el-form-item label="任务名称" prop="taskCode">
<el-select v-model="form.taskCode" :disabled="true" size="small">
<el-option
v-for="item in taskOptions"
:key="item.code"
:label="item.taskLable"
:value="item.code"
/>
</el-select>
</el-form-item>
<el-form-item label="标准名称" prop="sname">
<el-input v-model="form.sname" placeholder="请输入标准的名称" />
</el-form-item>
<el-form-item label="标准内容" prop="standardContent">
<el-input v-model="form.standardContent" type="textarea" placeholder="请输入标准的内容" />
</el-form-item>
<el-form-item label="标准解读" prop="standardJiedu">
<el-input v-model="form.standardJiedu" type="textarea" placeholder="请输入标准的解读" />
<el-form-item label="标准名称" prop="standardTitle">
<el-input v-model="form.standardTitle" type="textarea" placeholder="请输入标准的名称" />
</el-form-item>
<el-form-item label="标准排序" prop="standardSort">
<el-input-number v-model="form.standardSort" controls-position="right" :min="0" />
<el-input v-model="form.picture" v-if="false" />
</el-form-item>
<el-form-item label="照片" prop="picture">
<el-upload
class="avatar-uploader"
:action="uploadImgUrl"
:headers="headers"
:show-file-list="false"
:on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload"
accept=".jpg, .png"
>
<img width="100%" v-if="imageUrl" :src="imageUrl" class="avatar" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
<el-form-item label="视频" prop="video">
<el-input v-model="form.video" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -158,14 +145,11 @@ import {
listDayflowtask,
getDayflowtask
} from "@/api/benyi/dayflow/dayflowtask";
import { getToken } from "@/utils/auth";
export default {
name: "Standard",
data() {
return {
//显示上传的图片，清空
imageUrl: "",
// 遮罩层
loading: true,
// 选中数组
@ -190,31 +174,24 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
taskLable: undefined,
sname: undefined,
standardContent: undefined,
standardJiedu: undefined,
taskCode: undefined,
standardTitle: undefined,
standardSort: undefined,
picture: undefined,
video: undefined,
createuser: undefined,
createtime: undefined,
updateuser: undefined,
updatetime: undefined,
beiyong: undefined
updatetime: undefined
},
// 表单参数
form: {},
// 表单校验
rules: {
sname: [
standardTitle: [
{ required: true, message: "标准名称不能为空", trigger: "blur" }
],
standardSort: [
{ required: true, message: "标准排序不能为空", trigger: "blur" }
]
},
// 上传的图片服务器地址
uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload",
headers: {
Authorization: "Bearer " + getToken()
}
};
},
@ -223,30 +200,13 @@ export default {
const taskId = this.$route.params && this.$route.params.code;
this.getDayflowtask(taskId);
this.getTaskList();
},
methods: {
handleAvatarSuccess(res, file) {
this.imageUrl = URL.createObjectURL(file.raw);
console.log(res);
if (res.code == "200") {
this.form.picture = res.fileName;
} else {
this.msgError(res.msg);
}
},
beforeAvatarUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
this.$message.error("上传图片大小不能超过 2MB!");
}
return isLt2M;
},
/**查询任务名称详细 */
getDayflowtask(taskId) {
getDayflowtask(taskId).then(response => {
this.queryParams.taskLable = response.data.taskLable;
this.defaultTaskName = response.data.taskLable;
this.queryParams.taskCode = response.data.code;
this.defaultTaskName = response.data.code;
this.getList();
});
},
@ -273,19 +233,14 @@ export default {
// 表单重置
reset() {
this.form = {
sid: undefined,
taskLable: undefined,
sname: undefined,
standardContent: undefined,
standardJiedu: undefined,
standardSort: undefined,
picture: undefined,
video: undefined,
id: undefined,
taskCode: undefined,
standardTitle: undefined,
standardSort: 0,
createuser: undefined,
createtime: undefined,
updateuser: undefined,
updatetime: undefined,
beiyong: undefined
updatetime: undefined
};
this.resetForm("form");
},
@ -297,33 +252,28 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams.taskLable = this.defaultTaskName;
this.queryParams.taskCode = this.defaultTaskName;
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.sid);
this.ids = selection.map(item => item.id);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.imageUrl = ""; //清空图片
this.reset();
this.open = true;
this.title = "添加标准";
this.form.taskLable = this.queryParams.taskLable;
this.form.taskCode = this.queryParams.taskCode;
},
/** 修改按钮操作 */
handleUpdate(row) {
this.imageUrl = ""; //清空图片
this.reset();
const sid = row.sid || this.ids;
const sid = row.id || this.ids;
getStandard(sid).then(response => {
this.form = response.data;
if (response.data.picture) {
this.imageUrl = process.env.VUE_APP_BASE_API + response.data.picture;
}
this.open = true;
this.title = "修改标准";
});
@ -332,8 +282,7 @@ export default {
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
console.log(this.form.imageUrl);
if (this.form.sid != undefined) {
if (this.form.id != undefined) {
updateStandard(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
@ -359,7 +308,7 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const sids = row.sid || this.ids;
const sids = row.id || this.ids;
this.$confirm(
'是否确认删除一日流程标准编号为"' + sids + '"的数据项?',
"警告",

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

@ -77,6 +77,7 @@
:show-overflow-tooltip="true"
/>
<el-table-column label="任务排序" align="center" prop="taskSort" />
<el-table-column label="标准数量" align="center" prop="standardCount" />
<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">
@ -209,7 +210,7 @@ export default {
/**查询流程名称详细 */
getDetail(detailId) {
getDetail(detailId).then(response => {
console.log(response.data);
//console.log(response.data);
this.queryParams.detailId = response.data.id;
this.defaultDetailName = response.data.id;
this.getList();

4
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java
View File

@ -80,9 +80,9 @@ public class ByDayFlowStandardController extends BaseController
public AjaxResult add(@RequestBody ByDayFlowStandard byDayFlowStandard)
{
byDayFlowStandard.setCreateuser(SecurityUtils.getLoginUser().getUser().getUserId());
byDayFlowStandard.setUpdateuser(SecurityUtils.getLoginUser().getUser().getUserId());
//byDayFlowStandard.setUpdateuser(SecurityUtils.getLoginUser().getUser().getUserId());
byDayFlowStandard.setCreatetime(new Date());
byDayFlowStandard.setUpdatetime(new Date());
//byDayFlowStandard.setUpdatetime(new Date());
return toAjax(byDayFlowStandardService.insertByDayFlowStandard(byDayFlowStandard));
}

103
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowUnscrambleController.java Normal file
View File

@ -0,0 +1,103 @@
package com.ruoyi.project.benyi.controller;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.project.benyi.domain.ByDayFlowUnscramble;
import com.ruoyi.project.benyi.service.IByDayFlowUnscrambleService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.page.TableDataInfo;
/**
* 一日流程解读Controller
*
* @author tsbz
* @date 2020-06-04
*/
@RestController
@RequestMapping("/benyi/unscramble")
public class ByDayFlowUnscrambleController extends BaseController
{
@Autowired
private IByDayFlowUnscrambleService byDayFlowUnscrambleService;
/**
* 查询一日流程解读列表
*/
@PreAuthorize("@ss.hasPermi('benyi:unscramble:list')")
@GetMapping("/list")
public TableDataInfo list(ByDayFlowUnscramble byDayFlowUnscramble)
{
startPage();
List<ByDayFlowUnscramble> list = byDayFlowUnscrambleService.selectByDayFlowUnscrambleList(byDayFlowUnscramble);
return getDataTable(list);
}
/**
* 导出一日流程解读列表
*/
@PreAuthorize("@ss.hasPermi('benyi:unscramble:export')")
@Log(title = "一日流程解读", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ByDayFlowUnscramble byDayFlowUnscramble)
{
List<ByDayFlowUnscramble> list = byDayFlowUnscrambleService.selectByDayFlowUnscrambleList(byDayFlowUnscramble);
ExcelUtil<ByDayFlowUnscramble> util = new ExcelUtil<ByDayFlowUnscramble>(ByDayFlowUnscramble.class);
return util.exportExcel(list, "unscramble");
}
/**
* 获取一日流程解读详细信息
*/
@PreAuthorize("@ss.hasPermi('benyi:unscramble:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(byDayFlowUnscrambleService.selectByDayFlowUnscrambleById(id));
}
/**
* 新增一日流程解读
*/
@PreAuthorize("@ss.hasPermi('benyi:unscramble:add')")
@Log(title = "一日流程解读", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ByDayFlowUnscramble byDayFlowUnscramble)
{
return toAjax(byDayFlowUnscrambleService.insertByDayFlowUnscramble(byDayFlowUnscramble));
}
/**
* 修改一日流程解读
*/
@PreAuthorize("@ss.hasPermi('benyi:unscramble:edit')")
@Log(title = "一日流程解读", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ByDayFlowUnscramble byDayFlowUnscramble)
{
return toAjax(byDayFlowUnscrambleService.updateByDayFlowUnscramble(byDayFlowUnscramble));
}
/**
* 删除一日流程解读
*/
@PreAuthorize("@ss.hasPermi('benyi:unscramble:remove')")
@Log(title = "一日流程解读", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(byDayFlowUnscrambleService.deleteByDayFlowUnscrambleByIds(ids));
}
}

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

@ -10,97 +10,119 @@ import java.util.Date;
/**
* 一日流程标准对象 by_day_flow_standard
*
*
* @author tsbz
* @date 2020-05-18
*/
public class ByDayFlowStandard extends BaseEntity
{
/** 标识 */
public class ByDayFlowStandard extends BaseEntity {
/**
* 标识
*/
private Long id;
/** 任务id */
/**
* 任务id
*/
@Excel(name = "任务id")
private Long taskCode;
/** 标准的名称 */
/**
* 标准的名称
*/
@Excel(name = "标准的名称")
private String standardTitle;
/** 标准排序 */
/**
* 标准排序
*/
@Excel(name = "标准排序")
private Long standardSort;
/** 创建人 */
/**
* 标准数量
*/
@Excel(name = "解读数量")
private Long unscrambleCount;
/**
* 创建人
*/
@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 = "更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updatetime;
public void setId(Long id)
{
public void setId(Long id) {
this.id = id;
}
public Long getId()
{
public Long getId() {
return id;
}
public void setTaskCode(Long taskCode)
{
public void setTaskCode(Long taskCode) {
this.taskCode = taskCode;
}
public Long getTaskCode()
{
public Long getTaskCode() {
return taskCode;
}
public void setStandardTitle(String standardTitle)
{
public void setStandardTitle(String standardTitle) {
this.standardTitle = standardTitle;
}
public String getStandardTitle()
{
public String getStandardTitle() {
return standardTitle;
}
public void setStandardSort(Long standardSort)
{
public void setStandardSort(Long standardSort) {
this.standardSort = standardSort;
}
public Long getStandardSort()
{
public Long getStandardSort() {
return standardSort;
}
public void setCreateuser(Long createuser)
{
public void setUnscrambleCount(Long unscrambleCount) {
this.unscrambleCount = unscrambleCount;
}
public Long getUnscrambleCount() {
return unscrambleCount;
}
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;
}
@ -122,16 +144,17 @@ public class ByDayFlowStandard extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("sid", getId())
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("sid", getId())
.append("taskCode", getTaskCode())
.append("standardTitle", getStandardTitle())
.append("standardSort", getStandardSort())
.append("unscrambleCount", getUnscrambleCount())
.append("createuser", getCreateuser())
.append("createtime", getCreatetime())
.append("updateuser", getUpdateuser())
.append("updatetime", getUpdatetime())
.toString();
.toString();
}
}

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

@ -37,6 +37,10 @@ public class ByDayFlowTask extends BaseEntity
@Excel(name = "任务排序")
private Integer taskSort;
/** 标准数量 */
@Excel(name = "标准数量")
private Long standardCount;
/** 标签 */
@Excel(name = "标签")
private String label;
@ -107,6 +111,16 @@ public class ByDayFlowTask extends BaseEntity
return taskSort;
}
public void setStandardCount(Long standardCount)
{
this.standardCount = standardCount;
}
public Long getStandardCount()
{
return standardCount;
}
public void setLabel(String label)
{
this.label = label;
@ -159,6 +173,7 @@ public class ByDayFlowTask extends BaseEntity
.append("detailId", getDetailId())
.append("taskContent", getTaskContent())
.append("taskSort", getTaskSort())
.append("standardCount", getStandardCount())
.append("label", getLabel())
.append("createuser", getCreateuser())
.append("updateuser", getUpdateuser())

98
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowUnscramble.java Normal file
View File

@ -0,0 +1,98 @@
package com.ruoyi.project.benyi.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
* 一日流程解读对象 by_day_flow_unscramble
*
* @author tsbz
* @date 2020-06-04
*/
public class ByDayFlowUnscramble extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 标识
*/
private Long id;
/**
* 标准id
*/
@Excel(name = "标准id")
private Long standardId;
/**
* 内容
*/
@Excel(name = "内容")
private String content;
/**
* 序号
*/
@Excel(name = "序号")
private Long sort;
/**
* 创建人
*/
@Excel(name = "创建人")
private Long createuserid;
public void setId(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
public void setStandardId(Long standardId) {
this.standardId = standardId;
}
public Long getStandardId() {
return standardId;
}
public void setContent(String content) {
this.content = content;
}
public String getContent() {
return content;
}
public void setSort(Long sort) {
this.sort = sort;
}
public Long getSort() {
return sort;
}
public void setCreateuserid(Long createuserid) {
this.createuserid = createuserid;
}
public Long getCreateuserid() {
return createuserid;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("standardId", getStandardId())
.append("content", getContent())
.append("sort", getSort())
.append("remark", getRemark())
.append("createuserid", getCreateuserid())
.append("createTime", getCreateTime())
.toString();
}
}

61
ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayFlowUnscrambleMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.ruoyi.project.benyi.mapper;
import java.util.List;
import com.ruoyi.project.benyi.domain.ByDayFlowUnscramble;
/**
* 一日流程解读Mapper接口
*
* @author tsbz
* @date 2020-06-04
*/
public interface ByDayFlowUnscrambleMapper
{
/**
* 查询一日流程解读
*
* @param id 一日流程解读ID
* @return 一日流程解读
*/
public ByDayFlowUnscramble selectByDayFlowUnscrambleById(Long id);
/**
* 查询一日流程解读列表
*
* @param byDayFlowUnscramble 一日流程解读
* @return 一日流程解读集合
*/
public List<ByDayFlowUnscramble> selectByDayFlowUnscrambleList(ByDayFlowUnscramble byDayFlowUnscramble);
/**
* 新增一日流程解读
*
* @param byDayFlowUnscramble 一日流程解读
* @return 结果
*/
public int insertByDayFlowUnscramble(ByDayFlowUnscramble byDayFlowUnscramble);
/**
* 修改一日流程解读
*
* @param byDayFlowUnscramble 一日流程解读
* @return 结果
*/
public int updateByDayFlowUnscramble(ByDayFlowUnscramble byDayFlowUnscramble);
/**
* 删除一日流程解读
*
* @param id 一日流程解读ID
* @return 结果
*/
public int deleteByDayFlowUnscrambleById(Long id);
/**
* 批量删除一日流程解读
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteByDayFlowUnscrambleByIds(Long[] ids);
}

61
ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayFlowUnscrambleService.java Normal file
View File

@ -0,0 +1,61 @@
package com.ruoyi.project.benyi.service;
import java.util.List;
import com.ruoyi.project.benyi.domain.ByDayFlowUnscramble;
/**
* 一日流程解读Service接口
*
* @author tsbz
* @date 2020-06-04
*/
public interface IByDayFlowUnscrambleService
{
/**
* 查询一日流程解读
*
* @param id 一日流程解读ID
* @return 一日流程解读
*/
public ByDayFlowUnscramble selectByDayFlowUnscrambleById(Long id);
/**
* 查询一日流程解读列表
*
* @param byDayFlowUnscramble 一日流程解读
* @return 一日流程解读集合
*/
public List<ByDayFlowUnscramble> selectByDayFlowUnscrambleList(ByDayFlowUnscramble byDayFlowUnscramble);
/**
* 新增一日流程解读
*
* @param byDayFlowUnscramble 一日流程解读
* @return 结果
*/
public int insertByDayFlowUnscramble(ByDayFlowUnscramble byDayFlowUnscramble);
/**
* 修改一日流程解读
*
* @param byDayFlowUnscramble 一日流程解读
* @return 结果
*/
public int updateByDayFlowUnscramble(ByDayFlowUnscramble byDayFlowUnscramble);
/**
* 批量删除一日流程解读
*
* @param ids 需要删除的一日流程解读ID
* @return 结果
*/
public int deleteByDayFlowUnscrambleByIds(Long[] ids);
/**
* 删除一日流程解读信息
*
* @param id 一日流程解读ID
* @return 结果
*/
public int deleteByDayFlowUnscrambleById(Long id);
}

89
ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayFlowUnscrambleServiceImpl.java Normal file
View File

@ -0,0 +1,89 @@
package com.ruoyi.project.benyi.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.benyi.mapper.ByDayFlowUnscrambleMapper;
import com.ruoyi.project.benyi.domain.ByDayFlowUnscramble;
import com.ruoyi.project.benyi.service.IByDayFlowUnscrambleService;
/**
* 一日流程解读Service业务层处理
*
* @author tsbz
* @date 2020-06-04
*/
@Service
public class ByDayFlowUnscrambleServiceImpl implements IByDayFlowUnscrambleService {
@Autowired
private ByDayFlowUnscrambleMapper byDayFlowUnscrambleMapper;
/**
* 查询一日流程解读
*
* @param id 一日流程解读ID
* @return 一日流程解读
*/
@Override
public ByDayFlowUnscramble selectByDayFlowUnscrambleById(Long id) {
return byDayFlowUnscrambleMapper.selectByDayFlowUnscrambleById(id);
}
/**
* 查询一日流程解读列表
*
* @param byDayFlowUnscramble 一日流程解读
* @return 一日流程解读
*/
@Override
public List<ByDayFlowUnscramble> selectByDayFlowUnscrambleList(ByDayFlowUnscramble byDayFlowUnscramble) {
return byDayFlowUnscrambleMapper.selectByDayFlowUnscrambleList(byDayFlowUnscramble);
}
/**
* 新增一日流程解读
*
* @param byDayFlowUnscramble 一日流程解读
* @return 结果
*/
@Override
public int insertByDayFlowUnscramble(ByDayFlowUnscramble byDayFlowUnscramble) {
byDayFlowUnscramble.setCreateTime(DateUtils.getNowDate());
return byDayFlowUnscrambleMapper.insertByDayFlowUnscramble(byDayFlowUnscramble);
}
/**
* 修改一日流程解读
*
* @param byDayFlowUnscramble 一日流程解读
* @return 结果
*/
@Override
public int updateByDayFlowUnscramble(ByDayFlowUnscramble byDayFlowUnscramble) {
return byDayFlowUnscrambleMapper.updateByDayFlowUnscramble(byDayFlowUnscramble);
}
/**
* 批量删除一日流程解读
*
* @param ids 需要删除的一日流程解读ID
* @return 结果
*/
@Override
public int deleteByDayFlowUnscrambleByIds(Long[] ids) {
return byDayFlowUnscrambleMapper.deleteByDayFlowUnscrambleByIds(ids);
}
/**
* 删除一日流程解读信息
*
* @param id 一日流程解读ID
* @return 结果
*/
@Override
public int deleteByDayFlowUnscrambleById(Long id) {
return byDayFlowUnscrambleMapper.deleteByDayFlowUnscrambleById(id);
}
}

60
ruoyi/src/main/resources/mybatis/benyi/ByDayFlowDetailMapper.xml
View File

@ -1,47 +1,47 @@
<?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.ByDayFlowDetailMapper">
<resultMap type="ByDayFlowDetail" id="ByDayFlowDetailResult">
<result property="id" column="id" />
<result property="sortNumber" column="sort_number" />
<result property="targetCount" column="target_count" />
<result property="name" column="name" />
<result property="content" column="content" />
<result property="note" column="note" />
<result property="flowType" column="flow_type" />
<result property="createUser" column="create_user" />
<result property="updateUser" column="update_user" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
<result property="id" column="id"/>
<result property="sortNumber" column="sort_number"/>
<result property="targetCount" column="target_count"/>
<result property="name" column="name"/>
<result property="content" column="content"/>
<result property="note" column="note"/>
<result property="flowType" column="flow_type"/>
<result property="createUser" column="create_user"/>
<result property="updateUser" column="update_user"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
<sql id="selectByDayFlowDetailVo">
select id, sort_number, target_count, name, content, note, flow_type, create_user, update_user, create_time, update_time
select id, sort_number, (select count(*) from by_day_flow_task where detail_id=id) target_count, name, content, note, flow_type, create_user, update_user, create_time, update_time
from by_day_flow_detail
</sql>
<select id="selectByDayFlowDetailList" parameterType="ByDayFlowDetail" resultMap="ByDayFlowDetailResult">
<include refid="selectByDayFlowDetailVo"/>
<where>
<if test="sortNumber != null "> and sort_number = #{sortNumber}</if>
<if test="targetCount != null "> and target_count = #{targetCount}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="content != null and content != ''"> and content = #{content}</if>
<if test="note != null and note != ''"> and note = #{note}</if>
<if test="flowType != null "> and flow_type = #{flowType}</if>
<if test="createUser != null "> and create_user = #{createUser}</if>
<if test="updateUser != null "> and update_user = #{updateUser}</if>
<where>
<if test="sortNumber != null ">and sort_number = #{sortNumber}</if>
<if test="targetCount != null ">and target_count = #{targetCount}</if>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="content != null and content != ''">and content = #{content}</if>
<if test="note != null and note != ''">and note = #{note}</if>
<if test="flowType != null ">and flow_type = #{flowType}</if>
<if test="createUser != null ">and create_user = #{createUser}</if>
<if test="updateUser != null ">and update_user = #{updateUser}</if>
</where>
</select>
<select id="selectByDayFlowDetailById" parameterType="Long" resultMap="ByDayFlowDetailResult">
<include refid="selectByDayFlowDetailVo"/>
where id = #{id}
</select>
<insert id="insertByDayFlowDetail" parameterType="ByDayFlowDetail" useGeneratedKeys="true" keyProperty="id">
insert into by_day_flow_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateUser != null ">update_user,</if>
<if test="createTime != null ">create_time,</if>
<if test="updateTime != null ">update_time,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sortNumber != null ">#{sortNumber},</if>
<if test="targetCount != null ">#{targetCount},</if>
@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateUser != null ">#{updateUser},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="updateTime != null ">#{updateTime},</if>
</trim>
</trim>
</insert>
<update id="updateByDayFlowDetail" parameterType="ByDayFlowDetail">
@ -92,10 +92,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteByDayFlowDetailByIds" parameterType="String">
delete from by_day_flow_detail where id in
delete from by_day_flow_detail where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

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

@ -1,34 +1,37 @@
<?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.ByDayFlowStandardMapper">
<resultMap type="ByDayFlowStandard" id="ByDayFlowStandardResult">
<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="createuser" column="createuser" />
<result property="createtime" column="createtime" />
<result property="updateuser" column="updateuser" />
<result property="updatetime" column="updatetime" />
<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="unscrambleCount" column="unscramble_count"/>
<result property="createuser" column="createuser"/>
<result property="createtime" column="createtime"/>
<result property="updateuser" column="updateuser"/>
<result property="updatetime" column="updatetime"/>
</resultMap>
<sql id="selectByDayFlowStandardVo">
select id, task_code, standard_title, standard_sort, createuser, createtime, updateuser, updatetime from by_day_flow_standard
select id, task_code, standard_title, standard_sort,(select count(*) from by_day_flow_unscramble where standard_id=by_day_flow_standard.id) unscramble_count, createuser, createtime, updateuser, updatetime from by_day_flow_standard
</sql>
<select id="selectByDayFlowStandardList" parameterType="ByDayFlowStandard" resultMap="ByDayFlowStandardResult">
<include refid="selectByDayFlowStandardVo"/>
<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="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="taskCode != null ">and task_code = #{taskCode}</if>
<if test="standardTitle != null and standardTitle != ''">and standard_title like concat('%',
#{standardTitle}, '%')
</if>
<if test="standardSort != null ">and standard_sort = #{standardSort}</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>
</where>
</select>

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

@ -10,6 +10,7 @@
<result property="detailId" column="detail_id" />
<result property="taskContent" column="task_content" />
<result property="taskSort" column="task_sort" />
<result property="standardCount" column="standard_count"/>
<result property="label" column="label" />
<result property="createuser" column="createuser" />
<result property="updateuser" column="updateuser" />
@ -19,7 +20,7 @@
</resultMap>
<sql id="selectByDayFlowTaskVo">
select code, task_lable, detail_id, task_content, task_sort, label, createuser, updateuser, createtime, updatetime, remark from by_day_flow_task
select code, task_lable, detail_id, task_content, task_sort,(select count(*) from by_day_flow_standard where task_code=code) standard_count, label, createuser, updateuser, createtime, updatetime, remark from by_day_flow_task
</sql>
<select id="selectByDayFlowTaskList" parameterType="ByDayFlowTask" resultMap="ByDayFlowTaskResult">

81
ruoyi/src/main/resources/mybatis/benyi/ByDayFlowUnscrambleMapper.xml Normal file
View File

@ -0,0 +1,81 @@
<?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.ruoyi.project.benyi.mapper.ByDayFlowUnscrambleMapper">
<resultMap type="ByDayFlowUnscramble" id="ByDayFlowUnscrambleResult">
<result property="id" column="id"/>
<result property="standardId" column="standard_id"/>
<result property="content" column="content"/>
<result property="sort" column="sort"/>
<result property="remark" column="remark"/>
<result property="createuserid" column="createuserid"/>
<result property="createTime" column="create_time"/>
</resultMap>
<sql id="selectByDayFlowUnscrambleVo">
select id, standard_id, content, sort, remark, createuserid, create_time from by_day_flow_unscramble
</sql>
<select id="selectByDayFlowUnscrambleList" parameterType="ByDayFlowUnscramble"
resultMap="ByDayFlowUnscrambleResult">
<include refid="selectByDayFlowUnscrambleVo"/>
<where>
<if test="standardId != null ">and standard_id = #{standardId}</if>
<if test="content != null and content != ''">and content = #{content}</if>
<if test="sort != null ">and sort = #{sort}</if>
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
</where>
</select>
<select id="selectByDayFlowUnscrambleById" parameterType="Long" resultMap="ByDayFlowUnscrambleResult">
<include refid="selectByDayFlowUnscrambleVo"/>
where id = #{id}
</select>
<insert id="insertByDayFlowUnscramble" parameterType="ByDayFlowUnscramble" useGeneratedKeys="true" keyProperty="id">
insert into by_day_flow_unscramble
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="standardId != null ">standard_id,</if>
<if test="content != null and content != ''">content,</if>
<if test="sort != null ">sort,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createuserid != null ">createuserid,</if>
<if test="createTime != null ">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="standardId != null ">#{standardId},</if>
<if test="content != null and content != ''">#{content},</if>
<if test="sort != null ">#{sort},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createuserid != null ">#{createuserid},</if>
<if test="createTime != null ">#{createTime},</if>
</trim>
</insert>
<update id="updateByDayFlowUnscramble" parameterType="ByDayFlowUnscramble">
update by_day_flow_unscramble
<trim prefix="SET" suffixOverrides=",">
<if test="standardId != null ">standard_id = #{standardId},</if>
<if test="content != null and content != ''">content = #{content},</if>
<if test="sort != null ">sort = #{sort},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="createuserid != null ">createuserid = #{createuserid},</if>
<if test="createTime != null ">create_time = #{createTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteByDayFlowUnscrambleById" parameterType="Long">
delete from by_day_flow_unscramble where id = #{id}
</delete>
<delete id="deleteByDayFlowUnscrambleByIds" parameterType="String">
delete from by_day_flow_unscramble where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>