From 78433edda92cdc7427a4f00162e020350b0aac8b Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Wed, 3 Jun 2020 18:11:31 +0800
Subject: [PATCH] =?UTF-8?q?20200603-zlp-1=20=E4=B8=80=E6=97=A5=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/Editor/index.vue      |   2 +-
 ruoyi-ui/src/views/benyi/dayflow/index.vue    |  42 ++---
 ruoyi-ui/src/views/benyi/dayflow/standard.vue |  56 +------
 ruoyi-ui/src/views/benyi/dayflow/task.vue     | 127 +++++++-------
 .../benyi/domain/ByDayFlowStandard.java       | 155 +++++-------------
 .../project/benyi/domain/ByDayFlowTask.java   | 126 +++++---------
 .../mybatis/benyi/ByDayFlowStandardMapper.xml |  78 +++------
 .../mybatis/benyi/ByDayFlowTaskMapper.xml     |  65 +++-----
 8 files changed, 213 insertions(+), 438 deletions(-)

diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 56151f428..babe03440 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -147,7 +147,7 @@ export default {
 <style>
 .editor {
   line-height: normal !important;
-  height: 192px;
+  /* height: 192px; */
 }
 .quill-img {
   display: none;
diff --git a/ruoyi-ui/src/views/benyi/dayflow/index.vue b/ruoyi-ui/src/views/benyi/dayflow/index.vue
index 28db9e6de..617cd4af0 100644
--- a/ruoyi-ui/src/views/benyi/dayflow/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflow/index.vue
@@ -56,27 +56,21 @@
           v-hasPermi="['benyi:dayflowmanger:remove']"
         >删除</el-button>
       </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-table v-loading="loading" :data="detailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="流程ID" align="center" prop="id" />
       <el-table-column label="流程名称" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope" >
-          <router-link :to="'/dayflow/dayflowmanger/dayflowtask/' + scope.row.id" class="link-dayflow">
+        <template slot-scope="scope">
+          <router-link
+            :to="'/dayflow/dayflowmanger/dayflowtask/' + scope.row.id"
+            class="link-dayflow"
+          >
             <span>{{ scope.row.name }}</span>
           </router-link>
         </template>
-      </el-table-column>  
+      </el-table-column>
       <el-table-column label="流程序号" align="center" prop="sortNumber" />
       <el-table-column label="流程任务数量" align="center" prop="targetCount" />
       <el-table-column label="类型" align="center" prop="flowType" :formatter="dayflowtypeFormat" />
@@ -128,11 +122,12 @@
               v-for="dict in dayflowtypeOptions"
               :key="dict.dictValue"
               :label="dict.dictLabel"
+              :value="dict.dictValue"
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="导言" prop="content">
-          <el-input v-model="form.content" type="textarea" placeholder="请输入导言" />
+        <el-form-item label="导言" prop="content">          
+           <Editor v-model="form.content" />
         </el-form-item>
 
         <el-form-item label="目的" prop="note">
@@ -153,8 +148,7 @@ import {
   getDetail,
   delDetail,
   addDetail,
-  updateDetail,
-  exportDetail
+  updateDetail
 } from "@/api/benyi/dayflow/dayflowmanger";
 import Editor from "@/components/Editor";
 
@@ -330,22 +324,6 @@ export default {
           this.msgSuccess("删除成功");
         })
         .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() {});
     }
   }
 };
diff --git a/ruoyi-ui/src/views/benyi/dayflow/standard.vue b/ruoyi-ui/src/views/benyi/dayflow/standard.vue
index 6202a12dd..3a5180269 100644
--- a/ruoyi-ui/src/views/benyi/dayflow/standard.vue
+++ b/ruoyi-ui/src/views/benyi/dayflow/standard.vue
@@ -56,15 +56,6 @@
           v-hasPermi="['benyi:standard:remove']"
         >删除</el-button>
       </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-table v-loading="loading" :data="standardList" @selection-change="handleSelectionChange">
@@ -161,8 +152,7 @@ import {
   getStandard,
   delStandard,
   addStandard,
-  updateStandard,
-  exportStandard
+  updateStandard
 } from "@/api/benyi/dayflow/biaozhun/standard";
 import {
   listDayflowtask,
@@ -387,49 +377,7 @@ export default {
           this.msgSuccess("删除成功");
         })
         .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>
-
-<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>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/dayflow/task.vue b/ruoyi-ui/src/views/benyi/dayflow/task.vue
index e151213a9..231ebb447 100644
--- a/ruoyi-ui/src/views/benyi/dayflow/task.vue
+++ b/ruoyi-ui/src/views/benyi/dayflow/task.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-      <el-form-item label="流程名称" prop="detailName">
-        <el-select v-model="queryParams.detailName" size="small">
+      <el-form-item label="流程名称" prop="detailId">
+        <el-select v-model="queryParams.detailId" size="small">
           <el-option
             v-for="item in detailOptions"
             :key="item.id"
             :label="item.name"
-            :value="item.name"
+            :value="item.id"
           />
         </el-select>
       </el-form-item>
@@ -56,31 +56,29 @@
           v-hasPermi="['benyi:dayflowtask:remove']"
         >删除</el-button>
       </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-table v-loading="loading" :data="dayflowtaskList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务名称" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope" >
-          <router-link :to="'/dayflow/dayflowmanger/dayflowtask/standard/' + scope.row.code" class="link-dayflow">
+        <template slot-scope="scope">
+          <router-link
+            :to="'/dayflow/dayflowmanger/dayflowtask/standard/' + scope.row.code"
+            class="link-dayflow"
+          >
             <span>{{ scope.row.taskLable }}</span>
           </router-link>
         </template>
       </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="createtime" />
-      <el-table-column label="更新时间" align="center" prop="updatetime" />
       <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">
         <template slot-scope="scope">
           <el-button
@@ -100,7 +98,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -112,15 +110,19 @@
     <!-- 添加或修改一日流程任务对话框 -->
     <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="detailName" >
-          <el-input v-model="form.detailName" :disabled="true" />
+        <el-form-item label="流程名称" prop="detailId">
+          <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 label="任务名称" prop="taskLable">
           <el-input v-model="form.taskLable" placeholder="请输入任务名称" />
         </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-input v-model="form.taskContent" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -140,8 +142,14 @@
 </template>
 
 <script>
-import { listDayflowtask, getDayflowtask, delDayflowtask, addDayflowtask, updateDayflowtask, exportDayflowtask } from "@/api/benyi/dayflow/dayflowtask";
-import {listDetail, getDetail} from "@/api/benyi/dayflow/dayflowmanger";
+import {
+  listDayflowtask,
+  getDayflowtask,
+  delDayflowtask,
+  addDayflowtask,
+  updateDayflowtask
+} from "@/api/benyi/dayflow/dayflowtask";
+import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
 
 export default {
   name: "Dayflowtask",
@@ -172,15 +180,11 @@ export default {
         pageNum: 1,
         pageSize: 10,
         taskLable: undefined,
-        taskValue: undefined,
-        detailName: undefined,
-        taskTarget: undefined,
+        detailId: undefined,
         taskContent: undefined,
-        taskSort: undefined,
-        cssClass: undefined,
-        listClass: undefined,
+        taskSort: null,
         createuser: undefined,
-        updateuser: undefined,
+        updateuser: undefined
       },
       // 表单参数
       form: {},
@@ -189,6 +193,9 @@ export default {
         taskLable: [
           { required: true, message: "任务名称(标签)不能为空", trigger: "blur" }
         ],
+        taskSort: [
+           { required: true, message: "任务排序不能为空", trigger: "blur" }
+        ]
       }
     };
   },
@@ -202,16 +209,17 @@ export default {
     /**查询流程名称详细 */
     getDetail(detailId) {
       getDetail(detailId).then(response => {
-        this.queryParams.detailName = response.data.name;
-        this.defaultDetailName = response.data.name;
+        console.log(response.data);
+        this.queryParams.detailId = response.data.id;
+        this.defaultDetailName = response.data.id;
         this.getList();
-      })
+      });
     },
     /**查询流程名称列表 */
     getDetailList() {
       listDetail().then(response => {
         this.detailOptions = response.rows;
-      })
+      });
     },
     /** 查询一日流程任务列表 */
     getList() {
@@ -233,12 +241,9 @@ export default {
         code: undefined,
         taskLable: undefined,
         taskValue: undefined,
-        detailName: undefined,
-        taskTarget: undefined,
+        detailId: undefined,
         taskContent: undefined,
-        taskSort: undefined,
-        cssClass: undefined,
-        listClass: undefined,
+        taskSort: 0,
         createuser: undefined,
         updateuser: undefined,
         createtime: undefined,
@@ -255,14 +260,14 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.detailName = this.defaultDetailName;
+      this.queryParams.detailId = this.defaultDetailName;
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.codes = selection.map(item => item.code)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
+      this.codes = selection.map(item => item.code);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -270,12 +275,12 @@ export default {
       this.open = true;
       this.title = "添加一日流程任务";
       //有可能是name
-      this.form.detailName = this.queryParams.detailName;
+      this.form.detailId = this.queryParams.detailId;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const code = row.code || this.codes
+      const code = row.code || this.codes;
       getDayflowtask(code).then(response => {
         this.form = response.data;
         this.open = true;
@@ -313,29 +318,23 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const codes = row.code || this.codes;
-      this.$confirm('是否确认删除一日流程任务编号为"' + codes + '"的数据项?', "警告", {
+      this.$confirm(
+        '是否确认删除一日流程任务编号为"' + codes + '"的数据项?',
+        "警告",
+        {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        }).then(function() {
+        }
+      )
+        .then(function() {
           return delDayflowtask(codes);
-        }).then(() => {
+        })
+        .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        }).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() {});
+        })
+        .catch(function() {});
     }
   }
 };
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java
index fdd8e0de5..ead1cab65 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java
@@ -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();
+    }
+
 }
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowTask.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowTask.java
index a83f32292..155031a5e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowTask.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowTask.java
@@ -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();
+    }
+
 }
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml
index d0c79de22..6b6309bb8 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml
@@ -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>
\ No newline at end of file
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowTaskMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowTaskMapper.xml
index 52bddb8c7..4234935ee 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowTaskMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowTaskMapper.xml
@@ -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>
\ No newline at end of file