在一日流程评估计划中添加班级平均分数
This commit is contained in:
sk1551
parent
b9e08fda2c
commit
89bb38b42e
@ -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,
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user