From 89bb38b42ee005b69cbf2855650c2de3d6c123e0 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Mon, 1 Mar 2021 15:26:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E4=B8=80=E6=97=A5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=AE=A1=E5=88=92=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=B9=B3=E5=9D=87=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/benyi/dayflowassessmentplan/index.vue   |  3 +++
 .../controller/ByDayflowassessmentController.java | 14 +++++++++++++-
 .../benyi/domain/ByDayflowassessmentplan.java     | 15 +++++++++++++++
 .../benyi/ByDayflowassessmentplanMapper.xml       |  7 ++++++-
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
index 259a1a1a9..1596a3f3c 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
@@ -118,6 +118,7 @@
       />
       <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
@@ -254,6 +255,7 @@ export default {
         month: undefined,
         xnxq: undefined,
         classid: undefined,
+        classavg: undefined,
         connent: undefined,
         score: undefined,
         starttime: undefined,
@@ -386,6 +388,7 @@ export default {
         classid: undefined,
         connent: undefined,
         score: undefined,
+        classavg: undefined,
         starttime: undefined,
         createUserid: undefined,
         createTime: undefined,
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 c39a71bce..432fc8112 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
@@ -3,7 +3,9 @@ package com.ruoyi.project.benyi.controller;
 import java.util.List;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.benyi.domain.ByDayflowassessmentplan;
 import com.ruoyi.project.benyi.service.IByDayFlowStandardService;
+import com.ruoyi.project.benyi.service.IByDayflowassessmentplanService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -36,6 +38,8 @@ public class ByDayflowassessmentController extends BaseController {
     private IByDayflowassessmentService byDayflowassessmentService;
     @Autowired
     private IByDayFlowStandardService byDayFlowStandardService;
+    @Autowired
+    private IByDayflowassessmentplanService byDayflowassessmentplanService;
 
     /**
      * 查询幼儿园一日流程评估列表
@@ -102,7 +106,7 @@ public class ByDayflowassessmentController extends BaseController {
             // 总扣分值
             Double sumKfz = 0.0;
             sumKfz = bzmfAll - sum;
-
+            ByDayflowassessmentplan byDayflowassessmentplan = new ByDayflowassessmentplan();
             // 如果评估对象是主班教师 直接更新主板分数
             if (byDayflowassessment.getPgdx().equals(byDayflowassessment.getBzbh())) {
                 // 主班教师扣分值
@@ -133,6 +137,10 @@ public class ByDayflowassessmentController extends BaseController {
                         byDayflowassessment2.setClassdf(avg);
                         byDayflowassessmentService.updateByDayflowassessment(byDayflowassessment2);
                     }
+                    // 将计划中的平均分同步更新
+                    byDayflowassessmentplan.setId(byDayflowassessment.getPlanid());
+                    byDayflowassessmentplan.setClassavg(avg);
+                    byDayflowassessmentplanService.updateByDayflowassessmentplan(byDayflowassessmentplan);
                 }
                 return ajax;
             } else {
@@ -176,6 +184,10 @@ public class ByDayflowassessmentController extends BaseController {
                             byDayflowassessment3.setClassdf(avg2);
                             byDayflowassessmentService.updateByDayflowassessment(byDayflowassessment3);
                         }
+                        // 将计划中的平均分同步更新
+                        byDayflowassessmentplan.setId(byDayflowassessment.getPlanid());
+                        byDayflowassessmentplan.setClassavg(avg2);
+                        byDayflowassessmentplanService.updateByDayflowassessmentplan(byDayflowassessmentplan);
                     }
                 }
                 return ajax;
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java
index e92070203..9969f86ed 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java
@@ -64,6 +64,12 @@ public class ByDayflowassessmentplan extends BaseEntity {
     @Excel(name = "内容分数")
     private Double score;
 
+    /**
+     * 班级平均分
+     */
+    @Excel(name = "班级平均分数")
+    private Double classavg;
+
     /**
      * 评估时间
      */
@@ -152,6 +158,7 @@ public class ByDayflowassessmentplan extends BaseEntity {
                 .append("classid", getClassid())
                 .append("connent", getConnent())
                 .append("score", getScore())
+                .append("classavg", getClassavg())
                 .append("starttime", getStarttime())
                 .append("createUserid", getCreateUserid())
                 .append("createTime", getCreateTime())
@@ -173,4 +180,12 @@ public class ByDayflowassessmentplan extends BaseEntity {
     public void setScore(double score) {
         this.score = score;
     }
+
+    public Double getClassavg() {
+        return classavg;
+    }
+
+    public void setClassavg(Double classavg) {
+        this.classavg = classavg;
+    }
 }
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml
index 58ecc0fe1..d2c610e74 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml
@@ -13,13 +13,14 @@
         <result property="classid" column="classid"/>
         <result property="connent" column="connent"/>
         <result property="score" column="score"/>
+        <result property="classavg" column="classavg"/>
         <result property="starttime" column="starttime"/>
         <result property="createUserid" column="create_userid"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectByDayflowassessmentplanVo">
-        select id, name, dept_id, month, xnxq, classid, connent, score, starttime, create_userid, create_time from by_dayflowassessmentplan
+        select id, name, dept_id, month, xnxq, classid, connent, score, classavg, starttime, create_userid, create_time from by_dayflowassessmentplan
     </sql>
 
     <select id="selectByDayflowassessmentplanList" parameterType="ByDayflowassessmentplan"
@@ -33,6 +34,7 @@
             <if test="classid != null  and classid != ''">and classid = #{classid}</if>
             <if test="connent != null  and connent != ''">and connent = #{connent}</if>
             <if test="score != null  and score != ''">and score = #{score}</if>
+            <if test="classavg != null  and classavg != ''">and classavg = #{classavg}</if>
             <if test="starttime != null ">and starttime = #{starttime}</if>
             <if test="createUserid != null ">and create_userid = #{createUserid}</if>
         </where>
@@ -55,6 +57,7 @@
             <if test="classid != null  and classid != ''">classid,</if>
             <if test="connent != null  and connent != ''">connent,</if>
             <if test="score != null  and score != ''">score,</if>
+            <if test="classavg != null  and classavg != ''">classavg,</if>
             <if test="starttime != null ">starttime,</if>
             <if test="createUserid != null ">create_userid,</if>
             <if test="createTime != null ">create_time,</if>
@@ -68,6 +71,7 @@
             <if test="classid != null  and classid != ''">#{classid},</if>
             <if test="connent != null  and connent != ''">#{connent},</if>
             <if test="score != null  and score != ''">#{score},</if>
+            <if test="classavg != null  and classavg != ''">#{classavg},</if>
             <if test="starttime != null ">#{starttime},</if>
             <if test="createUserid != null ">#{createUserid},</if>
             <if test="createTime != null ">#{createTime},</if>
@@ -84,6 +88,7 @@
             <if test="classid != null  and classid != ''">classid = #{classid},</if>
             <if test="connent != null  and connent != ''">connent = #{connent},</if>
             <if test="score != null  and score != ''">score = #{score},</if>
+            <if test="classavg != null  and classavg != ''">classavg = #{classavg},</if>
             <if test="starttime != null ">starttime = #{starttime},</if>
             <if test="createUserid != null ">create_userid = #{createUserid},</if>
             <if test="createTime != null ">create_time = #{createTime},</if>