页面样式，一日流程评估

ruoyi-ui/src/api/benyi/dayflowassessment.js

@@ -27,6 +27,15 @@ export function listDayflowassessmentPjf(query) {
   });
 }
 
+// 查询幼儿园一日流程评估列表 教师平均分
+export function listDayflowassessmentTeacherAvg(query) {
+  return request({
+    url: "/benyi/dayflowassessment/listteacheravg",
+    method: "get",
+    params: query
+  });
+}
+
 // 查询幼儿园一日流程评估详细
 export function getDayflowassessment(id) {
   return request({

ruoyi-ui/src/views/benyi/dayflowassessment/index.vue

@@ -1,58 +1,51 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" label-width="70px">
-      :model="queryParams"
+      <el-row :gutter="10">
-      ref="queryForm"
+        <el-col :xs="24" :ms="12" :md="5">
-      :inline="true"
+          <el-form-item label="学年学期" prop="xnxq">
-      label-width="70px"
+            <el-select v-model="queryParams.xnxq" placeholder="请选择学年学期">
-    >
+              <el-option
-      <!-- <el-form-item label="所属计划" prop="planid">
+                v-for="dict in xnxqOptions"
-        <el-select v-model="queryParams.planid" placeholder="请选择评估计划">
+                :key="dict.dictValue"
-          <el-option
+                :label="dict.dictLabel"
-            v-for="dict in dayflowassessmentplanOptions"
+                :value="dict.dictValue"
-            :key="dict.id"
+              />
-            :label="dict.name"
+            </el-select>
-            :value="dict.id"
+          </el-form-item>
-          ></el-option>
+        </el-col>
-        </el-select>
+        <el-col :xs="24" :ms="12" :md="5">
-      </el-form-item> -->
+          <el-form-item label="班级名称" prop="classid">
-      <el-form-item label="学年学期" prop="xnxq">
+            <el-select
-        <el-select v-model="queryParams.xnxq" placeholder="请选择学年学期">
+              v-model="queryParams.classid"
-          <el-option
+              clearable
-            v-for="dict in xnxqOptions"
+              size="small"
-            :key="dict.dictValue"
+              placeholder="请选择班级"
-            :label="dict.dictLabel"
+            >
-            :value="dict.dictValue"
+              <el-option
-          />
+                v-for="dict in classOptions"
-        </el-select>
+                :key="dict.bjbh"
-      </el-form-item>
+                :label="dict.bjmc"
-      <el-form-item label="班级名称" prop="classid">
+                :value="dict.bjbh"
-        <el-select
+              ></el-option>
-          v-model="queryParams.classid"
+            </el-select>
-          clearable
+          </el-form-item>
-          size="small"
+        </el-col>
-          placeholder="请选择班级"
+        <el-col :xs="24" :ms="12" :md="5">
-        >
+          <el-form-item>
-          <el-option
+            <el-button
-            v-for="dict in classOptions"
+              type="primary"
-            :key="dict.bjbh"
+              icon="el-icon-search"
-            :label="dict.bjmc"
+              size="mini"
-            :value="dict.bjbh"
+              @click="handleQuery"
-          ></el-option>
+              >搜索</el-button
-        </el-select>
+            >
-      </el-form-item>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-      <el-form-item>
+              >重置</el-button
-        <el-button
+            >
-          type="primary"
+          </el-form-item>
-          icon="el-icon-search"
+        </el-col>
-          size="mini"
+      </el-row>
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item>
     </el-form>
 
     <div class="mb8 btn-list">
@@ -68,6 +61,7 @@
 
     <el-table
       v-loading="loading"
+      border
       :data="dayflowassessmentList"
       @selection-change="handleSelectionChange"
     >
@@ -75,6 +69,7 @@
       <!-- <el-table-column label="所属计划" align="center" prop="planid" :formatter="planFormat"/> -->
       <el-table-column
         label="学年学期"
+        fixed
         align="center"
         prop="xnxq"
         :formatter="xnxqFormat"
@@ -85,40 +80,12 @@
         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="评估人"
@@ -128,9 +95,11 @@
       />
       <el-table-column label="评估时间" align="center" prop="createTime" />
       <el-table-column
+        fixed="right"
         label="操作"
         align="center"
-        class-name="small-padding fixed-width"
+        width="60"
+        class-name="small-padding fixed-width edit-btns"
       >
         <template slot-scope="scope">
           <el-button
@@ -339,4 +308,21 @@ export default {
     },
   },
 };
-</script>
+</script>
+<style lang="scss" scoped>
+.el-select {
+  width: 100%;
+}
+.my-date-picker {
+  width: 100%;
+}
+.edit-btns {
+  .el-button {
+    display: block;
+    margin: 0 auto;
+  }
+}
+.no-margin ::v-deep.el-form-item__content {
+  margin: 0 !important;
+}
+</style>

ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue

@@ -1,109 +1,109 @@
 <template>
   <div class="app-container">
-    <el-form
+    <el-form :model="queryParams" ref="queryForm" label-width="70px">
-      :model="queryParams"
+      <el-row :gutter="10">
-      ref="queryForm"
+        <el-col :xs="24" :ms="12" :md="5">
-      :inline="true"
+          <el-form-item label="学年学期" prop="xnxq">
-      label-width="70px"
+            <el-select
-    >
+              v-model="queryParams.xnxq"
-      <el-form-item label="学年学期" prop="xnxq">
+              placeholder="请选择学年学期"
-        <el-select
+              clearable
-          v-model="queryParams.xnxq"
+              size="small"
-          placeholder="请选择学年学期"
+            >
-          clearable
+              <el-option
-          size="small"
+                v-for="dict in xnxqOptions"
-        >
+                :key="dict.dictValue"
-          <el-option
+                :label="dict.dictLabel"
-            v-for="dict in xnxqOptions"
+                :value="dict.dictValue"
-            :key="dict.dictValue"
+              />
-            :label="dict.dictLabel"
+            </el-select>
-            :value="dict.dictValue"
+          </el-form-item>
-          />
+        </el-col>
-        </el-select>
+        <el-col :xs="24" :ms="12" :md="5">
-      </el-form-item>
+          <el-form-item label="评估月份" prop="month">
-      <el-form-item label="评估月份" prop="month">
+            <el-date-picker
-        <el-date-picker
+              clearable
-          clearable
+              size="small"
-          size="small"
+              v-model="queryParams.month"
-          style="width: 200px"
+              type="month"
-          v-model="queryParams.month"
+              class="my-date-picker"
-          type="month"
+              value-format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
+              placeholder="选择评估月份"
-          placeholder="选择评估月份"
+            >
-        >
+            </el-date-picker>
-        </el-date-picker>
+          </el-form-item>
-      </el-form-item>
+        </el-col>
-      <el-form-item label="评估班级" prop="classid">
+        <el-col :xs="24" :ms="12" :md="5">
-        <el-select
+          <el-form-item label="评估班级" prop="classid">
-          v-model="queryParams.classid"
+            <el-select
-          clearable
+              v-model="queryParams.classid"
-          size="small"
+              clearable
-          placeholder="请选择班级"
+              size="small"
-        >
+              placeholder="请选择班级"
-          <el-option
+            >
-            v-for="dict in classOptions"
+              <el-option
-            :key="dict.bjbh"
+                v-for="dict in classOptions"
-            :label="dict.bjmc"
+                :key="dict.bjbh"
-            :value="dict.bjbh"
+                :label="dict.bjmc"
-          ></el-option>
+                :value="dict.bjbh"
-        </el-select>
+              ></el-option>
-      </el-form-item>
+            </el-select>
-      <el-form-item>
+          </el-form-item>
-        <el-button
+        </el-col>
-          type="primary"
+        <el-col :xs="24" :ms="12" :md="5">
-          icon="el-icon-search"
+          <el-form-item>
-          size="mini"
+            <el-button
-          @click="handleQuery"
+              type="primary"
-          >搜索</el-button
+              icon="el-icon-search"
-        >
+              size="mini"
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              @click="handleQuery"
-          >重置</el-button
+              >搜索</el-button
-        >
+            >
-      </el-form-item>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <div class="mb8 btn-list">
-      <el-col :span="1.5">
+      <el-button
-        <el-button
+        type="primary"
-          type="primary"
+        icon="el-icon-plus"
-          icon="el-icon-plus"
+        size="mini"
-          size="mini"
+        @click="handleAdd"
-          @click="handleAdd"
+        v-hasPermi="['benyi:dayflowassessmentplan:add']"
-          v-hasPermi="['benyi:dayflowassessmentplan:add']"
+        >新增</el-button
-          >新增</el-button
+      >
-        >
+      <el-button
-      </el-col>
+        type="success"
-      <el-col :span="1.5">
+        icon="el-icon-edit"
-        <el-button
+        size="mini"
-          type="success"
+        :disabled="single"
-          icon="el-icon-edit"
+        @click="handleUpdate"
-          size="mini"
+        v-hasPermi="['benyi:dayflowassessmentplan:edit']"
-          :disabled="single"
+        >修改</el-button
-          @click="handleUpdate"
+      >
-          v-hasPermi="['benyi:dayflowassessmentplan:edit']"
+      <el-button
-          >修改</el-button
+        type="danger"
-        >
+        icon="el-icon-delete"
-      </el-col>
+        size="mini"
-      <el-col :span="1.5">
+        :disabled="multiple"
-        <el-button
+        @click="handleDelete"
-          type="danger"
+        v-hasPermi="['benyi:dayflowassessmentplan:remove']"
-          icon="el-icon-delete"
+        >删除</el-button
-          size="mini"
+      >
-          :disabled="multiple"
+    </div>
-          @click="handleDelete"
-          v-hasPermi="['benyi:dayflowassessmentplan:remove']"
-          >删除</el-button
-        >
-      </el-col>
-    </el-row>
 
     <el-table
       v-loading="loading"
+      border
       :data="dayflowassessmentplanList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="计划名称" align="center" prop="name" />
+      <el-table-column label="计划名称" fixed align="center" prop="name" />
       <el-table-column
         label="评估学年学期"
         align="center"
@@ -116,15 +116,22 @@
         prop="classid"
         :formatter="classFormat"
       />
-      <el-table-column label="评估内容" align="center" prop="connent" :formatter="dayFlowFormat"/>
+      <el-table-column
+        label="评估内容"
+        align="center"
+        prop="connent"
+        :formatter="dayFlowFormat"
+      />
       <!-- <el-table-column label="内容分数" align="center" prop="score" />
       <el-table-column label="班级所得平均分" align="center" prop="classavg" /> -->
       <el-table-column label="评估时间" align="center" prop="starttime" />
       <!-- <el-table-column label="创建人" align="center" prop="createUserid" /> -->
       <el-table-column
+        fixed="right"
         label="操作"
         align="center"
-        class-name="small-padding fixed-width"
+        width="60"
+        class-name="small-padding fixed-width edit-btns"
       >
         <template slot-scope="scope">
           <el-button
@@ -179,7 +186,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="评估内容" prop="connent">
-          <el-select v-model="form.connent" placeholder="请选择评估内容" @change="handleChange">
+          <el-select
+            v-model="form.connent"
+            placeholder="请选择评估内容"
+            @change="handleChange"
+          >
             <el-option
               v-for="dict in detailOptions"
               :key="dict.id"

ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue

@@ -6,9 +6,9 @@
       :inline="true"
       label-width="70px"
     >
-      <el-form-item label="教师姓名" prop="classid">
+      <el-form-item label="教师姓名" prop="pgdx">
         <el-select
-          v-model="queryParams.classid"
+          v-model="queryParams.pgdx"
           clearable
           size="small"
           placeholder="请选择教师"
@@ -51,11 +51,10 @@
       <el-table-column
         label="评估对象"
         align="center"
-        prop="pgdx"
+        prop="pgdxxm"
         fixed
-        :formatter="pgdxFormat"
       />
-      <el-table-column label="最终得分" align="center" prop="zzdf" />
+      <el-table-column label="最终得分" align="center" prop="bjpjf" />
       <el-table-column label="早间接待" align="center" prop="zjjdpjf" />
       <el-table-column label="用餐" align="center" prop="ycpjf" />
       <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" />
@@ -89,9 +88,7 @@
 
 <script>
 import {
-  listDayflowassessment,
+  listDayflowassessmentTeacherAvg,
-  getDayflowassessment,
-  delDayflowassessment,
 } from "@/api/benyi/dayflowassessment";
 import { listClass } from "@/api/system/class";
 import { listUser } from "@/api/system/user";
@@ -161,7 +158,7 @@ export default {
     /** 查询幼儿园一日流程评估列表 */
     getList() {
       this.loading = true;
-      listDayflowassessment(this.queryParams).then((response) => {
+      listDayflowassessmentTeacherAvg(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.dayflowassessmentList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -185,44 +182,12 @@ export default {
       });
       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;
@@ -230,6 +195,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

ruoyi-ui/src/views/benyi/news/index.vue

@@ -3,114 +3,88 @@
     <el-form
       :model="queryParams"
       ref="queryForm"
-      :inline="true"
       label-width="70px"
     >
-      <el-form-item label="新闻类型" prop="type">
+      <el-row :gutter="10">
-        <el-select
+        <el-col :xs="24" :ms="12" :md="5">
-          v-model="queryParams.type"
+          <el-form-item label="新闻类型" prop="type">
-          placeholder="请选择类型"
+            <el-select
-          clearable
+              v-model="queryParams.type"
-          size="small"
+              placeholder="请选择类型"
-        >
+              clearable
-          <el-option
+              size="small"
-            v-for="dict in typeOptions"
+            >
-            :key="dict.dictValue"
+              <el-option
-            :label="dict.dictLabel"
+                v-for="dict in typeOptions"
-            :value="dict.dictValue"
+                :key="dict.dictValue"
-          />
+                :label="dict.dictLabel"
-        </el-select>
+                :value="dict.dictValue"
-      </el-form-item>
+              />
-      <el-form-item label="新闻标题" prop="title">
+            </el-select>
-        <el-input
+          </el-form-item>
-          v-model="queryParams.title"
+        </el-col>
-          type="text"
+        <el-col :xs="24" :ms="12" :md="5">
-          placeholder="请输入新闻标题"
+          <el-form-item label="新闻标题" prop="title">
-        />
+            <el-input
-      </el-form-item>
+              v-model="queryParams.title"
-      <el-form-item>
+              type="text"
-        <el-button
+              placeholder="请输入新闻标题"
-          type="primary"
+            />
-          icon="el-icon-search"
+          </el-form-item>
-          size="mini"
+        </el-col>
-          @click="handleQuery"
+        <el-col :xs="24" :ms="12" :md="5">
-          >搜索</el-button
+          <el-form-item>
-        >
+            <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              type="primary"
-          >重置</el-button
+              icon="el-icon-search"
-        >
+              size="mini"
-      </el-form-item>
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <div class="mb8 btn-list">
-      <el-col :span="1.5">
+      <el-button
-        <el-button
+        type="primary"
-          type="primary"
+        icon="el-icon-plus"
-          icon="el-icon-plus"
+        size="mini"
-          size="mini"
+        @click="handleAdd"
-          @click="handleAdd"
+        v-hasPermi="['benyi:news:add']"
-          v-hasPermi="['benyi:news:add']"
+        >新增</el-button
-          >新增</el-button
+      >
-        >
+
-      </el-col>
+      <el-button
-      <!-- <el-col :span="1.5">
+        type="danger"
-        <el-button
+        icon="el-icon-delete"
-          type="success"
+        size="mini"
-          icon="el-icon-edit"
+        :disabled="multiple"
-          size="mini"
+        @click="handleDelete"
-          :disabled="single"
+        v-hasPermi="['benyi:news:remove']"
-          @click="handleUpdate"
+        >删除</el-button
-          v-hasPermi="['benyi:news:edit']"
+      >
-          >修改</el-button
+    </div>
-        >
-      </el-col> -->
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['benyi:news: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:news:export']"
-          >导出</el-button
-        >
-      </el-col> -->
-    </el-row>
 
     <el-table
       v-loading="loading"
+      border
       :data="newsList"
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="编号" align="center" prop="id" /> -->
-      <el-table-column label="新闻标题" align="center" prop="title" />
+      <el-table-column fixed label="新闻标题" align="center" prop="title" />
       <el-table-column
         label="新闻类型"
         align="center"
         prop="type"
         :formatter="typeFormat"
       />
-      <!-- <el-table-column
-        label="内容"
-        align="center"
-        prop="content"
-        :show-overflow-tooltip="true"
-      >
-        <template slot-scope="scope">
-          <div class="ql-editor" v-html="scope.row.content"></div>
-        </template>
-      </el-table-column> -->
       <el-table-column
         label="所属学校"
         align="center"
@@ -127,16 +101,17 @@
         label="审核时间"
         align="center"
         prop="checkTime"
-        width="180"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.checkTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column
+        fixed="right"
         label="操作"
         align="center"
-        class-name="small-padding fixed-width"
+        width="60"
+        class-name="small-padding fixed-width edit-btns"
       >
         <template slot-scope="scope">
           <el-button
@@ -175,9 +150,13 @@
       width="1024px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="新闻标题" prop="title">
-          <el-input v-model="form.title" type="text" placeholder="请输入新闻标题" />
+          <el-input
+            v-model="form.title"
+            type="text"
+            placeholder="请输入新闻标题"
+          />
         </el-form-item>
         <!-- <el-form-item label="类型">
           <el-select v-model="form.type" placeholder="请选择类型">
@@ -448,15 +427,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm(
+      this.$confirm("是否确认删除选中的新闻中心数据项?", "警告", {
-        '是否确认删除选中的新闻中心数据项?',
+        confirmButtonText: "确定",
-        "警告",
+        cancelButtonText: "取消",
-        {
+        type: "warning",
-          confirmButtonText: "确定",
+      })
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
         .then(function () {
           return delNews(ids);
         })
@@ -486,3 +461,20 @@ export default {
 };
 </script>
 
+<style lang="scss" scoped>
+.el-select {
+  width: 100%;
+}
+.my-date-picker {
+  width: 100%;
+}
+.edit-btns {
+  .el-button {
+    display: block;
+    margin: 0 auto;
+  }
+}
+.no-margin ::v-deep.el-form-item__content {
+  margin: 0 !important;
+}
+</style>

ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java

@@ -66,6 +66,18 @@ public class ByDayflowassessmentController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询幼儿园一日流程评估列表
+     */
+    @PreAuthorize("@ss.hasPermi('benyi:dayflowassessment:list')")
+    @GetMapping("/listteacheravg")
+    public TableDataInfo listteacheravg(ByDayflowassessment byDayflowassessment) {
+        byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
+        startPage();
+        List<ByDayflowassessment> list = byDayflowassessmentService.selectByDayflowassessmentTeacherPjf(byDayflowassessment);
+        return getDataTable(list);
+    }
+
     /**
      * 查询幼儿园一日流程评估列表
      */

ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayflowassessmentMapper.java

@@ -35,6 +35,15 @@ public interface ByDayflowassessmentMapper {
      */
     public List<ByDayflowassessment> selectByDayflowassessmentPjf(ByDayflowassessment byDayflowassessment);
 
+    /**
+     * 查询幼儿园一日流程评估列表
+     *
+     * @param byDayflowassessment 幼儿园一日流程评估
+     * @return 幼儿园一日流程评估集合
+     */
+    public List<ByDayflowassessment> selectByDayflowassessmentTeacherPjf(ByDayflowassessment byDayflowassessment);
+
+
     /**
      * 新增幼儿园一日流程评估
      *

ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayflowassessmentService.java

@@ -35,6 +35,14 @@ public interface IByDayflowassessmentService {
      */
     public List<ByDayflowassessment> selectByDayflowassessmentPjf(ByDayflowassessment byDayflowassessment);
 
+    /**
+     * 查询幼儿园一日流程评估列表
+     *
+     * @param byDayflowassessment 幼儿园一日流程评估
+     * @return 幼儿园一日流程评估集合
+     */
+    public List<ByDayflowassessment> selectByDayflowassessmentTeacherPjf(ByDayflowassessment byDayflowassessment);
+
 
     /**
      * 新增幼儿园一日流程评估

ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java

@@ -55,6 +55,18 @@ public class ByDayflowassessmentServiceImpl implements IByDayflowassessmentServi
         return byDayflowassessmentMapper.selectByDayflowassessmentPjf(byDayflowassessment);
     }
 
+    /**
+     * 查询幼儿园一日流程评估列表
+     *
+     * @param byDayflowassessment 幼儿园一日流程评估
+     * @return 幼儿园一日流程评估集合
+     */
+    @Override
+    public List<ByDayflowassessment> selectByDayflowassessmentTeacherPjf(ByDayflowassessment byDayflowassessment) {
+        return byDayflowassessmentMapper.selectByDayflowassessmentTeacherPjf(byDayflowassessment);
+    }
+
+
     /**
      * 新增幼儿园一日流程评估
      *

ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml

@@ -144,6 +144,37 @@ where a.dept_id=#{deptId}
 group by t.classid,t.ny
     </select>
 
+    <select id="selectByDayflowassessmentTeacherPjf" parameterType="ByDayflowassessment" resultMap="ByDayflowassessmentResult">
+        select t.pgdx,e.nick_name as pgdxxm,avg(t.zzdf) as bjpjf,avg(t.zjjd) as zjjdpjf,avg(t.yc) as ycpjf,avg(t.zjzq) as zjzqpjf,avg(t.fzjx) as fzjxpjf,avg(t.dxsj) as dxsjpjf,avg(t.rcxsys) as rcxsyspjf,avg(t.hdgd) as hdgdpjf,avg(t.hwhd) as hwhdpjf,avg(t.ws) as wspjf,avg(t.lyzj) as lyzjpjf,avg(t.aq) as aqpjf,avg(t.zyhd) as zyhdpjf,avg(t.gzyjlys) as gzyjlyspjf,avg(t.wxkc) as wxkcpjf,avg(t.qkc) as qkcpjf from (
+select a.pgdx,a.zzdf,a.create_time,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='早间接待')) as zjjd,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='用餐')) as yc,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='早间坐圈')) as zjzq,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='分组教学')) as fzjx,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='点心时间')) as dxsj,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='如厕洗手饮水')) as rcxsys,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='活动过渡')) as hdgd,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='户外活动')) as hwhd,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='午睡')) as ws,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='离园再见')) as lyzj,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='安全')) as aq,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='自由活动')) as zyhd,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='规则与纪律约束')) as gzyjlys,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='微型课程')) as wxkc,
+(select sum(b.value) from by_dayflowassessmentitem b where a.id=b.pid and b.item in (select id from by_day_flow where name='潜课程')) as qkc
+from by_dayflowassessment a
+where a.dept_id=#{deptId}
+        <if test="pgdx != null ">and a.pgdx = #{pgdx}</if>
+        <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+            AND date_format(a.create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+        </if>
+        <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+            AND date_format(a.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+        </if>
+) t left join sys_user e on e.user_id=t.pgdx
+group by t.pgdx
+    </select>
+
     <insert id="insertByDayflowassessment" parameterType="ByDayflowassessment" useGeneratedKeys="true" keyProperty="id">
         insert into by_dayflowassessment
         <trim prefix="(" suffix=")" suffixOverrides=",">