From c9c02326644d6fc2c923b24eb9408fdbb2dc0e7c Mon Sep 17 00:00:00 2001
From: weishengyou <2454197255@qq.com>
Date: Wed, 18 Mar 2026 17:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=85=E5=AF=BC=E5=91=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E8=80=83=E6=A0=B8-=E5=88=9D=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/SysTeacherKpiFillingStuMgt.java    | 16 +++++
 ...cherKpiFillingBusinessWorkServiceImpl.java |  4 +-
 ...SysTeacherKpiFillingStuMgtServiceImpl.java |  4 +-
 .../teacher/SysTeacherKpiFillingMapper.xml    | 68 +++++++++++++++++++
 .../SysTeacherKpiFillingStuMgtMapper.xml      | 64 +++++++++++++++++
 5 files changed, 152 insertions(+), 4 deletions(-)

diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java
index 7694a73..74d5e7b 100644
--- a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java
+++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingStuMgt.java
@@ -13,6 +13,8 @@ import lombok.*;
 import com.srs.common.core.domain.BaseEntity;
 
 import javax.validation.constraints.NotNull;
+import com.srs.teacher.domain.SysTeacherStuTestMaterials;
+import com.srs.teacher.domain.SysTeacherStuNoticeMaterials;
 
 
 /**
@@ -172,4 +174,18 @@ public class SysTeacherKpiFillingStuMgt extends BaseEntity {
     @ApiModelProperty(value = "每周深入学生宿舍佐证材料", hidden = true)
     @Excel(name = "每周深入学生宿舍佐证材料")
     private List<SysTeacherVisitDormitoryMaterials> visitDormitoryMaterialsList;
+
+    /**
+     * 职业测评/就业育人佐证材料
+     */
+    @ApiModelProperty(value = "职业测评/就业育人佐证材料", hidden = true)
+    @Excel(name = "职业测评/就业育人佐证材料")
+    private List<SysTeacherStuTestMaterials> edgMaterialsList;
+
+    /**
+     * 通知任务佐证材料
+     */
+    @ApiModelProperty(value = "通知任务佐证材料", hidden = true)
+    @Excel(name = "通知任务佐证材料")
+    private List<SysTeacherStuNoticeMaterials> noticeMaterialsList;
 }
diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java
index d605d71..3c6d06d 100644
--- a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java
+++ b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBusinessWorkServiceImpl.java
@@ -82,10 +82,10 @@ public class SysTeacherKpiFillingBusinessWorkServiceImpl extends ServiceImpl<Sys
     public int updateSysTeacherKpiFillingBusinessWork(SysTeacherKpiFillingBusinessWork sysTeacherKpiFillingBusinessWork) {
 //        sysTeacherKpiFillingBusinessWork.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
         // 判断填报记录是否填报
-        List<SysTeacherKpiFillingBusinessWork> sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(sysTeacherKpiFillingBusinessWork.getFdyName(), sysTeacherKpiFillingBusinessWork.getFillingYear(), sysTeacherKpiFillingBusinessWork.getFillingMonth(), sysTeacherKpiFillingBusinessWork.getClassType());
+        /*List<SysTeacherKpiFillingBusinessWork> sysTeacherKpiFillingBusinessWorkList = sysTeacherKpiFillingBusinessWorkMapper.selectSysTeacherKpiFillingBusinessWorkByFdyName(sysTeacherKpiFillingBusinessWork.getFdyName(), sysTeacherKpiFillingBusinessWork.getFillingYear(), sysTeacherKpiFillingBusinessWork.getFillingMonth(), sysTeacherKpiFillingBusinessWork.getClassType());
         if (sysTeacherKpiFillingBusinessWorkList != null && !sysTeacherKpiFillingBusinessWorkList.isEmpty()) {
             throw new ServiceException("已提交，请勿重复提交", 500);
-        }
+        }*/
         return sysTeacherKpiFillingBusinessWorkMapper.updateSysTeacherKpiFillingBusinessWork(sysTeacherKpiFillingBusinessWork);
     }
 
diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java
index e81f155..6e94a8e 100644
--- a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java
+++ b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingStuMgtServiceImpl.java
@@ -103,10 +103,10 @@ public class SysTeacherKpiFillingStuMgtServiceImpl extends ServiceImpl<SysTeache
      */
     @Override
     public int updateSysTeacherKpiFillingStuMgt(SysTeacherKpiFillingStuMgt sysTeacherKpiFillingStuMgt) {
-        List<SysTeacherKpiFillingStuMgt> sysTeacherKpiFillingStuMgts = sysTeacherKpiFillingStuMgtMapper.selectSysTeacherKpiFillingStuMgtByFdyNameAndFillingYear(sysTeacherKpiFillingStuMgt.getDepartmentName(), sysTeacherKpiFillingStuMgt.getFdyName(), sysTeacherKpiFillingStuMgt.getFillingYear(), sysTeacherKpiFillingStuMgt.getFillingMonth());
+        /*List<SysTeacherKpiFillingStuMgt> sysTeacherKpiFillingStuMgts = sysTeacherKpiFillingStuMgtMapper.selectSysTeacherKpiFillingStuMgtByFdyNameAndFillingYear(sysTeacherKpiFillingStuMgt.getDepartmentName(), sysTeacherKpiFillingStuMgt.getFdyName(), sysTeacherKpiFillingStuMgt.getFillingYear(), sysTeacherKpiFillingStuMgt.getFillingMonth());
         if (sysTeacherKpiFillingStuMgts != null && !sysTeacherKpiFillingStuMgts.isEmpty()) {
             throw new ServiceException("已提交，请勿重复提交", 500);
-        }
+        }*/
         if (sysTeacherKpiFillingStuMgt.getFdyName() == null) {
             sysTeacherKpiFillingStuMgt.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
         }
diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml
index a756a50..22a9815 100644
--- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml
+++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingMapper.xml
@@ -89,6 +89,14 @@
         <collection property="visitDormitoryMaterialsList"
                     column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
                     javaType="java.util.ArrayList" select="selectVisitDormitoryMaterialsById"/>
+        <!--职业测评/就业育人佐证材料子表的集合 -->
+        <collection property="edgMaterialsList"
+                    column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
+                    javaType="java.util.ArrayList" select="selectEdgMaterialsById"/>
+        <!--通知任务佐证材料子表的集合 -->
+        <collection property="noticeMaterialsList"
+                    column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}"
+                    javaType="java.util.ArrayList" select="selectNoticeMaterialsById"/>
     </resultMap>
 
     <!--个人填报-业务工作子表的映射 -->
@@ -401,6 +409,32 @@
         <result property="fillingYear" column="filling_year"/>
         <result property="fillingMonth" column="filling_month"/>
     </resultMap>
+    <!--个人填报-学生管理-职业测评材料子表的映射 -->
+    <resultMap type="SysTeacherStuTestMaterials" id="SysTeacherEdgMaterialsResult">
+        <result property="id" column="id"/>
+        <result property="developmentTime" column="development_time"/>
+        <result property="place" column="place"/>
+        <result property="className" column="class_name"/>
+        <result property="numberOfStudents" column="number_of_students"/>
+        <result property="mainContent" column="main_content"/>
+        <result property="photo" column="photo"/>
+        <result property="fdyName" column="fdy_name"/>
+        <result property="fillingYear" column="filling_year"/>
+        <result property="fillingMonth" column="filling_month"/>
+    </resultMap>
+    <!--个人填报-学生管理-通知任务材料子表的映射 -->
+    <resultMap type="SysTeacherStuNoticeMaterials" id="SysTeacherStuNoticeMaterialsResult">
+        <result property="id" column="id"/>
+        <result property="developmentTime" column="development_time"/>
+        <result property="place" column="place"/>
+        <result property="className" column="class_name"/>
+        <result property="numberOfStudents" column="number_of_students"/>
+        <result property="mainContent" column="main_content"/>
+        <result property="photo" column="photo"/>
+        <result property="fdyName" column="fdy_name"/>
+        <result property="fillingYear" column="filling_year"/>
+        <result property="fillingMonth" column="filling_month"/>
+    </resultMap>
     <!--个人填报-考勤管理-会议培训佐证材料子子表的映射 -->
     <resultMap type="SysTeacherConferenceMeetingMaterials" id="SysTeacherConferenceMeetingMaterialsResult">
         <result property="id" column="id"/>
@@ -497,6 +531,40 @@
         </where>
         order by id desc
     </select>
+    <!--查询个人填报-学生管理-职业测评材料子表的数据-->
+    <select id="selectEdgMaterialsById" resultMap="SysTeacherEdgMaterialsResult">
+        select *
+        from sys_teacher_stu_test_materials
+        <where>
+            <if test="fdyName != null and fdyName != ''">
+                and fdy_name = #{fdyName}
+            </if>
+            <if test="fillingYear != null and fillingYear != ''">
+                and filling_year = #{fillingYear}
+            </if>
+            <if test="fillingMonth != null and fillingMonth != ''">
+                and filling_month = #{fillingMonth}
+            </if>
+        </where>
+        order by id desc
+    </select>
+    <!--查询个人填报-学生管理-通知任务材料子表的数据-->
+    <select id="selectNoticeMaterialsById" resultMap="SysTeacherStuNoticeMaterialsResult">
+        select *
+        from sys_teacher_stu_notice_materials
+        <where>
+            <if test="fdyName != null and fdyName != ''">
+                and fdy_name = #{fdyName}
+            </if>
+            <if test="fillingYear != null and fillingYear != ''">
+                and filling_year = #{fillingYear}
+            </if>
+            <if test="fillingMonth != null and fillingMonth != ''">
+                and filling_month = #{fillingMonth}
+            </if>
+        </where>
+        order by id desc
+    </select>
     <!--个人填报-考勤管理-会议培训佐证材料子子表的数据-->
     <select id="selectConferenceMeetingMaterialsById" resultMap="SysTeacherConferenceMeetingMaterialsResult">
         select *
diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml
index b9d42ab..efb79cb 100644
--- a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml
+++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingStuMgtMapper.xml
@@ -29,6 +29,10 @@
         <collection property="stuTalkMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectStuTalkMaterialsById"/>
         <!--每周深入学生宿舍佐证材料子表的集合 -->
         <collection property="visitDormitoryMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectVisitDormitoryMaterialsById"/>
+        <!--职业测评/就业育人佐证材料子表的集合 -->
+        <collection property="edgMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectEdgMaterialsById"/>
+        <!--通知任务佐证材料子表的集合 -->
+        <collection property="noticeMaterialsList" column="{fdyName = fdy_name, fillingYear = filling_year, fillingMonth = filling_month}" javaType="java.util.ArrayList" select="selectNoticeMaterialsById"/>
     </resultMap>
 
     <!--干部会议佐证材料子表的映射 -->
@@ -95,6 +99,32 @@
         <result property="fillingYear" column="filling_year"/>
         <result property="fillingMonth" column="filling_month"/>
     </resultMap>
+    <!--职业测评/就业育人佐证材料子表的映射 -->
+    <resultMap type="SysTeacherStuTestMaterials" id="SysTeacherEdgMaterialsResult">
+        <result property="id" column="id"/>
+        <result property="developmentTime" column="development_time"/>
+        <result property="place" column="place"/>
+        <result property="className" column="class_name"/>
+        <result property="numberOfStudents" column="number_of_students"/>
+        <result property="mainContent" column="main_content"/>
+        <result property="photo" column="photo"/>
+        <result property="fdyName" column="fdy_name"/>
+        <result property="fillingYear" column="filling_year"/>
+        <result property="fillingMonth" column="filling_month"/>
+    </resultMap>
+    <!--通知任务佐证材料子表的映射 -->
+    <resultMap type="SysTeacherStuNoticeMaterials" id="SysTeacherStuNoticeMaterialsResult">
+        <result property="id" column="id"/>
+        <result property="developmentTime" column="development_time"/>
+        <result property="place" column="place"/>
+        <result property="className" column="class_name"/>
+        <result property="numberOfStudents" column="number_of_students"/>
+        <result property="mainContent" column="main_content"/>
+        <result property="photo" column="photo"/>
+        <result property="fdyName" column="fdy_name"/>
+        <result property="fillingYear" column="filling_year"/>
+        <result property="fillingMonth" column="filling_month"/>
+    </resultMap>
 
     <!--查询干部会议佐证材料子表的数据-->
     <select id="selectCadreMeetingMaterialsById" resultMap="SysTeacherCadreMeetingMaterialsResult">
@@ -176,6 +206,40 @@
             </if>
         </where>
     </select>
+    <!--职业测评/就业育人佐证材料子表的数据-->
+    <select id="selectEdgMaterialsById" resultMap="SysTeacherEdgMaterialsResult">
+        select *
+        from sys_teacher_stu_test_materials
+        <where>
+            <if test="fdyName != null and fdyName != ''">
+                and  fdy_name  = #{fdyName}
+            </if>
+            <if test="fillingYear != null and fillingYear != ''">
+                and filling_year = #{fillingYear}
+            </if>
+            <if test="fillingMonth != null and fillingMonth != ''">
+                and filling_month = #{fillingMonth}
+            </if>
+        </where>
+        order by id desc
+    </select>
+    <!--通知任务佐证材料子表的数据-->
+    <select id="selectNoticeMaterialsById" resultMap="SysTeacherStuNoticeMaterialsResult">
+        select *
+        from sys_teacher_stu_notice_materials
+        <where>
+            <if test="fdyName != null and fdyName != ''">
+                and  fdy_name  = #{fdyName}
+            </if>
+            <if test="fillingYear != null and fillingYear != ''">
+                and filling_year = #{fillingYear}
+            </if>
+            <if test="fillingMonth != null and fillingMonth != ''">
+                and filling_month = #{fillingMonth}
+            </if>
+        </where>
+        order by id desc
+    </select>
 
     <sql id="selectSysTeacherKpiFillingStuMgtVo">
         select id,