From b84e9d745c22d72ec99ad966e5e5040d9d7c6787 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Sun, 25 Apr 2021 15:33:47 +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=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../benyi/dayflowassessmentmyself/index.vue   | 103 ++++++++++++---
 .../benyi/dayflowassessmentpjf/index.vue      |  34 ++---
 .../benyi/dayflowassessmentteacher/index.vue  | 117 +++++++++++++++---
 .../dayflowassessmentteacherpjf/index.vue     |  34 ++---
 .../dashboard/LineChartTeacherDayFlowAvg.vue  |   2 +-
 .../benyi/domain/ByDayflowassessment.java     |  10 +-
 .../benyi/ByDayflowassessmentMapper.xml       |   6 +
 7 files changed, 232 insertions(+), 74 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue
index 6df9bf232..fa26b31c0 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue
@@ -61,27 +61,93 @@
         prop="createUserid"
         :formatter="createUserFormat"
       />
-      <el-table-column label="最终得分" align="center" prop="zzdf" />
-      <el-table-column label="早间接待" align="center" prop="zjjdpjf" />
-      <el-table-column label="用餐" align="center" prop="ycpjf" />
-      <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" />
-      <el-table-column label="分组教学" align="center" prop="fzjxpjf" />
-      <el-table-column label="点心时间" align="center" prop="dxsjpjf" />
-      <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" />
-      <el-table-column label="活动过渡" align="center" prop="hdgdpjf" />
-      <el-table-column label="户外活动" align="center" prop="hwhdpjf" />
-      <el-table-column label="午睡" align="center" prop="wspjf" />
-      <el-table-column label="离园再见" align="center" prop="lyzjpjf" />
-      <el-table-column label="安全" align="center" prop="aqpjf" />
-      <el-table-column label="自由活动" align="center" prop="zyhdpjf" />
+      <el-table-column
+        label="最终得分"
+        align="center"
+        prop="zzdf"
+        width="110"
+      />
+      <el-table-column
+        label="早间接待"
+        align="center"
+        prop="zjjdpjf"
+        width="110"
+      />
+      <el-table-column label="用餐" align="center" prop="ycpjf" width="80" />
+      <el-table-column
+        label="早间坐圈"
+        align="center"
+        prop="zjzqpjf"
+        width="110"
+      />
+      <el-table-column
+        label="分组教学"
+        align="center"
+        prop="fzjxpjf"
+        width="110"
+      />
+      <el-table-column
+        label="点心时间"
+        align="center"
+        prop="dxsjpjf"
+        width="110"
+      />
+      <el-table-column
+        label="如厕洗手饮水"
+        align="center"
+        prop="rcxsyspjf"
+        width="130"
+      />
+      <el-table-column
+        label="活动过渡"
+        align="center"
+        prop="hdgdpjf"
+        width="110"
+      />
+      <el-table-column
+        label="户外活动"
+        align="center"
+        prop="hwhdpjf"
+        width="110"
+      />
+      <el-table-column label="午睡" align="center" prop="wspjf" width="80" />
+      <el-table-column
+        label="离园再见"
+        align="center"
+        prop="lyzjpjf"
+        width="110"
+      />
+      <el-table-column label="安全" align="center" prop="aqpjf" width="80" />
+      <el-table-column
+        label="自由活动"
+        align="center"
+        prop="zyhdpjf"
+        width="110"
+      />
       <el-table-column
         label="规则与纪律约束"
         align="center"
         prop="gzyjlyspjf"
+        width="140"
+      />
+      <el-table-column
+        label="微型课程"
+        align="center"
+        prop="wxkcpjf"
+        width="110"
+      />
+      <el-table-column
+        label="潜课程"
+        align="center"
+        prop="qkcpjf"
+        width="100"
+      />
+      <el-table-column
+        label="评估时间"
+        align="center"
+        prop="createTime"
+        width="180"
       />
-      <el-table-column label="微型课程" align="center" prop="wxkcpjf" />
-      <el-table-column label="潜课程" align="center" prop="qkcpjf" />
-      <el-table-column label="评估时间" align="center" prop="createTime" />
       <el-table-column
         label="操作"
         align="center"
@@ -188,7 +254,9 @@ export default {
     /** 查询幼儿园一日流程评估列表 */
     getList() {
       this.loading = true;
-      listDayflowassessmentmyself(this.queryParams).then((response) => {
+      listDayflowassessmentmyself(
+        this.addDateRange(this.queryParams, this.dateRange)
+      ).then((response) => {
         this.dayflowassessmentList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -258,6 +326,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.dateRange = [];
       this.handleQuery();
     },
     handleAssessment(row) {
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue
index 1052ee229..b8f2a62d4 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue
@@ -33,7 +33,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" border :data="dayflowassessmentList">
+    <el-table v-loading="loading" border :default-sort = "{prop: 'bjpjf', order: 'descending'}" :data="dayflowassessmentList">
       <el-table-column
         label="班级名称"
         align="center"
@@ -41,26 +41,26 @@
         prop="classid"
         :formatter="classFormat"
       />
-      <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" />
-      <el-table-column label="分组教学" align="center" prop="fzjxpjf" />
-      <el-table-column label="点心时间" align="center" prop="dxsjpjf" />
-      <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" />
-      <el-table-column label="活动过渡" align="center" prop="hdgdpjf" />
-      <el-table-column label="户外活动" align="center" prop="hwhdpjf" />
-      <el-table-column label="午睡" align="center" prop="wspjf" />
-      <el-table-column label="离园再见" align="center" prop="lyzjpjf" />
-      <el-table-column label="安全" align="center" prop="aqpjf" />
-      <el-table-column label="自由活动" align="center" prop="zyhdpjf" />
+      <el-table-column label="班级平均分" align="center" prop="bjpjf" sortable width="110"/>
+      <el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/>
+      <el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/>
+      <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/>
+      <el-table-column label="分组教学" align="center" prop="fzjxpjf" sortable width="110"/>
+      <el-table-column label="点心时间" align="center" prop="dxsjpjf" sortable width="110"/>
+      <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" sortable width="130"/>
+      <el-table-column label="活动过渡" align="center" prop="hdgdpjf" sortable width="110"/>
+      <el-table-column label="户外活动" align="center" prop="hwhdpjf" sortable width="110"/>
+      <el-table-column label="午睡" align="center" prop="wspjf" sortable width="80"/>
+      <el-table-column label="离园再见" align="center" prop="lyzjpjf" sortable width="110"/>
+      <el-table-column label="安全" align="center" prop="aqpjf" sortable width="80"/>
+      <el-table-column label="自由活动" align="center" prop="zyhdpjf" sortable width="110"/>
       <el-table-column
         label="规则与纪律约束"
         align="center"
-        prop="gzyjlyspjf"
+        prop="gzyjlyspjf" sortable width="140"
       />
-      <el-table-column label="微型课程" align="center" prop="wxkcpjf" />
-      <el-table-column label="潜课程" align="center" prop="qkcpjf" />
+      <el-table-column label="微型课程" align="center" prop="wxkcpjf" sortable width="110"/>
+      <el-table-column label="潜课程" align="center" prop="qkcpjf" sortable width="100"/>
     </el-table>
 
     <pagination
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentteacher/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentteacher/index.vue
index 12bee1d64..8171cfcc7 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentteacher/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentteacher/index.vue
@@ -31,6 +31,18 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="评估时间">
+        <el-date-picker
+          v-model="dateRange"
+          size="small"
+          class="my-date-picker"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -74,27 +86,93 @@
         fixed
         :formatter="createUserFormat"
       />
-      <el-table-column label="最终得分" align="center" prop="zzdf" />
-      <el-table-column label="早间接待" align="center" prop="zjjdpjf" />
-      <el-table-column label="用餐" align="center" prop="ycpjf" />
-      <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" />
-      <el-table-column label="分组教学" align="center" prop="fzjxpjf" />
-      <el-table-column label="点心时间" align="center" prop="dxsjpjf" />
-      <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" />
-      <el-table-column label="活动过渡" align="center" prop="hdgdpjf" />
-      <el-table-column label="户外活动" align="center" prop="hwhdpjf" />
-      <el-table-column label="午睡" align="center" prop="wspjf" />
-      <el-table-column label="离园再见" align="center" prop="lyzjpjf" />
-      <el-table-column label="安全" align="center" prop="aqpjf" />
-      <el-table-column label="自由活动" align="center" prop="zyhdpjf" />
+      <el-table-column
+        label="最终得分"
+        align="center"
+        prop="zzdf"
+        width="110"
+      />
+      <el-table-column
+        label="早间接待"
+        align="center"
+        prop="zjjdpjf"
+        width="110"
+      />
+      <el-table-column label="用餐" align="center" prop="ycpjf" width="80" />
+      <el-table-column
+        label="早间坐圈"
+        align="center"
+        prop="zjzqpjf"
+        width="110"
+      />
+      <el-table-column
+        label="分组教学"
+        align="center"
+        prop="fzjxpjf"
+        width="110"
+      />
+      <el-table-column
+        label="点心时间"
+        align="center"
+        prop="dxsjpjf"
+        width="110"
+      />
+      <el-table-column
+        label="如厕洗手饮水"
+        align="center"
+        prop="rcxsyspjf"
+        width="130"
+      />
+      <el-table-column
+        label="活动过渡"
+        align="center"
+        prop="hdgdpjf"
+        width="110"
+      />
+      <el-table-column
+        label="户外活动"
+        align="center"
+        prop="hwhdpjf"
+        width="110"
+      />
+      <el-table-column label="午睡" align="center" prop="wspjf" width="80" />
+      <el-table-column
+        label="离园再见"
+        align="center"
+        prop="lyzjpjf"
+        width="110"
+      />
+      <el-table-column label="安全" align="center" prop="aqpjf" width="80" />
+      <el-table-column
+        label="自由活动"
+        align="center"
+        prop="zyhdpjf"
+        width="110"
+      />
       <el-table-column
         label="规则与纪律约束"
         align="center"
         prop="gzyjlyspjf"
+        width="140"
+      />
+      <el-table-column
+        label="微型课程"
+        align="center"
+        prop="wxkcpjf"
+        width="110"
+      />
+      <el-table-column
+        label="潜课程"
+        align="center"
+        prop="qkcpjf"
+        width="100"
+      />
+      <el-table-column
+        label="评估时间"
+        align="center"
+        prop="createTime"
+        width="180"
       />
-      <el-table-column label="微型课程" align="center" prop="wxkcpjf" />
-      <el-table-column label="潜课程" align="center" prop="qkcpjf" />
-      <el-table-column label="评估时间" align="center" prop="createTime" />
     </el-table>
 
     <pagination
@@ -139,6 +217,8 @@ export default {
       xnxqOptions: [],
       // 所有教师
       userOptions: [],
+      // 日期范围
+      dateRange: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -179,7 +259,9 @@ export default {
     /** 查询幼儿园一日流程评估列表 */
     getList() {
       this.loading = true;
-      listDayflowassessment(this.queryParams).then((response) => {
+      listDayflowassessment(
+        this.addDateRange(this.queryParams, this.dateRange)
+      ).then((response) => {
         this.dayflowassessmentList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -249,6 +331,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.dateRange = [];
       this.handleQuery();
     },
   },
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue
index 38d72a1ce..5a707b2a4 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentteacherpjf/index.vue
@@ -47,28 +47,28 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" border :data="dayflowassessmentList">
+    <el-table v-loading="loading" border :default-sort = "{prop: 'bjpjf', order: 'descending'}" :data="dayflowassessmentList">
       <el-table-column label="评估对象" align="center" prop="pgdxxm" fixed />
-      <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" />
-      <el-table-column label="分组教学" align="center" prop="fzjxpjf" />
-      <el-table-column label="点心时间" align="center" prop="dxsjpjf" />
-      <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" />
-      <el-table-column label="活动过渡" align="center" prop="hdgdpjf" />
-      <el-table-column label="户外活动" align="center" prop="hwhdpjf" />
-      <el-table-column label="午睡" align="center" prop="wspjf" />
-      <el-table-column label="离园再见" align="center" prop="lyzjpjf" />
-      <el-table-column label="安全" align="center" prop="aqpjf" />
-      <el-table-column label="自由活动" align="center" prop="zyhdpjf" />
+      <el-table-column label="最终得分" align="center" prop="bjpjf" sortable width="110"/>
+      <el-table-column label="早间接待" align="center" prop="zjjdpjf" sortable width="110"/>
+      <el-table-column label="用餐" align="center" prop="ycpjf" sortable width="80"/>
+      <el-table-column label="早间坐圈" align="center" prop="zjzqpjf" sortable width="110"/>
+      <el-table-column label="分组教学" align="center" prop="fzjxpjf" sortable width="110"/>
+      <el-table-column label="点心时间" align="center" prop="dxsjpjf" sortable width="110"/>
+      <el-table-column label="如厕洗手饮水" align="center" prop="rcxsyspjf" sortable width="130"/>
+      <el-table-column label="活动过渡" align="center" prop="hdgdpjf" sortable width="110"/>
+      <el-table-column label="户外活动" align="center" prop="hwhdpjf" sortable width="110"/>
+      <el-table-column label="午睡" align="center" prop="wspjf" sortable width="80"/>
+      <el-table-column label="离园再见" align="center" prop="lyzjpjf" sortable width="110"/>
+      <el-table-column label="安全" align="center" prop="aqpjf" sortable width="80"/>
+      <el-table-column label="自由活动" align="center" prop="zyhdpjf" sortable width="110"/>
       <el-table-column
         label="规则与纪律约束"
         align="center"
-        prop="gzyjlyspjf"
+        prop="gzyjlyspjf" sortable width="140"
       />
-      <el-table-column label="微型课程" align="center" prop="wxkcpjf" />
-      <el-table-column label="潜课程" align="center" prop="qkcpjf" />
+      <el-table-column label="微型课程" align="center" prop="wxkcpjf" sortable width="110"/>
+      <el-table-column label="潜课程" align="center" prop="qkcpjf" sortable width="100"/>
     </el-table>
 
     <pagination
diff --git a/ruoyi-ui/src/views/dashboard/LineChartTeacherDayFlowAvg.vue b/ruoyi-ui/src/views/dashboard/LineChartTeacherDayFlowAvg.vue
index 05c00b922..9580de54d 100644
--- a/ruoyi-ui/src/views/dashboard/LineChartTeacherDayFlowAvg.vue
+++ b/ruoyi-ui/src/views/dashboard/LineChartTeacherDayFlowAvg.vue
@@ -65,7 +65,7 @@ export default {
     async getClassList() {
       await listDayflowassessmentTeacherAvg(this.queryParams).then(
         (response) => {
-          console.log(this.queryParams);
+          //console.log(this.queryParams);
           var items = [];
           var childcounts = [];
           response.rows.forEach((element) => {
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java
index d21713f45..ecb209263 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java
@@ -149,11 +149,11 @@ public class ByDayflowassessment extends BaseEntity {
     @Excel(name = "执行人")
     private Long createUserid;
 
-    /**
-     * 创建时间
-     */
-    @Excel(name = "创建时间")
-    private Date createTime;
+//    /**
+//     * 创建时间
+//     */
+//    @Excel(name = "创建时间")
+//    private Date createTime;
 
     public Double getBjpjf() {
         return bjpjf;
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
index 7b6e25353..ccd9ea35e 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
@@ -107,6 +107,12 @@
             <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>
+            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(d.create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(d.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
             <!-- 数据范围过滤 -->
             ${dataScope}
             order by d.classid