From b65757c8bfa987af3eea94646f02bdf002b57725 Mon Sep 17 00:00:00 2001 From: sk1551 <15175617877@163.com> Date: Thu, 25 Feb 2021 17:53:31 +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=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/router/index.js | 15 +++ ruoyi-ui/src/views/benyi/dayflow/standard.vue | 2 + .../views/benyi/dayflowassessment/index.vue | 91 +++++++++---------- .../ByDayflowassessmentController.java | 19 +++- .../ByDayflowassessmentplanController.java | 56 ++++++++---- .../benyi/domain/ByDayFlowStandard.java | 12 +++ .../benyi/domain/ByDayflowassessment.java | 44 +++++++++ .../benyi/domain/ByDayflowassessmentplan.java | 6 +- .../mybatis/benyi/ByDayFlowStandardMapper.xml | 7 +- .../benyi/ByDayflowassessmentMapper.xml | 12 ++- 10 files changed, 195 insertions(+), 69 deletions(-) diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 9ba770f13..12da3257c 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -454,6 +454,21 @@ export const constantRoutes = [{ } }] }, + { + path: '/benyi/dayflowassessment', + component: Layout, + hidden: true, + children: [{ + path: 'teacher/:id(\\d+)', + component: () => + import ('@/views/benyi/dayflowassessment/teacher'), + name: 'dayflowassessmentteacher', + meta: { + title: '一日流程评估详情', + icon: '' + } + }] + }, { path: '/benyi/assessmentchild', component: Layout, diff --git a/ruoyi-ui/src/views/benyi/dayflow/standard.vue b/ruoyi-ui/src/views/benyi/dayflow/standard.vue index e4ea23757..83dca160e 100644 --- a/ruoyi-ui/src/views/benyi/dayflow/standard.vue +++ b/ruoyi-ui/src/views/benyi/dayflow/standard.vue @@ -177,6 +177,7 @@ export default { taskCode: undefined, standardTitle: undefined, standardSort: undefined, + score: undefined, createuser: undefined, createtime: undefined, updateuser: undefined, @@ -237,6 +238,7 @@ export default { taskCode: undefined, standardTitle: undefined, standardSort: 0, + score: undefined, createuser: undefined, createtime: undefined, updateuser: undefined, diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue index 3e920ce7f..7e13612ec 100644 --- a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue +++ b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue @@ -55,41 +55,6 @@ - - - 新增 - - - 修改 - - - 删除 - - - - - - + + + - + + - + + 修改评估 - 删除 + > --> @@ -238,9 +205,9 @@ - + { @@ -456,7 +429,6 @@ export default { planFormat(row, column) { var actions = []; var datas = this.dayflowassessmentplanOptions; - console.log(this.dayflowassessmentplanOptions); Object.keys(datas).map((key) => { if (datas[key].id == "" + row.planid) { actions.push(datas[key].name); @@ -465,6 +437,25 @@ export default { }); return actions.join(""); }, + /** 查询一日流程列表 */ + getDayFlowList() { + listDetail(null).then((response) => { + this.detailOptions = response.rows; + }); + }, + // 一日流程内容字典翻译 + dayFlowFormat(row, column) { + // return this.selectDictLabel(this.classOptions, row.classid); + var actions = []; + var datas = this.detailOptions; + Object.keys(datas).map((key) => { + if (datas[key].id + "" == "" + row.bzid) { + actions.push(datas[key].name); + return false; + } + }); + return actions.join(""); + }, // 学年学期类型--字典状态字典翻译 xnxqFormat(row, column) { return this.selectDictLabel(this.xnxqOptions, row.xnxq); @@ -490,6 +481,8 @@ export default { xnxq: undefined, bzid: undefined, kfz: undefined, + bzmf: undefined, + zzdf: undefined, kfcs: undefined, pgdx: undefined, createUserid: undefined, @@ -525,6 +518,10 @@ export default { this.zljsOptions = response.zljs; }); }, + handleAssessment(row) { + const id = row.id; + this.$router.push({ path: "/benyi/dayflowassessment/teacher/" + id }); + }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); 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 b67cf8981..d8cf18eca 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,6 +3,7 @@ package com.ruoyi.project.benyi.controller; import java.util.List; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.project.benyi.service.IByDayFlowStandardService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,6 +34,8 @@ import com.ruoyi.framework.web.page.TableDataInfo; public class ByDayflowassessmentController extends BaseController { @Autowired private IByDayflowassessmentService byDayflowassessmentService; + @Autowired + private IByDayFlowStandardService byDayFlowStandardService; /** * 查询幼儿园一日流程评估列表 @@ -85,7 +88,21 @@ public class ByDayflowassessmentController extends BaseController { @Log(title = "幼儿园一日流程评估", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ByDayflowassessment byDayflowassessment) { - return toAjax(byDayflowassessmentService.updateByDayflowassessment(byDayflowassessment)); + if (byDayflowassessment.getItems() != null) { + // 取出标准id并根据id查询此标准的分数 + String[] arr = byDayflowassessment.getItems().split(","); + // 勾选的总分数sum + Double sum = 0.0; + for (int i=0; i 0) { // 判断班级下是否有老师 - int sum = 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) { - System.out.println("这是主班教师111"); - 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())); @@ -134,15 +129,44 @@ public class ByDayflowassessmentplanController extends BaseController { byDayflowassessment.setZlbh(zljsNew); } byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment); - sum += 1; } if (pbjsNew != null) { - System.out.println("这是配班教师222"); - sum += 1; + 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) { - System.out.println("这是助理教师333"); - sum += 1; + 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); @@ -164,7 +188,7 @@ public class ByDayflowassessmentplanController extends BaseController { String dict_value = byDayflowassessmentplan.getXnxq(); 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() + "-" + "评估计划" ); + byDayflowassessmentplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-" + sysDictDataService.selectDictLabel(dict_type, dict_value) + "-" + byDayFlowDetailService.selectByDayFlowDetailById(connentId).getName() + "-" + "评估计划"); return toAjax(byDayflowassessmentplanService.updateByDayflowassessmentplan(byDayflowassessmentplan)); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java index 99fe4e8ac..f84dd0429 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayFlowStandard.java @@ -38,6 +38,10 @@ public class ByDayFlowStandard extends BaseEntity { @Excel(name = "标准排序") private Long standardSort; + + // 标准的分数 + private Double score; + /** * 标准数量 */ @@ -154,7 +158,15 @@ public class ByDayFlowStandard extends BaseEntity { .append("createtime", getCreatetime()) .append("updateuser", getUpdateuser()) .append("updatetime", getUpdatetime()) + .append("score", getScore()) .toString(); } + public Double getScore() { + return score; + } + + public void setScore(Double score) { + this.score = score; + } } 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 18c071e76..528c185e4 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 @@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.web.domain.BaseEntity; +import java.util.List; + /** * 幼儿园一日流程评估对象 by_dayflowassessment * @@ -25,6 +27,8 @@ public class ByDayflowassessment extends BaseEntity { @Excel(name = "所属计划") private Long planid; + private String items; + /** * 学校编号 */ @@ -85,6 +89,12 @@ public class ByDayflowassessment extends BaseEntity { @Excel(name = "评估标准编号") private Long bzid; + /** + * 评估标准满分 + */ + @Excel(name = "评估标准满分") + private Double bzmf; + /** * 扣分值 */ @@ -97,6 +107,12 @@ public class ByDayflowassessment extends BaseEntity { @Excel(name = "扣分次数") private Long kfcs; + /** + * 最终得分 + */ + @Excel(name = "评估标准满分") + private Double zzdf; + /** * 评估对象 */ @@ -254,9 +270,37 @@ public class ByDayflowassessment extends BaseEntity { .append("bzid", getBzid()) .append("kfz", getKfz()) .append("kfcs", getKfcs()) + .append("bzmf", getBzmf()) + .append("zzdf", getZzdf()) .append("pgdx", getPgdx()) + .append("items", getItems()) .append("createUserid", getCreateUserid()) .append("createTime", getCreateTime()) .toString(); } + + public Double getBzmf() { + return bzmf; + } + + public void setBzmf(Double bzmf) { + this.bzmf = bzmf; + } + + public Double getZzdf() { + return zzdf; + } + + public void setZzdf(Double zzdf) { + this.zzdf = zzdf; + } + + + public String getItems() { + return items; + } + + public void setItems(String items) { + this.items = items; + } } 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 3e709699f..e92070203 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 @@ -62,7 +62,7 @@ public class ByDayflowassessmentplan extends BaseEntity { * 内容分数 */ @Excel(name = "内容分数") - private float score; + private Double score; /** * 评估时间 @@ -166,11 +166,11 @@ public class ByDayflowassessmentplan extends BaseEntity { this.name = name; } - public float getScore() { + public Double getScore() { return score; } - public void setScore(float score) { + public void setScore(double score) { this.score = score; } } diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml index ff322818b..28f6c3df5 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml @@ -11,13 +11,14 @@ + - select id, task_code, standard_title, standard_sort,(select count(*) from by_day_flow_unscramble where standard_id=by_day_flow_standard.id) unscramble_count, createuser, createtime, updateuser, updatetime from by_day_flow_standard + select id, task_code, standard_title, score, standard_sort,(select count(*) from by_day_flow_unscramble where standard_id=by_day_flow_standard.id) unscramble_count, createuser, createtime, updateuser, updatetime from by_day_flow_standard and xnxq = #{xnxq} and bzid = #{bzid} and kfz = #{kfz} + and bzmf = #{bzmf} + and zzdf = #{zzdf} and kfcs = #{kfcs} and pgdx = #{pgdx} and create_userid = #{createUserid} @@ -70,6 +74,8 @@ xnxq, bzid, kfz, + bzmf, + zzdf, kfcs, pgdx, create_userid, @@ -88,6 +94,8 @@ #{xnxq}, #{bzid}, #{kfz}, + #{bzmf}, + #{zzdf}, #{kfcs}, #{pgdx}, #{createUserid}, @@ -110,6 +118,8 @@ xnxq = #{xnxq}, bzid = #{bzid}, kfz = #{kfz}, + bzmf = #{bzmf}, + zzdf = #{zzdf}, kfcs = #{kfcs}, pgdx = #{pgdx}, create_userid = #{createUserid},