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 @@
       <el-table-column
         label="教师"
         align="center"
-        prop="jsid"
-        :formatter="userFormat"
+        prop="sysUser.nickName"
+        
       />
       <el-table-column label="考核月份" align="center" prop="month" />
       <el-table-column label="一日流程" align="center" prop="yrlcbl" />
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<ByTeacherassessment> 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 @@
         <result property="wsbl" column="wsbl"/>
         <result property="zfbl" column="zfbl"/>
         <result property="createTime" column="create_time"/>
+        <association property="sysUser" column="jsid" javaType="SysUser" resultMap="SysUserResult"/>
+    </resultMap>
+
+    <resultMap type="SysUser" id="SysUserResult">
+        <id property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
     </resultMap>
 
     <sql id="selectByTeacherassessmentVo">
-        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
     </sql>
 
     <select id="selectByTeacherassessmentList" parameterType="ByTeacherassessment"
             resultMap="ByTeacherassessmentResult">
         <include refid="selectByTeacherassessmentVo"/>
         <where>
-            <if test="jsid != null ">and jsid = #{jsid}</if>
-            <if test="classid != null  and classid != ''">and classid = #{classid}</if>
-            <if test="deptId != null ">and dept_id = #{deptId}</if>
-            <if test="month != null  and month != ''">and month = #{month}</if>
-            <if test="yrlcbl != null ">and yrlcbl = #{yrlcbl}</if>
-            <if test="jskqbl != null ">and jskqbl = #{jskqbl}</if>
-            <if test="yekqbl != null ">and yekqbl = #{yekqbl}</if>
-            <if test="sgbl != null ">and sgbl = #{sgbl}</if>
-            <if test="wsbl != null ">and wsbl = #{wsbl}</if>
-            <if test="zfbl != null ">and zfbl = #{zfbl}</if>
+            <if test="jsid != null ">and a.jsid = #{jsid}</if>
+            <if test="classid != null  and classid != ''">and a.classid = #{classid}</if>
+            <if test="deptId != null ">and a.dept_id = #{deptId}</if>
+            <if test="month != null  and month != ''">and a.month = #{month}</if>
+            <if test="yrlcbl != null ">and a.yrlcbl = #{yrlcbl}</if>
+            <if test="jskqbl != null ">and a.jskqbl = #{jskqbl}</if>
+            <if test="yekqbl != null ">and a.yekqbl = #{yekqbl}</if>
+            <if test="sgbl != null ">and a.sgbl = #{sgbl}</if>
+            <if test="wsbl != null ">and a.wsbl = #{wsbl}</if>
+            <if test="zfbl != null ">and a.zfbl = #{zfbl}</if>
         </where>
+        order by a.create_time desc
     </select>
 
     <select id="selectByTeacherassessmentById" parameterType="Long" resultMap="ByTeacherassessmentResult">
         <include refid="selectByTeacherassessmentVo"/>
-        where id = #{id}
+        where a.id = #{id}
     </select>
 
     <insert id="insertByTeacherassessment" parameterType="ByTeacherassessment" useGeneratedKeys="true" keyProperty="id">