From 723e7e454e98df85f5cbbbb7057cc60fc15918f8 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Fri, 23 Jul 2021 09:23:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=9C=88=E7=BB=A9=E6=95=88?= =?UTF-8?q?=E8=80=83=E6=A0=B8-=E6=A0=B9=E6=8D=AE=E6=9C=88=E4=BB=BD?= =?UTF-8?q?=E5=92=8C=E6=95=99=E5=B8=88=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B5=81=E7=A8=8B=E5=BE=97=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/benyi/teacherassessment/index.vue | 4 +-- .../ByTeacherassessmentController.java | 20 ++++++++--- .../benyi/domain/ByTeacherassessment.java | 13 ++++++++ .../benyi/ByTeacherassessmentMapper.xml | 33 ++++++++++++------- 4 files changed, 51 insertions(+), 19 deletions(-) diff --git a/ruoyi-ui/src/views/benyi/teacherassessment/index.vue b/ruoyi-ui/src/views/benyi/teacherassessment/index.vue index 584540e7f..d81e9716d 100644 --- a/ruoyi-ui/src/views/benyi/teacherassessment/index.vue +++ b/ruoyi-ui/src/views/benyi/teacherassessment/index.vue @@ -113,8 +113,8 @@ diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTeacherassessmentController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTeacherassessmentController.java index 74c5c17f2..0ccbfa182 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTeacherassessmentController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByTeacherassessmentController.java @@ -73,10 +73,20 @@ public class ByTeacherassessmentController extends BaseController { @Log(title = "教师月绩效考核", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ByTeacherassessment byTeacherassessment) { - byTeacherassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); - Double total=(byTeacherassessment.getYrlcbl()*0.6)+(byTeacherassessment.getJskqbl()*0.1)+(byTeacherassessment.getYekqbl()*0.1)+(byTeacherassessment.getSgbl()*0.15)+(byTeacherassessment.getWsbl()*0.05); - byTeacherassessment.setZfbl(total); - return toAjax(byTeacherassessmentService.insertByTeacherassessment(byTeacherassessment)); + + //首先判断该教师当前月份是否已经被考核 + ByTeacherassessment byTeacherassessmentQuery = new ByTeacherassessment(); + byTeacherassessmentQuery.setJsid(byTeacherassessment.getJsid()); + byTeacherassessmentQuery.setMonth(byTeacherassessment.getMonth()); + List list = byTeacherassessmentService.selectByTeacherassessmentList(byTeacherassessmentQuery); + if (list != null && list.size() > 0) { + return AjaxResult.error("该教师当前月份绩效考核以创建，无法重复创建。"); + } else { + byTeacherassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDept().getDeptId()); + Double total = (byTeacherassessment.getYrlcbl() * 0.6) + (byTeacherassessment.getJskqbl() * 0.1) + (byTeacherassessment.getYekqbl() * 0.1) + (byTeacherassessment.getSgbl() * 0.15) + (byTeacherassessment.getWsbl() * 0.05); + byTeacherassessment.setZfbl(total); + return toAjax(byTeacherassessmentService.insertByTeacherassessment(byTeacherassessment)); + } } /** @@ -86,7 +96,7 @@ public class ByTeacherassessmentController extends BaseController { @Log(title = "教师月绩效考核", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ByTeacherassessment byTeacherassessment) { - Double total=(byTeacherassessment.getYrlcbl()*0.6)+(byTeacherassessment.getJskqbl()*0.1)+(byTeacherassessment.getYekqbl()*0.1)+(byTeacherassessment.getSgbl()*0.15)+(byTeacherassessment.getWsbl()*0.05); + Double total = (byTeacherassessment.getYrlcbl() * 0.6) + (byTeacherassessment.getJskqbl() * 0.1) + (byTeacherassessment.getYekqbl() * 0.1) + (byTeacherassessment.getSgbl() * 0.15) + (byTeacherassessment.getWsbl() * 0.05); byTeacherassessment.setZfbl(total); return toAjax(byTeacherassessmentService.updateByTeacherassessment(byTeacherassessment)); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java index 795d36502..a2a2899fe 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java @@ -1,5 +1,7 @@ package com.ruoyi.project.benyi.domain; +import com.ruoyi.project.system.domain.SysDept; +import com.ruoyi.project.system.domain.SysUser; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.framework.aspectj.lang.annotation.Excel; @@ -79,6 +81,16 @@ public class ByTeacherassessment extends BaseEntity { @Excel(name = "总分") private Double zfbl; + public SysUser getSysUser() { + return sysUser; + } + + public void setSysUser(SysUser sysUser) { + this.sysUser = sysUser; + } + + private SysUser sysUser; + public void setId(Long id) { this.id = id; } @@ -182,6 +194,7 @@ public class ByTeacherassessment extends BaseEntity { .append("wsbl", getWsbl()) .append("zfbl", getZfbl()) .append("createTime", getCreateTime()) + .append("sysUser",getSysUser()) .toString(); } } diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml index f9999b24c..c9d3ae51b 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml @@ -17,32 +17,41 @@ + + + + + + + - select id, jsid, classid, dept_id, month, yrlcbl, jskqbl, yekqbl, sgbl, wsbl, zfbl, create_time from by_teacherassessment + select a.id, a.jsid, a.classid, a.dept_id, a.month, a.yrlcbl, a.jskqbl, a.yekqbl, a.sgbl, a.wsbl, a.zfbl, a.create_time,b.nick_name from by_teacherassessment a + left join sys_user b on a.jsid=b.user_id