一日流程评估详情和计划修改

2021-04-09 15:00:10 +08:00 · 2021-04-09 15:00:10 +08:00 · fd6a5bfa6c
commit fd6a5bfa6c
parent 7682ce5795
11 changed files with 393 additions and 91 deletions
--- a/ruoyi-ui/src/api/benyi/dayflow/biaozhun/standard.js
+++ b/ruoyi-ui/src/api/benyi/dayflow/biaozhun/standard.js
@ -9,6 +9,15 @@ export function listStandard(query) {
    })
 }

+// 查询一日流程标准列表
+export function listStandardAssessment(query) {
+    return request({
+        url: '/benyi/dayflow/biaozhun/standard/listassessment',
+        method: 'get',
+        params: query
+    })
+}
+
 // 查询一日流程标准详细
 export function getStandard(sid) {
    return request({
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@ -463,6 +463,21 @@ export const constantRoutes = [{
            component: () =>
                import ('@/views/benyi/dayflowassessment/teacher'),
            name: 'dayflowassessmentteacher',
+            meta: {
+                title: '一日流程评估',
+                icon: ''
+            }
+        }]
+    },
+    {
+        path: '/benyi/dayflowassessments',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: 'details/:id(\\d+)',
+            component: () =>
+                import ('@/views/benyi/dayflowassessment/details'),
+            name: 'dayflowassessmentteacherdetails',
            meta: {
                title: '一日流程评估详情',
                icon: ''
--- a/ruoyi-ui/src/views/benyi/dayflowassessment/details.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessment/details.vue
@ -0,0 +1,293 @@
+<template>
+  <div class="app-container">
+    <div class="flex align-center justify-between student-main-title">
+      <p class="title flex align-center">
+        <span>班级：{{ classFormat(this.classid) }} </span>
+        <span> 评估对象：{{ pgdxFormat(this.pgdx) }} </span>
+        <span> 评估时间：{{ this.createtime }} </span>
+        <span> 得分：{{ this.df }} </span>
+      </p>
+    </div>
+    <el-tabs v-model="activeName" type="card">
+      <el-tab-pane
+        v-for="item in detailOptions"
+        :key="item.id"
+        :label="item.name"
+        :name="item.name"
+      >
+        <div
+          class="block"
+          v-for="itemTask in dayflowtaskList.filter(
+            (p) => p.detailId == item.id
+          )"
+          :key="itemTask.code"
+        >
+          <h2 class="block-item-title flex align-center">
+            {{ itemTask.taskLable }}
+          </h2>
+          <div
+            class="checkbox-content"
+            v-for="(itemBz, index) in dayflowstandardList.filter(
+              (p) => p.taskCode == itemTask.code
+            )"
+            :key="itemBz.id"
+          >
+            <div
+              class="checkbox-item flex align-center justify-between"
+              :class="{ line: index !== 0 }"
+            >
+              <p class="left-info">
+                {{ itemBz.standardTitle }}
+              </p>
+              <div class="right-number flex align-center justify-end">
+                <span>分值: {{ itemBz.score }}分</span>
+                <el-input-number
+                  class="number-input"
+                  v-model="itemBz.mrz"
+                  :precision="2"
+                  :step="0.1"
+                  :max="itemBz.score"
+                  :disabled="true"
+                ></el-input-number>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script>
+import {
+  listDayflowassessment,
+  getDayflowassessment,
+  addDayflowassessment,
+} from "@/api/benyi/dayflowassessment";
+import { listDayflowtask } from "@/api/benyi/dayflow/dayflowtask";
+import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
+import { listStandardAssessment } from "@/api/benyi/dayflow/biaozhun/standard";
+import { listDept, getDept } from "@/api/system/dept";
+import { listClass, getUserList } from "@/api/system/class";
+import { listUser } from "@/api/system/user";
+
+export default {
+  name: "Assessmentstudentdetails",
+  data() {
+    return {
+      id: "",
+      classid: "",
+      pgdx: "",
+      createtime: "",
+      df: "",
+      // 遮罩层
+      loading: false,
+      // 根据一日流程id查到的名下任务列表
+      dayflowtaskList: [],
+      // 根据任务查询到名下标准
+      dayflowstandardList: [],
+      //班级
+      classOptions: [],
+      //用户
+      userOptions: [],
+      //评估对象
+      pgdxOptions: [],
+      // 一日流程表格数据
+      detailOptions: [],
+      // 查询一日流程标准
+      queryParams_standard: {
+        id: undefined,
+      },
+      // 查询参数
+      queryParams: {
+        parentid: undefined,
+        name: undefined,
+        iselement: undefined,
+        scope: undefined,
+        sort: undefined,
+      },
+      activeName: "早间接待",
+    };
+  },
+  created() {
+    this.id = this.$route.params && this.$route.params.id;
+    this.queryParams_standard.id = this.id;
+    this.getDetail();
+    this.getClassList();
+    this.getUserList();
+    this.getDayFlowList();
+    this.getTaskList();
+  },
+  methods: {
+    getDetail() {
+      getDayflowassessment(this.id).then((response) => {
+        //console.log(response);
+        this.classid = response.data.classid;
+        this.pgdx = response.data.pgdx;
+        this.createtime = response.data.createTime;
+        this.df = response.data.zzdf;
+      });
+    },
+    /** 查询一日流程列表 */
+    getDayFlowList() {
+      listDetail(null).then((response) => {
+        this.detailOptions = response.rows;
+      });
+    },
+    // 班级字典翻译
+    classFormat(classid) {
+      var actions = [];
+      var datas = this.classOptions;
+      Object.keys(datas).map((key) => {
+        if (datas[key].bjbh == "" + classid) {
+          actions.push(datas[key].bjmc);
+          return false;
+        }
+      });
+      return actions.join("");
+    },
+    /** 查询用户列表 */
+    getUserList() {
+      listUser(null).then((response) => {
+        this.userOptions = response.rows;
+      });
+    },
+    // 教师字典翻译
+    pgdxFormat(pgdx) {
+      var actions = [];
+      var datas = this.userOptions;
+      Object.keys(datas).map((key) => {
+        if (datas[key].userId == "" + pgdx) {
+          actions.push(datas[key].nickName);
+          return false;
+        }
+      });
+      return actions.join("");
+    },
+    //班级列表
+    getClassList() {
+      listClass(null).then((response) => {
+        this.classOptions = response.rows;
+      });
+    },
+    //班级列表
+    getUserListByBjbh(val) {
+      getUserList(val).then((response) => {
+        this.pgdxOptions = response.rows;
+      });
+    },
+    /** 查询一日流程任务列表 */
+    getTaskList() {
+      listDayflowtask(null).then((response) => {
+        this.dayflowtaskList = response.rows;
+      });
+      listStandardAssessment(this.queryParams_standard).then((response) => {
+        this.dayflowstandardList = response.rows;
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+// 禁止复制
+div {
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.title {
+  padding: 10px 0;
+  font-weight: 600;
+  flex-wrap: wrap;
+  padding-right: 10px;
+  line-height: 20px;
+  span {
+    font-size: 16px;
+    padding: 0 4px;
+    // &:nth-of-type(2) {
+    //   font-size: 14px;
+    //   font-weight: normal;
+    // }
+  }
+}
+.number-input {
+  width: 120px;
+}
+
+.block {
+  padding: 10px;
+  color: #333;
+
+  .block-item-title {
+    padding: 10px 0;
+    margin: 0;
+    font-size: 16px;
+    font-weight: 500;
+    &::before {
+      content: "";
+      margin-right: 8px;
+      width: 4px;
+      height: 14px;
+      background: #1890ff;
+    }
+  }
+  .checkbox-item {
+    padding: 6px 0;
+    &.line {
+      border-top: 1px solid #dadada;
+    }
+    .left-info {
+      line-height: 22px;
+    }
+    .right-number {
+      flex: 0 0 205px;
+    }
+  }
+
+  .block-content {
+    border-radius: 5px;
+    padding: 10px;
+    background: #fcfcfc;
+    .block-content-title {
+      font-size: 14px;
+      font-weight: bold;
+      line-height: 24px;
+      padding-bottom: 5px;
+      .num {
+        font-size: 16px;
+      }
+    }
+    .checkbox-content {
+      padding-left: 20px;
+      margin-bottom: 15px;
+    }
+    .checkbox-item {
+      font-size: 14px;
+      line-height: 22px;
+    }
+    .check-info {
+      padding-left: 24px;
+      line-height: 18px;
+      font-size: 12px;
+      color: #999;
+      p {
+        padding-left: 10px;
+      }
+    }
+    .el-checkbox {
+      display: flex;
+      white-space: normal;
+      .el-checkbox__input {
+        margin-top: 2px;
+      }
+    }
+  }
+}
+@media (max-width: 768.98px) {
+  .title span {
+    font-size: 12px;
+  }
+}
+</style>
--- a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
@ -319,7 +319,7 @@ export default {
    },
    handleAssessment(row) {
      const id = row.id;
-      this.$router.push({ path: "/benyi/dayflowassessment/teacher/" + id });
+      this.$router.push({ path: "/benyi/dayflowassessments/details/" + id });
    },
    handleAdd() {
      this.$router.push({ path: "/benyi/dayflowassessment/teacher" });
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java
@ -48,6 +48,13 @@ public class ByDayFlowStandardController extends BaseController
        return getDataTable(list);
    }

+    @GetMapping("/listassessment")
+    public TableDataInfo listassessment(ByDayFlowStandard byDayFlowStandard)
+    {
+        List<ByDayFlowStandard> list = byDayFlowStandardService.selectByDayFlowStandardListAssessment(byDayFlowStandard);
+        return getDataTable(list);
+    }
+
    /**
     * 导出一日流程标准列表
     */
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
@ -85,6 +85,8 @@ public class ByDayflowassessmentController extends BaseController {
        byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
        byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
        byDayflowassessment.setXnxq(schoolCommon.getCurrentXnXq());
+        //获取总得分
+        byDayflowassessment.setZzdf(GetDf(byDayflowassessment.getList()));
        int iRows = byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);

        List<ByDayFlowStandard> list = byDayflowassessment.getList();
@ -110,6 +112,22 @@ public class ByDayflowassessmentController extends BaseController {
        return toAjax(iRows);
    }

+    public Double GetDf(List<ByDayFlowStandard> list) {
+        Double df = (double) 0;
+        if (list != null && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                String mrz = list.get(i).getMrz();
+                if (mrz != "0" && !schoolCommon.isStringEmpty(mrz)) {
+                    Double dMrz = Double.valueOf(mrz);
+                    if (dMrz != 0) {
+                        df = df + dMrz;
+                    }
+                }
+            }
+        }
+        return df;
+    }
+
    /**
     * 修改幼儿园一日流程评估
     */
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
@ -100,76 +100,8 @@ public class ByDayflowassessmentplanController extends BaseController {
        byDayflowassessmentplan.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
        byDayflowassessmentplan.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
        byDayflowassessmentplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-" + sysDictDataService.selectDictLabel(dict_type, dict_value) + "-" + byDayFlowDetailService.selectByDayFlowDetailById(connentId).getName() + "-" + "评估计划");
-        if (byClassService.selectByClassById(classId).getZbjs() == null &&
-                byClassService.selectByClassById(classId).getPbjs() == null &&
-                byClassService.selectByClassById(classId).getZljs() == null) {
-            return AjaxResult.error("当前班级下没有教师，无法创建评估计划");
-        }
        int iCount = byDayflowassessmentplanService.insertByDayflowassessmentplan(byDayflowassessmentplan);
-        if (iCount > 0) {
-            // 判断班级下是否有老师
-            Long zbjsNew = byClassService.selectByClassById(classId).getZbjs();
-            Long pbjsNew = byClassService.selectByClassById(classId).getPbjs();
-            Long zljsNew = byClassService.selectByClassById(classId).getZljs();
-            ByDayflowassessment byDayflowassessment = null;
-            if (zbjsNew != null) {
-                byDayflowassessment = new ByDayflowassessment();
-                byDayflowassessment.setPlanid(byDayflowassessmentplan.getId());
-                byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
-                byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId());
-                byDayflowassessment.setBzbh(zbjsNew);
-                byDayflowassessment.setPgdx(zbjsNew);
-                byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore());
-                byDayflowassessment.setClassid(classId);
-                byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq());
-                byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent()));
-                if (pbjsNew != null) {
-                    byDayflowassessment.setPbbh(pbjsNew);
-                }
-                if (zljsNew != null) {
-                    byDayflowassessment.setZlbh(zljsNew);
-                }
-                byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);
-            }
-            if (pbjsNew != null) {
-                byDayflowassessment = new ByDayflowassessment();
-                byDayflowassessment.setPlanid(byDayflowassessmentplan.getId());
-                byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
-                byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId());
-                byDayflowassessment.setPbbh(pbjsNew);
-                byDayflowassessment.setPgdx(pbjsNew);
-                byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore());
-                byDayflowassessment.setClassid(classId);
-                byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq());
-                byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent()));
-                if (zbjsNew != null) {
-                    byDayflowassessment.setBzbh(zbjsNew);
-                }
-                if (zljsNew != null) {
-                    byDayflowassessment.setZlbh(zljsNew);
-                }
-                byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);
-            }
-            if (zljsNew != null) {
-                byDayflowassessment = new ByDayflowassessment();
-                byDayflowassessment.setPlanid(byDayflowassessmentplan.getId());
-                byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
-                byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId());
-                byDayflowassessment.setZlbh(zljsNew);
-                byDayflowassessment.setPgdx(zljsNew);
-                byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore());
-                byDayflowassessment.setClassid(classId);
-                byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq());
-                byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent()));
-                if (pbjsNew != null) {
-                    byDayflowassessment.setPbbh(pbjsNew);
-                }
-                if (zbjsNew != null) {
-                    byDayflowassessment.setBzbh(zbjsNew);
-                }
-                byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);
-            }
-        }
+
        return toAjax(iCount);
    }

--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayFlowStandardMapper.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayFlowStandardMapper.java
@ -27,6 +27,14 @@ public interface ByDayFlowStandardMapper
     */
    public List<ByDayFlowStandard> selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard);

+    /**
+     * 查询一日流程标准列表
+     *
+     * @param byDayFlowStandard 一日流程标准
+     * @return 一日流程标准集合
+     */
+    public List<ByDayFlowStandard> selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard);
+
    /**
     * 新增一日流程标准
     * 
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayFlowStandardService.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayFlowStandardService.java
@ -27,6 +27,15 @@ public interface IByDayFlowStandardService
     */
    public List<ByDayFlowStandard> selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard);

+    /**
+     * 查询一日流程标准列表
+     *
+     * @param byDayFlowStandard 一日流程标准
+     * @return 一日流程标准集合
+     */
+    public List<ByDayFlowStandard> selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard);
+
+
    /**
     * 新增一日流程标准
     * 
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayFlowStandardServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayFlowStandardServiceImpl.java
@ -1,6 +1,7 @@
 package com.ruoyi.project.benyi.service.impl;

 import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.benyi.mapper.ByDayFlowStandardMapper;
@ -9,85 +10,89 @@ import com.ruoyi.project.benyi.service.IByDayFlowStandardService;

 /**
 * 一日流程标准Service业务层处理
- * 
+ *
 * @author tsbz
 * @date 2020-05-18
 */
@Service
-public class ByDayFlowStandardServiceImpl implements IByDayFlowStandardService 
-{
+public class ByDayFlowStandardServiceImpl implements IByDayFlowStandardService {
    @Autowired
    private ByDayFlowStandardMapper byDayFlowStandardMapper;

    /**
     * 查询一日流程标准
-     * 
+     *
     * @param sid 一日流程标准ID
     * @return 一日流程标准
     */
    @Override
-    public ByDayFlowStandard selectByDayFlowStandardById(Long sid)
-    {
+    public ByDayFlowStandard selectByDayFlowStandardById(Long sid) {
        return byDayFlowStandardMapper.selectByDayFlowStandardById(sid);
    }

    /**
     * 查询一日流程标准列表
-     * 
+     *
     * @param byDayFlowStandard 一日流程标准
     * @return 一日流程标准
     */
    @Override
-    public List<ByDayFlowStandard> selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard)
-    {
+    public List<ByDayFlowStandard> selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard) {
        return byDayFlowStandardMapper.selectByDayFlowStandardList(byDayFlowStandard);
    }

+    /**
+     * 查询一日流程标准列表
+     *
+     * @param byDayFlowStandard 一日流程标准
+     * @return 一日流程标准集合
+     */
+    @Override
+    public List<ByDayFlowStandard> selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard) {
+        return byDayFlowStandardMapper.selectByDayFlowStandardListAssessment(byDayFlowStandard);
+    }
+
    /**
     * 新增一日流程标准
-     * 
+     *
     * @param byDayFlowStandard 一日流程标准
     * @return 结果
     */
    @Override
-    public int insertByDayFlowStandard(ByDayFlowStandard byDayFlowStandard)
-    {
+    public int insertByDayFlowStandard(ByDayFlowStandard byDayFlowStandard) {
        return byDayFlowStandardMapper.insertByDayFlowStandard(byDayFlowStandard);
    }

    /**
     * 修改一日流程标准
-     * 
+     *
     * @param byDayFlowStandard 一日流程标准
     * @return 结果
     */
    @Override
-    public int updateByDayFlowStandard(ByDayFlowStandard byDayFlowStandard)
-    {
+    public int updateByDayFlowStandard(ByDayFlowStandard byDayFlowStandard) {
        return byDayFlowStandardMapper.updateByDayFlowStandard(byDayFlowStandard);
    }

    /**
     * 批量删除一日流程标准
-     * 
+     *
     * @param sids 需要删除的一日流程标准ID
     * @return 结果
     */
    @Override
-    public int deleteByDayFlowStandardByIds(Long[] sids)
-    {
+    public int deleteByDayFlowStandardByIds(Long[] sids) {
        return byDayFlowStandardMapper.deleteByDayFlowStandardByIds(sids);
    }

    /**
     * 删除一日流程标准信息
-     * 
+     *
     * @param sid 一日流程标准ID
     * @return 结果
     */
    @Override
-    public int deleteByDayFlowStandardById(Long sid)
-    {
+    public int deleteByDayFlowStandardById(Long sid) {
        return byDayFlowStandardMapper.deleteByDayFlowStandardById(sid);
    }
 }
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml
@ -15,6 +15,7 @@
        <result property="createtime" column="createtime"/>
        <result property="updateuser" column="updateuser"/>
        <result property="updatetime" column="updatetime"/>
+        <result property="mrz" column="mrz"/>
    </resultMap>

    <sql id="selectByDayFlowStandardVo">
@ -37,6 +38,11 @@
        </where>
    </select>

+    <select id="selectByDayFlowStandardListAssessment" parameterType="ByDayFlowStandard" resultMap="ByDayFlowStandardResult">
+        select a.id, a.task_code, a.standard_title, a.score, a.standard_sort, a.createuser, a.createtime, a.updateuser, a.updatetime,b.value as mrz from by_day_flow_standard a
+        left join (select * from by_dayflowassessmentitem where pid=#{id}) b on a.id=b.item
+    </select>
+
    <select id="selectByDayFlowStandardById" parameterType="Long" resultMap="ByDayFlowStandardResult">
        <include refid="selectByDayFlowStandardVo"/>
        where id = #{id}