From fd9fe5a830ff7cd1aa2a1133fef3ddb5eeb5c93b Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Fri, 9 Apr 2021 16:55:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B5=81=E7=A8=8B=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E4=B8=AA=E4=BA=BA=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/benyi/dayflowassessment.js   |   9 +
 .../views/benyi/dayflowassessment/index.vue   |   4 -
 .../benyi/dayflowassessmentmyself/index.vue   | 255 ++++++++++++++++++
 .../ByDayflowassessmentController.java        |  14 +-
 .../impl/ByDayflowassessmentServiceImpl.java  |   2 +
 .../benyi/ByDayflowassessmentMapper.xml       |  41 +--
 6 files changed, 300 insertions(+), 25 deletions(-)
 create mode 100644 ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue

diff --git a/ruoyi-ui/src/api/benyi/dayflowassessment.js b/ruoyi-ui/src/api/benyi/dayflowassessment.js
index 2332b7d42..62b3da561 100644
--- a/ruoyi-ui/src/api/benyi/dayflowassessment.js
+++ b/ruoyi-ui/src/api/benyi/dayflowassessment.js
@@ -9,6 +9,15 @@ export function listDayflowassessment(query) {
   });
 }
 
+// 查询幼儿园一日流程评估列表
+export function listDayflowassessmentmyself(query) {
+  return request({
+    url: "/benyi/dayflowassessment/listmyself",
+    method: "get",
+    params: query
+  });
+}
+
 // 查询幼儿园一日流程评估详细
 export function getDayflowassessment(id) {
   return request({
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
index 78810fcfc..2691d9b2d 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
@@ -169,10 +169,6 @@ import {
   getDayflowassessment,
   delDayflowassessment,
 } from "@/api/benyi/dayflowassessment";
-import {
-  listDayflowassessmentplan,
-  getDayflowassessmentplan,
-} from "@/api/benyi/dayflowassessmentplan";
 import { listClass } from "@/api/system/class";
 import { listUser } from "@/api/system/user";
 import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue
new file mode 100644
index 000000000..446f476b3
--- /dev/null
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue
@@ -0,0 +1,255 @@
+<template>
+  <div class="app-container">
+
+    <el-table
+      v-loading="loading"
+      :data="dayflowassessmentList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="所属计划" align="center" prop="planid" :formatter="planFormat"/> -->
+      <el-table-column
+        label="学年学期"
+        align="center"
+        prop="xnxq"
+        :formatter="xnxqFormat"
+      />
+      <el-table-column
+        label="班级名称"
+        align="center"
+        prop="classid"
+        :formatter="classFormat"
+      />
+      <!-- <el-table-column label="班级平均分" align="center" prop="classdf" /> -->
+      <!-- <el-table-column
+        label="主班教师"
+        align="center"
+        prop="bzbh"
+        :formatter="bzbhFormat"
+      />
+      <el-table-column
+        label="配班教师"
+        align="center"
+        prop="pbbh"
+        :formatter="pbbhFormat"
+      />
+      <el-table-column
+        label="助理教师"
+        align="center"
+        prop="zlbh"
+        :formatter="zlbhFormat"
+      /> -->
+      <el-table-column
+        label="评估对象"
+        align="center"
+        prop="pgdx"
+        :formatter="pgdxFormat"
+      />
+      <!-- <el-table-column
+        label="评估环节"
+        align="center"
+        prop="bzid"
+        :formatter="dayFlowFormat"
+      />
+      <el-table-column label="环节满分" align="center" prop="bzmf" /> -->
+      <!-- <el-table-column label="扣分值" align="center" prop="kfz" /> -->
+      <!-- <el-table-column label="扣分次数" align="center" prop="kfcs" /> -->
+      <el-table-column label="最终得分" align="center" prop="zzdf" />
+      <el-table-column
+        label="评估人"
+        align="center"
+        prop="createUserid"
+        :formatter="createUserFormat"
+      />
+      <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
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleAssessment(scope.row)"
+            v-hasPermi="['benyi:dayflowassessment:query']"
+            >详情</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['benyi:dayflowassessment:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import {
+  listDayflowassessmentmyself
+} from "@/api/benyi/dayflowassessment";
+import { listClass } from "@/api/system/class";
+import { listUser } from "@/api/system/user";
+import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
+
+export default {
+  name: "Dayflowassessment",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 幼儿园一日流程评估表格数据
+      dayflowassessmentList: [],
+      // 班级
+      classOptions: [],
+      // 学年学期
+      xnxqOptions: [],
+      // 所有教师
+      userOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        planid: undefined,
+        deptId: undefined,
+        classid: undefined,
+        bzbh: undefined,
+        bzxm: undefined,
+        pbbh: undefined,
+        pbxm: undefined,
+        zlbh: undefined,
+        zlxm: undefined,
+        xnxq: undefined,
+        bzid: undefined,
+        kfz: undefined,
+        bzmf: undefined,
+        zzdf: undefined,
+        kfcs: undefined,
+        pgdx: undefined,
+        classdf: undefined,
+        createUserid: undefined,
+      },
+      // 表单参数
+      form: {},
+    };
+  },
+  created() {
+    this.getList();
+    this.getClassList();
+    this.getUserList();
+    // 获取学年学期
+    this.getDicts("sys_xnxq").then((response) => {
+      this.xnxqOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询幼儿园一日流程评估列表 */
+    getList() {
+      this.loading = true;
+      listDayflowassessmentmyself(this.queryParams).then((response) => {
+        this.dayflowassessmentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 获取班级列表
+    getClassList() {
+      listClass(null).then((response) => {
+        this.classOptions = response.rows;
+      });
+    },
+    // 班级字典翻译
+    classFormat(row, column) {
+      var actions = [];
+      var datas = this.classOptions;
+      Object.keys(datas).map((key) => {
+        if (datas[key].bjbh == "" + row.classid) {
+          actions.push(datas[key].bjmc);
+          return false;
+        }
+      });
+      return actions.join("");
+    },
+    // 学年学期类型--字典状态字典翻译
+    xnxqFormat(row, column) {
+      return this.selectDictLabel(this.xnxqOptions, row.xnxq);
+    },
+    /** 查询用户列表 */
+    getUserList() {
+      listUser(null).then((response) => {
+        this.userOptions = response.rows;
+      });
+    },
+    // 教师字典翻译
+    pgdxFormat(row, column) {
+      var actions = [];
+      var datas = this.userOptions;
+      Object.keys(datas).map((key) => {
+        if (datas[key].userId == "" + row.pgdx) {
+          actions.push(datas[key].nickName);
+          return false;
+        }
+      });
+      return actions.join("");
+    },
+    // 教师字典翻译
+    createUserFormat(row, column) {
+      var actions = [];
+      var datas = this.userOptions;
+      Object.keys(datas).map((key) => {
+        if (datas[key].userId == "" + row.createUserid) {
+          actions.push(datas[key].nickName);
+          return false;
+        }
+      });
+      return actions.join("");
+    },
+    // 学年学期类型--字典状态字典翻译
+    xnxqFormat(row, column) {
+      return this.selectDictLabel(this.xnxqOptions, row.xnxq);
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    handleAssessment(row) {
+      const id = row.id;
+      this.$router.push({ path: "/benyi/dayflowassessments/details/" + id });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
index 231e20a00..47b9c1f2f 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
@@ -48,7 +48,19 @@ public class ByDayflowassessmentController extends BaseController {
     @PreAuthorize("@ss.hasPermi('benyi:dayflowassessment:list')")
     @GetMapping("/list")
     public TableDataInfo list(ByDayflowassessment byDayflowassessment) {
-        byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
+//        byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
+        startPage();
+        List<ByDayflowassessment> list = byDayflowassessmentService.selectByDayflowassessmentList(byDayflowassessment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询幼儿园一日流程评估列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:dayflowassessment:list')")
+    @GetMapping("/listmyself")
+    public TableDataInfo listmyself(ByDayflowassessment byDayflowassessment) {
+        byDayflowassessment.setPgdx(SecurityUtils.getLoginUser().getUser().getUserId());
         startPage();
         List<ByDayflowassessment> list = byDayflowassessmentService.selectByDayflowassessmentList(byDayflowassessment);
         return getDataTable(list);
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java
index 11f3ab993..544066a73 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.project.benyi.service.impl;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.benyi.mapper.ByDayflowassessmentMapper;
@@ -38,6 +39,7 @@ public class ByDayflowassessmentServiceImpl implements IByDayflowassessmentServi
      * @return 幼儿园一日流程评估
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<ByDayflowassessment> selectByDayflowassessmentList(ByDayflowassessment byDayflowassessment) {
         return byDayflowassessmentMapper.selectByDayflowassessmentList(byDayflowassessment);
     }
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
index 6726bd91e..ea48d60a9 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
@@ -31,37 +31,38 @@
     </resultMap>
 
     <sql id="selectByDayflowassessmentVo">
-        select id, planid, dept_id, classid, bzbh, bzxm, pbbh, pbxm, zlbh, zlxm, xnxq, bzid, bzmf, kfz, kfcs, zzdf, classdf, items, 'values', pgdx, pgdxxm, create_userid, create_time from by_dayflowassessment
+        select d.id, d.planid, d.dept_id, d.classid, d.bzbh, d.bzxm, d.pbbh, d.pbxm, d.zlbh, d.zlxm, d.xnxq, d.bzid, d.bzmf, d.kfz, d.kfcs, d.zzdf, d.classdf, d.items, d.values, d.pgdx, d.pgdxxm, d.create_userid, d.create_time from by_dayflowassessment d
     </sql>
 
     <select id="selectByDayflowassessmentList" parameterType="ByDayflowassessment"
             resultMap="ByDayflowassessmentResult">
         <include refid="selectByDayflowassessmentVo"/>
         <where>
-            <if test="planid != null ">and planid = #{planid}</if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="classid != null  and classid != ''">and classid = #{classid}</if>
-            <if test="bzbh != null ">and bzbh = #{bzbh}</if>
-            <if test="bzxm != null  and bzxm != ''">and bzxm = #{bzxm}</if>
-            <if test="pbbh != null ">and pbbh = #{pbbh}</if>
-            <if test="pbxm != null  and pbxm != ''">and pbxm = #{pbxm}</if>
-            <if test="zlbh != null ">and zlbh = #{zlbh}</if>
-            <if test="zlxm != null  and zlxm != ''">and zlxm = #{zlxm}</if>
-            <if test="xnxq != null  and xnxq != ''">and xnxq = #{xnxq}</if>
-            <if test="bzid != null ">and bzid = #{bzid}</if>
-            <if test="kfz != null ">and kfz = #{kfz}</if>
-            <if test="classdf != null ">and classdf = #{classdf}</if>
-            <if test="bzmf != null ">and bzmf = #{bzmf}</if>
-            <if test="zzdf != null ">and zzdf = #{zzdf}</if>
-            <if test="kfcs != null ">and kfcs = #{kfcs}</if>
-            <if test="pgdx != null ">and pgdx = #{pgdx}</if>
-            <if test="createUserid != null ">and create_userid = #{createUserid}</if>
+            <if test="planid != null ">and d.planid = #{planid}</if>
+            <if test="classid != null  and classid != ''">and d.classid = #{classid}</if>
+            <if test="bzbh != null ">and d.bzbh = #{bzbh}</if>
+            <if test="bzxm != null  and bzxm != ''">and d.bzxm = #{bzxm}</if>
+            <if test="pbbh != null ">and d.pbbh = #{pbbh}</if>
+            <if test="pbxm != null  and pbxm != ''">and d.pbxm = #{pbxm}</if>
+            <if test="zlbh != null ">and d.zlbh = #{zlbh}</if>
+            <if test="zlxm != null  and zlxm != ''">and d.zlxm = #{zlxm}</if>
+            <if test="xnxq != null  and xnxq != ''">and d.xnxq = #{xnxq}</if>
+            <if test="bzid != null ">and d.bzid = #{bzid}</if>
+            <if test="kfz != null ">and d.kfz = #{kfz}</if>
+            <if test="classdf != null ">and d.classdf = #{classdf}</if>
+            <if test="bzmf != null ">and d.bzmf = #{bzmf}</if>
+            <if test="zzdf != null ">and d.zzdf = #{zzdf}</if>
+            <if test="kfcs != null ">and d.kfcs = #{kfcs}</if>
+            <if test="pgdx != null ">and d.pgdx = #{pgdx}</if>
+            <if test="createUserid != null ">and d.create_userid = #{createUserid}</if>
+            <!-- 数据范围过滤 -->
+            ${dataScope}
         </where>
     </select>
 
     <select id="selectByDayflowassessmentById" parameterType="Long" resultMap="ByDayflowassessmentResult">
         <include refid="selectByDayflowassessmentVo"/>
-        where id = #{id}
+        where d.id = #{id}
     </select>
 
     <insert id="insertByDayflowassessment" parameterType="ByDayflowassessment" useGeneratedKeys="true" keyProperty="id">