入伍申请记录学院名称过滤

- 在SysTeacherKpiFillingBusinessWork实体类中添加stuLeaveRequestScoring字段
- 更新数据库映射文件中的查询、插入和更新语句以支持新字段
- 创建SysTeacherStuNoticeMaterials实体类用于通知任务材料管理
- 创建SysTeacherStuTestMaterials实体类用于职业测评材料管理
- 实现相关服务接口及控制器以支持通知任务材料的CRUD操作
- 实现相关服务接口及控制器以支持职业测评材料的CRUD操作
- 添加对应的数据访问层映射和XML配置文件
- 实现服务层业务逻辑及数据安全控制

srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherStuNoticeMaterialsController.java

@@ -0,0 +1,115 @@
+package com.srs.web.controller.teacher;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.srs.common.annotation.RepeatSubmit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.teacher.domain.SysTeacherStuNoticeMaterials;
+import com.srs.teacher.service.ISysTeacherStuNoticeMaterialsService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 通知任务材料Controller
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+@RestController
+@RequestMapping("/teacher/stuNoticeMaterials")
+@Api(value = "通知任务材料管理", tags = "通知任务材料管理")
+public class SysTeacherStuNoticeMaterialsController extends BaseController {
+    @Autowired
+    private ISysTeacherStuNoticeMaterialsService sysTeacherStuNoticeMaterialsService;
+
+    /**
+     * 查询通知任务材料列表
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询通知任务材料列表")
+    public TableDataInfo list(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials) {
+        startPage();
+        List<SysTeacherStuNoticeMaterials> list = sysTeacherStuNoticeMaterialsService.selectSysTeacherStuNoticeMaterialsList(sysTeacherStuNoticeMaterials);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据辅导员名称、年份 月份 查询详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:list')")
+    @GetMapping("/getByFdyNameAndYearAndMonth")
+    @ApiOperation("根据名称年月查询通知任务材料列表")
+    public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth) {
+        startPage();
+        List<SysTeacherStuNoticeMaterials> list = sysTeacherStuNoticeMaterialsService.selectSysTeacherStuNoticeMaterialsByFdyName(fdyName, fillingYear, fillingMonth);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出通知任务材料列表
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:export')")
+    @Log(title = "通知任务材料", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出通知任务材料列表")
+    public void export(HttpServletResponse response, SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials) {
+        List<SysTeacherStuNoticeMaterials> list = sysTeacherStuNoticeMaterialsService.selectSysTeacherStuNoticeMaterialsList(sysTeacherStuNoticeMaterials);
+        ExcelUtil<SysTeacherStuNoticeMaterials> util = new ExcelUtil<SysTeacherStuNoticeMaterials>(SysTeacherStuNoticeMaterials.class);
+        util.exportExcel(response, list, "通知任务材料数据");
+    }
+
+    /**
+     * 获取通知任务材料详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取通知任务材料详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(sysTeacherStuNoticeMaterialsService.selectSysTeacherStuNoticeMaterialsById(id));
+    }
+
+    /**
+     * 新增通知任务材料
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:add')")
+    @Log(title = "通知任务材料", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增通知任务材料")
+    @RepeatSubmit(interval = 1000, message = "请求过于频繁")
+    public AjaxResult add(@RequestBody SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials) {
+        return toAjax(sysTeacherStuNoticeMaterialsService.insertSysTeacherStuNoticeMaterials(sysTeacherStuNoticeMaterials));
+    }
+
+    /**
+     * 修改通知任务材料
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:edit')")
+    @Log(title = "通知任务材料", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改通知任务材料")
+    @RepeatSubmit(interval = 1000, message = "请求过于频繁")
+    public AjaxResult edit(@RequestBody SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials) {
+        return toAjax(sysTeacherStuNoticeMaterialsService.updateSysTeacherStuNoticeMaterials(sysTeacherStuNoticeMaterials));
+    }
+
+    /**
+     * 删除通知任务材料
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:remove')")
+    @Log(title = "通知任务材料", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除通知任务材料")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(sysTeacherStuNoticeMaterialsService.deleteSysTeacherStuNoticeMaterialsByIds(ids));
+    }
+}

srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherStuTestMaterialsController.java

@@ -0,0 +1,115 @@
+package com.srs.web.controller.teacher;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.srs.common.annotation.RepeatSubmit;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import com.srs.teacher.domain.SysTeacherStuTestMaterials;
+import com.srs.teacher.service.ISysTeacherStuTestMaterialsService;
+import com.srs.common.core.controller.BaseController;
+import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.utils.poi.ExcelUtil;
+import com.srs.common.enums.BusinessType;
+import com.srs.common.annotation.Log;
+import com.srs.common.core.page.TableDataInfo;
+
+/**
+ * 职业测评材料Controller
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+@RestController
+@RequestMapping("/teacher/stuTestMaterials")
+@Api(value = "职业测评材料管理", tags = "职业测评材料管理")
+public class SysTeacherStuTestMaterialsController extends BaseController {
+    @Autowired
+    private ISysTeacherStuTestMaterialsService sysTeacherStuTestMaterialsService;
+
+    /**
+     * 查询职业测评材料列表
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:list')")
+    @GetMapping("/list")
+    @ApiOperation("查询职业测评材料列表")
+    public TableDataInfo list(SysTeacherStuTestMaterials sysTeacherStuTestMaterials) {
+        startPage();
+        List<SysTeacherStuTestMaterials> list = sysTeacherStuTestMaterialsService.selectSysTeacherStuTestMaterialsList(sysTeacherStuTestMaterials);
+        return getDataTable(list);
+    }
+
+    /**
+     * 根据辅导员名称、年份 月份 查询详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:list')")
+    @GetMapping("/getByFdyNameAndYearAndMonth")
+    @ApiOperation("根据名称年月查询职业测评材料列表")
+    public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, @RequestParam String fillingYear, @RequestParam String fillingMonth) {
+        startPage();
+        List<SysTeacherStuTestMaterials> list = sysTeacherStuTestMaterialsService.selectSysTeacherStuTestMaterialsByFdyName(fdyName, fillingYear, fillingMonth);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出职业测评材料列表
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:export')")
+    @Log(title = "职业测评材料", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ApiOperation("导出职业测评材料列表")
+    public void export(HttpServletResponse response, SysTeacherStuTestMaterials sysTeacherStuTestMaterials) {
+        List<SysTeacherStuTestMaterials> list = sysTeacherStuTestMaterialsService.selectSysTeacherStuTestMaterialsList(sysTeacherStuTestMaterials);
+        ExcelUtil<SysTeacherStuTestMaterials> util = new ExcelUtil<SysTeacherStuTestMaterials>(SysTeacherStuTestMaterials.class);
+        util.exportExcel(response, list, "职业测评材料数据");
+    }
+
+    /**
+     * 获取职业测评材料详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:query')")
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取职业测评材料详细信息")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(sysTeacherStuTestMaterialsService.selectSysTeacherStuTestMaterialsById(id));
+    }
+
+    /**
+     * 新增职业测评材料
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:add')")
+    @Log(title = "职业测评材料", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ApiOperation("新增职业测评材料")
+    @RepeatSubmit(interval = 1000, message = "请求过于频繁")
+    public AjaxResult add(@RequestBody SysTeacherStuTestMaterials sysTeacherStuTestMaterials) {
+        return toAjax(sysTeacherStuTestMaterialsService.insertSysTeacherStuTestMaterials(sysTeacherStuTestMaterials));
+    }
+
+    /**
+     * 修改职业测评材料
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:edit')")
+    @Log(title = "职业测评材料", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改职业测评材料")
+    @RepeatSubmit(interval = 1000, message = "请求过于频繁")
+    public AjaxResult edit(@RequestBody SysTeacherStuTestMaterials sysTeacherStuTestMaterials) {
+        return toAjax(sysTeacherStuTestMaterialsService.updateSysTeacherStuTestMaterials(sysTeacherStuTestMaterials));
+    }
+
+    /**
+     * 删除职业测评材料
+     */
+    @PreAuthorize("@ss.hasPermi('teacher:stuActivityMaterials:remove')")
+    @Log(title = "职业测评材料", businessType = BusinessType.DELETE)
+    @PostMapping("/{ids}")
+    @ApiOperation("删除职业测评材料")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(sysTeacherStuTestMaterialsService.deleteSysTeacherStuTestMaterialsByIds(ids));
+    }
+}

srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java

@@ -216,6 +216,14 @@ private static final long serialVersionUID=1L;
     @Excel(name = "流程部署编号")
     private String deployId;
 
+    /**
+     * 学院名称
+     */
+    @ApiModelProperty("学院名称")
+    @TableField("dept_name")
+    @Excel(name = "学院名称")
+    private String deptName;
+
     /**
      * 入伍保留学籍申请表-审核记录
      */

srs-routine/src/main/java/com/srs/routine/mapper/RtEnlistmentReserveMapper.java

@@ -62,6 +62,13 @@ public interface RtEnlistmentReserveMapper extends BaseMapper<RtEnlistmentReserv
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
     int insertRtEnlistmentReserve(RtEnlistmentReserve rtEnlistmentReserve);
 
+    /**
+     * Mapper接口方法：统计指定年份的保留学籍记录数
+     * @param year 年份（如2026）
+     * @return 该年份的记录总数
+     */
+    int countByYear(@Param("year") String year);
+
     /**
      * 修改应征入伍保留学籍申请
      *

srs-routine/src/main/java/com/srs/routine/service/impl/RtEnlistmentReserveServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.srs.common.core.domain.AjaxResult;
+import com.srs.common.core.domain.entity.SysUser;
 import com.srs.common.doman.dto.ProcessResultDto;
 import com.srs.common.doman.vo.TeacherVo;
 import com.srs.common.exception.ServiceException;
@@ -16,6 +17,7 @@ import com.srs.dormitory.domain.DmsOutsideAccommodationApply;
 import com.srs.dormitory.mapper.DmsOutsideAccommodationApplyMapper;
 import com.srs.flowable.service.IFlowDefinitionService;
 import com.srs.routine.domain.RtEnlistmentReserveApproval;
+import com.srs.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import com.srs.routine.mapper.RtStuLeaveApplicationMapper;
 import org.apache.commons.lang3.StringUtils;
@@ -53,6 +55,9 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
     @Autowired
     IdentityService identityService;
 
+    @Autowired
+    ISysUserService sysUserService;
+
 
     // 注入RuntimeService
     @Autowired
@@ -103,23 +108,28 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
             throw new ServiceException("您已经申请过了，请勿重新申请！", 400);
         }
 
+        SysUser sysUser = sysUserService.selectUserByUserName(rtEnlistmentReserve.getStudentNo());
+        if (sysUser == null) {
+            throw new ServiceException("该学生不存在", 500);
+        }
+
         // ========== 生成保留学籍编号 ==========
-        // 查询申请记录数量
-        List<RtEnlistmentReserve> rtEnlistmentReserves = rtEnlistmentReserveMapper.getEnlistmentReserves();
-        int total = rtEnlistmentReserves.size();
-        // 设置保留学籍编号 （LBXJ0001（LBXJ是固定的，0001根据数据数量累加） + 时间（根据系统时间，但是格式要20260304））
-        // 1. 获取当前系统时间，格式化为8位日期（yyyyMMdd）
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String dateStr = sdf.format(new Date());
+        // 1. 获取当前系统年份（用于编号和序号重置判断）
+        SimpleDateFormat yearSdf = new SimpleDateFormat("yyyy");
+        String currentYear = yearSdf.format(new Date()); // 如2026
 
-        // 2. 计算自增序号（总数+1，确保新编号是下一个序号），补零为4位
-        int seq = total + 1;
-        String seqStr = String.format("%04d", seq); // 不足4位时前面补0，如1→0001，10→0010
+        // 2. 查询「当前年份」的记录总数（按年份分组统计，实现每年序号重置）
+        // 统计rt_enlistment_reserve表中，reserve_no以"BLXJ("+currentYear+")"开头的记录数
+        int yearTotal = rtEnlistmentReserveMapper.countByYear(currentYear);
 
-        // 3. 拼接保留学籍编号：LBXJ + 4位序号 + 8位日期
-        String reserveNo = "LBXJ" + seqStr + dateStr;
+        // 3. 计算当年自增序号（总数+1），补零为3位（001、002...999）
+        int seq = yearTotal + 1;
+        String seqStr = String.format("%03d", seq); // 不足3位补0，如1→001，10→010
 
-        // 4. 设置到实体对象中
+        // 4. 拼接最终编号：BLXJ(年份)序号
+        String reserveNo = "BLXJ(" + currentYear + ")" + seqStr;
+
+        // 5. 设置到实体对象中
         rtEnlistmentReserve.setReserveNo(reserveNo);
 
         rtEnlistmentReserve.setCreateTime(DateUtils.getNowDate());
@@ -139,7 +149,9 @@ public class RtEnlistmentReserveServiceImpl extends ServiceImpl<RtEnlistmentRese
         // 注意：若前端未传 applyStatus，数据库默认 0，不会触发流程
         if (1 == rtEnlistmentReserve.getApplyStatus()) {
             // 绑定当前学生 ID（提交人即学生本人，确保流程变量准确）
-            rtEnlistmentReserve.setStudentId(SecurityUtils.getUserId());
+            if (rtEnlistmentReserve.getStudentId() == null) {
+                rtEnlistmentReserve.setStudentId(SecurityUtils.getUserId());
+            }
 
             // 启动流程（此时 applyId 已存在，可正常传递）
             ProcessResultDto processResultDto = startEnlistmentReserveProcess(rtEnlistmentReserve);

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml

@@ -46,6 +46,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="affixId" column="affix_id"/>
         <result property="deployId"    column="deploy_id"    />
+        <result property="deptName"    column="dept_name"    />
         <!--入伍保留学籍申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
         <collection property="enlistmentReserveApprovalList"
                     column="{studentName = student_name, studentNo = student_no}"

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml

@@ -29,6 +29,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="affixId" column="affix_id"/>
         <result property="deployId" column="deploy_id"/>
+        <result property="deptName" column="dept_name"/>
         <!--入伍保留学籍申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
         <collection property="enlistmentReserveApprovalList"
                     column="{studentName = student_name, studentNo = student_no}"
@@ -125,7 +126,8 @@
                create_time,
                update_time,
                affix_id,
-               deploy_id
+               deploy_id,
+               dept_name
         from rt_enlistment_reserve
     </sql>
 
@@ -160,7 +162,9 @@
             <if test="approvalNo != null  and approvalNo != ''">and approval_no = #{approvalNo}</if>
             <if test="affixId != null  and affixId != ''">and affix_id = #{affixId}</if>
             <if test="deployId != null  and deployId != ''">and deploy_id = #{deployId}</if>
+            <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectRtEnlistmentReserveById" parameterType="Long" resultMap="RtEnlistmentReserveResult">
@@ -188,6 +192,14 @@
         select * from rt_enlistment_reserve
     </select>
 
+
+    <!--    匹配reserve_no以"BLXJ(年份)"开头的记录-->
+    <select id="countByYear" resultType="int">
+        SELECT COUNT(*)
+        FROM rt_enlistment_reserve
+        WHERE reserve_no LIKE CONCAT('BLXJ(', #{year}, ')%')
+    </select>
+
     <!--  根据流程编号查询申请记录  -->
     <select id="selectRtEnlistmentReserveByProcessInstanceId" parameterType="String"
             resultMap="RtEnlistmentReserveResult">
@@ -231,6 +243,7 @@
             <if test="updateTime != null">update_time,</if>
             <if test="affixId != null">affix_id,</if>
             <if test="deployId != null">deploy_id,</if>
+            <if test="deptName != null">dept_name,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
@@ -256,6 +269,7 @@
             <if test="updateTime != null">#{updateTime},</if>
             <if test="affixId != null">#{affixId},</if>
             <if test="deployId != null">#{deployId},</if>
+            <if test="deptName != null">#{deptName},</if>
         </trim>
     </insert>
 
@@ -285,6 +299,7 @@
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="affixId != null">affix_id = #{affixId},</if>
             <if test="deployId != null">deploy_id = #{deployId},</if>
+            <if test="deptName != null">dept_name = #{deptName},</if>
         </trim>
         where id = #{id}
     </update>

srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBusinessWork.java

@@ -33,6 +33,14 @@ public class SysTeacherKpiFillingBusinessWork extends BaseEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    /**
+     * 请销假制度分数
+     */
+    @ApiModelProperty("请销假制度分数")
+    @TableField("stu_leave_request_scoring")
+    @Excel(name = "请销假制度分数")
+    private BigDecimal stuLeaveRequestScoring;
+
     /**
      * 学生请假材料分数
      */

srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherStuNoticeMaterials.java

@@ -0,0 +1,114 @@
+package com.srs.teacher.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * 通知任务材料对象 sys_teacher_stu_notice_materials
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "SysTeacherStuNoticeMaterials对象", description = "通知任务材料表")
+@TableName("sys_teacher_stu_notice_materials")
+public class SysTeacherStuNoticeMaterials extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 开展时间
+     */
+    @ApiModelProperty("开展时间")
+    @TableField("development_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开展时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date developmentTime;
+
+    /**
+     * 地点
+     */
+    @ApiModelProperty("地点")
+    @TableField("place")
+    @Excel(name = "地点")
+    private String place;
+
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    @TableField("class_name")
+    @Excel(name = "班级名称")
+    private String className;
+
+    /**
+     * 参与学生人数
+     */
+    @ApiModelProperty("参与学生人数")
+    @TableField("number_of_students")
+    @Excel(name = "参与学生人数")
+    private Long numberOfStudents;
+
+    /**
+     * 主要内容
+     */
+    @ApiModelProperty("主要内容")
+    @TableField("main_content")
+    @Excel(name = "主要内容")
+    private String mainContent;
+
+    /**
+     * 相片
+     */
+    @ApiModelProperty("相片")
+    @TableField("photo")
+    @Excel(name = "相片")
+    private String photo;
+
+    /**
+     * 填报人名称
+     */
+    @ApiModelProperty(value = "填报人名称", required = true)
+    @TableField("fdy_name")
+    @Excel(name = "填报人名称")
+    private String fdyName;
+
+    /**
+     * 填报年份
+     */
+    @ApiModelProperty(value = "填报年份", required = true)
+    @TableField("filling_year")
+    @Excel(name = "填报年份")
+    private String fillingYear;
+
+    /**
+     * 填报月份
+     */
+    @ApiModelProperty(value = "填报月份", required = true)
+    @TableField("filling_month")
+    @Excel(name = "填报月份")
+    @NotNull(message = "填报月份不能为空")
+    private String fillingMonth;
+
+
+}

srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherStuTestMaterials.java

@@ -0,0 +1,114 @@
+package com.srs.teacher.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.srs.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.srs.common.core.domain.BaseEntity;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * 职业测评材料对象 sys_teacher_stu_test_materials
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value = "SysTeacherStuTestMaterials对象", description = "职业测评材料表")
+@TableName("sys_teacher_stu_test_materials")
+public class SysTeacherStuTestMaterials extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ApiModelProperty("id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 开展时间
+     */
+    @ApiModelProperty("开展时间")
+    @TableField("development_time")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "开展时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date developmentTime;
+
+    /**
+     * 地点
+     */
+    @ApiModelProperty("地点")
+    @TableField("place")
+    @Excel(name = "地点")
+    private String place;
+
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    @TableField("class_name")
+    @Excel(name = "班级名称")
+    private String className;
+
+    /**
+     * 参与学生人数
+     */
+    @ApiModelProperty("参与学生人数")
+    @TableField("number_of_students")
+    @Excel(name = "参与学生人数")
+    private Long numberOfStudents;
+
+    /**
+     * 主要内容
+     */
+    @ApiModelProperty("主要内容")
+    @TableField("main_content")
+    @Excel(name = "主要内容")
+    private String mainContent;
+
+    /**
+     * 相片
+     */
+    @ApiModelProperty("相片")
+    @TableField("photo")
+    @Excel(name = "相片")
+    private String photo;
+
+    /**
+     * 填报人名称
+     */
+    @ApiModelProperty(value = "填报人名称", required = true)
+    @TableField("fdy_name")
+    @Excel(name = "填报人名称")
+    private String fdyName;
+
+    /**
+     * 填报年份
+     */
+    @ApiModelProperty(value = "填报年份", required = true)
+    @TableField("filling_year")
+    @Excel(name = "填报年份")
+    private String fillingYear;
+
+    /**
+     * 填报月份
+     */
+    @ApiModelProperty(value = "填报月份", required = true)
+    @TableField("filling_month")
+    @Excel(name = "填报月份")
+    @NotNull(message = "填报月份不能为空")
+    private String fillingMonth;
+
+
+}

srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherStuNoticeMaterialsMapper.java

@@ -0,0 +1,61 @@
+package com.srs.teacher.mapper;
+
+import java.util.List;
+
+import com.srs.teacher.domain.SysTeacherStuNoticeMaterials;
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 通知任务材料Mapper接口
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+public interface SysTeacherStuNoticeMaterialsMapper extends BaseMapper<SysTeacherStuNoticeMaterials> {
+
+    public SysTeacherStuNoticeMaterials selectSysTeacherStuNoticeMaterialsById(Long id);
+
+    /**
+     * 查询通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 通知任务材料
+     */
+    public List<SysTeacherStuNoticeMaterials> selectSysTeacherStuNoticeMaterialsList(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials);
+
+    public List<SysTeacherStuNoticeMaterials> selectSysTeacherStuNoticeMaterialsByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
+
+    /**
+     * 新增通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 结果
+     */
+    public int insertSysTeacherStuNoticeMaterials(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials);
+
+    /**
+     * 修改通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 结果
+     */
+    public int updateSysTeacherStuNoticeMaterials(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials);
+
+    /**
+     * 删除通知任务材料
+     *
+     * @param id 通知任务材料主键
+     * @return 结果
+     */
+    public int deleteSysTeacherStuNoticeMaterialsById(Long id);
+
+    /**
+     * 批量删除通知任务材料
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysTeacherStuNoticeMaterialsByIds(Long[] ids);
+}

srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherStuTestMaterialsMapper.java

@@ -0,0 +1,61 @@
+package com.srs.teacher.mapper;
+
+import java.util.List;
+
+import com.srs.teacher.domain.SysTeacherStuTestMaterials;
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 职业测评材料Mapper接口
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+public interface SysTeacherStuTestMaterialsMapper extends BaseMapper<SysTeacherStuTestMaterials> {
+
+    public SysTeacherStuTestMaterials selectSysTeacherStuTestMaterialsById(Long id);
+
+    /**
+     * 查询职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 职业测评材料
+     */
+    public List<SysTeacherStuTestMaterials> selectSysTeacherStuTestMaterialsList(SysTeacherStuTestMaterials sysTeacherStuTestMaterials);
+
+    public List<SysTeacherStuTestMaterials> selectSysTeacherStuTestMaterialsByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
+
+    /**
+     * 新增职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 结果
+     */
+    public int insertSysTeacherStuTestMaterials(SysTeacherStuTestMaterials sysTeacherStuTestMaterials);
+
+    /**
+     * 修改职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 结果
+     */
+    public int updateSysTeacherStuTestMaterials(SysTeacherStuTestMaterials sysTeacherStuTestMaterials);
+
+    /**
+     * 删除职业测评材料
+     *
+     * @param id 职业测评材料主键
+     * @return 结果
+     */
+    public int deleteSysTeacherStuTestMaterialsById(Long id);
+
+    /**
+     * 批量删除职业测评材料
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysTeacherStuTestMaterialsByIds(Long[] ids);
+}

srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherStuNoticeMaterialsService.java

@@ -0,0 +1,61 @@
+package com.srs.teacher.service;
+
+import java.util.List;
+
+import com.srs.teacher.domain.SysTeacherStuNoticeMaterials;
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 通知任务材料Service接口
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+public interface ISysTeacherStuNoticeMaterialsService extends IService<SysTeacherStuNoticeMaterials> {
+
+    public SysTeacherStuNoticeMaterials selectSysTeacherStuNoticeMaterialsById(Long id);
+
+    /**
+     * 查询通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 通知任务材料
+     */
+    public List<SysTeacherStuNoticeMaterials> selectSysTeacherStuNoticeMaterialsList(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials);
+
+    public List<SysTeacherStuNoticeMaterials> selectSysTeacherStuNoticeMaterialsByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
+
+    /**
+     * 新增通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 结果
+     */
+    public int insertSysTeacherStuNoticeMaterials(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials);
+
+    /**
+     * 修改通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 结果
+     */
+    public int updateSysTeacherStuNoticeMaterials(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials);
+
+    /**
+     * 批量删除通知任务材料
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysTeacherStuNoticeMaterialsByIds(Long[] ids);
+
+    /**
+     * 删除通知任务材料信息
+     *
+     * @param id 通知任务材料主键
+     * @return 结果
+     */
+    public int deleteSysTeacherStuNoticeMaterialsById(Long id);
+}

srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherStuTestMaterialsService.java

@@ -0,0 +1,61 @@
+package com.srs.teacher.service;
+
+import java.util.List;
+
+import com.srs.teacher.domain.SysTeacherStuTestMaterials;
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 职业测评材料Service接口
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+public interface ISysTeacherStuTestMaterialsService extends IService<SysTeacherStuTestMaterials> {
+
+    public SysTeacherStuTestMaterials selectSysTeacherStuTestMaterialsById(Long id);
+
+    /**
+     * 查询职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 职业测评材料
+     */
+    public List<SysTeacherStuTestMaterials> selectSysTeacherStuTestMaterialsList(SysTeacherStuTestMaterials sysTeacherStuTestMaterials);
+
+    public List<SysTeacherStuTestMaterials> selectSysTeacherStuTestMaterialsByFdyName(@Param("fdyName") String fdyName, @Param("fillingYear") String fillingYear, @Param("fillingMonth") String fillingMonth);
+
+    /**
+     * 新增职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 结果
+     */
+    public int insertSysTeacherStuTestMaterials(SysTeacherStuTestMaterials sysTeacherStuTestMaterials);
+
+    /**
+     * 修改职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 结果
+     */
+    public int updateSysTeacherStuTestMaterials(SysTeacherStuTestMaterials sysTeacherStuTestMaterials);
+
+    /**
+     * 批量删除职业测评材料
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSysTeacherStuTestMaterialsByIds(Long[] ids);
+
+    /**
+     * 删除职业测评材料信息
+     *
+     * @param id 职业测评材料主键
+     * @return 结果
+     */
+    public int deleteSysTeacherStuTestMaterialsById(Long id);
+}

srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherStuNoticeMaterialsServiceImpl.java

@@ -0,0 +1,95 @@
+package com.srs.teacher.service.impl;
+
+import java.util.List;
+
+import com.srs.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.srs.teacher.mapper.SysTeacherStuNoticeMaterialsMapper;
+import com.srs.teacher.domain.SysTeacherStuNoticeMaterials;
+import com.srs.teacher.service.ISysTeacherStuNoticeMaterialsService;
+
+/**
+ * 通知任务材料Service实现
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+@Service
+public class SysTeacherStuNoticeMaterialsServiceImpl extends ServiceImpl<SysTeacherStuNoticeMaterialsMapper, SysTeacherStuNoticeMaterials> implements ISysTeacherStuNoticeMaterialsService {
+
+    @Autowired
+    private SysTeacherStuNoticeMaterialsMapper sysTeacherStuNoticeMaterialsMapper;
+
+    @Override
+    public SysTeacherStuNoticeMaterials selectSysTeacherStuNoticeMaterialsById(Long id) {
+        return sysTeacherStuNoticeMaterialsMapper.selectSysTeacherStuNoticeMaterialsById(id);
+    }
+
+    /**
+     * 查询通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 通知任务材料
+     */
+    @Override
+    public List<SysTeacherStuNoticeMaterials> selectSysTeacherStuNoticeMaterialsList(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials) {
+        sysTeacherStuNoticeMaterials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
+        return sysTeacherStuNoticeMaterialsMapper.selectSysTeacherStuNoticeMaterialsList(sysTeacherStuNoticeMaterials);
+    }
+
+    @Override
+    public List<SysTeacherStuNoticeMaterials> selectSysTeacherStuNoticeMaterialsByFdyName(String fdyName, String fillingYear, String fillingMonth) {
+        return sysTeacherStuNoticeMaterialsMapper.selectSysTeacherStuNoticeMaterialsByFdyName(fdyName, fillingYear, fillingMonth);
+    }
+
+    /**
+     * 新增通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 结果
+     */
+    @Override
+    public int insertSysTeacherStuNoticeMaterials(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials) {
+        sysTeacherStuNoticeMaterials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
+        if (sysTeacherStuNoticeMaterials.getId() != null) {
+            return sysTeacherStuNoticeMaterialsMapper.updateSysTeacherStuNoticeMaterials(sysTeacherStuNoticeMaterials);
+        }
+        return sysTeacherStuNoticeMaterialsMapper.insertSysTeacherStuNoticeMaterials(sysTeacherStuNoticeMaterials);
+    }
+
+    /**
+     * 修改通知任务材料
+     *
+     * @param sysTeacherStuNoticeMaterials 通知任务材料
+     * @return 结果
+     */
+    @Override
+    public int updateSysTeacherStuNoticeMaterials(SysTeacherStuNoticeMaterials sysTeacherStuNoticeMaterials) {
+        sysTeacherStuNoticeMaterials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
+        return sysTeacherStuNoticeMaterialsMapper.updateSysTeacherStuNoticeMaterials(sysTeacherStuNoticeMaterials);
+    }
+
+    /**
+     * 批量删除通知任务材料
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    @Override
+    public int deleteSysTeacherStuNoticeMaterialsByIds(Long[] ids) {
+        return sysTeacherStuNoticeMaterialsMapper.deleteSysTeacherStuNoticeMaterialsByIds(ids);
+    }
+
+    /**
+     * 删除通知任务材料信息
+     *
+     * @param id 通知任务材料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysTeacherStuNoticeMaterialsById(Long id) {
+        return sysTeacherStuNoticeMaterialsMapper.deleteSysTeacherStuNoticeMaterialsById(id);
+    }
+}

srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherStuTestMaterialsServiceImpl.java

@@ -0,0 +1,95 @@
+package com.srs.teacher.service.impl;
+
+import java.util.List;
+
+import com.srs.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.srs.teacher.mapper.SysTeacherStuTestMaterialsMapper;
+import com.srs.teacher.domain.SysTeacherStuTestMaterials;
+import com.srs.teacher.service.ISysTeacherStuTestMaterialsService;
+
+/**
+ * 职业测评材料Service实现
+ *
+ * @author chc
+ * @date 2024-06-06
+ */
+@Service
+public class SysTeacherStuTestMaterialsServiceImpl extends ServiceImpl<SysTeacherStuTestMaterialsMapper, SysTeacherStuTestMaterials> implements ISysTeacherStuTestMaterialsService {
+
+    @Autowired
+    private SysTeacherStuTestMaterialsMapper sysTeacherStuTestMaterialsMapper;
+
+    @Override
+    public SysTeacherStuTestMaterials selectSysTeacherStuTestMaterialsById(Long id) {
+        return sysTeacherStuTestMaterialsMapper.selectSysTeacherStuTestMaterialsById(id);
+    }
+
+    /**
+     * 查询职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 职业测评材料
+     */
+    @Override
+    public List<SysTeacherStuTestMaterials> selectSysTeacherStuTestMaterialsList(SysTeacherStuTestMaterials sysTeacherStuTestMaterials) {
+        sysTeacherStuTestMaterials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
+        return sysTeacherStuTestMaterialsMapper.selectSysTeacherStuTestMaterialsList(sysTeacherStuTestMaterials);
+    }
+
+    @Override
+    public List<SysTeacherStuTestMaterials> selectSysTeacherStuTestMaterialsByFdyName(String fdyName, String fillingYear, String fillingMonth) {
+        return sysTeacherStuTestMaterialsMapper.selectSysTeacherStuTestMaterialsByFdyName(fdyName, fillingYear, fillingMonth);
+    }
+
+    /**
+     * 新增职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 结果
+     */
+    @Override
+    public int insertSysTeacherStuTestMaterials(SysTeacherStuTestMaterials sysTeacherStuTestMaterials) {
+        sysTeacherStuTestMaterials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
+        if (sysTeacherStuTestMaterials.getId() != null) {
+            return sysTeacherStuTestMaterialsMapper.updateSysTeacherStuTestMaterials(sysTeacherStuTestMaterials);
+        }
+        return sysTeacherStuTestMaterialsMapper.insertSysTeacherStuTestMaterials(sysTeacherStuTestMaterials);
+    }
+
+    /**
+     * 修改职业测评材料
+     *
+     * @param sysTeacherStuTestMaterials 职业测评材料
+     * @return 结果
+     */
+    @Override
+    public int updateSysTeacherStuTestMaterials(SysTeacherStuTestMaterials sysTeacherStuTestMaterials) {
+        sysTeacherStuTestMaterials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName());
+        return sysTeacherStuTestMaterialsMapper.updateSysTeacherStuTestMaterials(sysTeacherStuTestMaterials);
+    }
+
+    /**
+     * 批量删除职业测评材料
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    @Override
+    public int deleteSysTeacherStuTestMaterialsByIds(Long[] ids) {
+        return sysTeacherStuTestMaterialsMapper.deleteSysTeacherStuTestMaterialsByIds(ids);
+    }
+
+    /**
+     * 删除职业测评材料信息
+     *
+     * @param id 职业测评材料主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysTeacherStuTestMaterialsById(Long id) {
+        return sysTeacherStuTestMaterialsMapper.deleteSysTeacherStuTestMaterialsById(id);
+    }
+}

srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBusinessWorkMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap type="SysTeacherKpiFillingBusinessWork" id="SysTeacherKpiFillingBusinessWorkResult">
         <result property="id" column="id"/>
+        <result property="stuLeaveRequestScoring" column="stu_leave_request_scoring"/>
         <result property="stuLeaveMaterialsScoring" column="stu_leave_materials_scoring"/>
         <result property="stuFillingMaterialsScoring" column="stu_filling_materials_scoring"/>
         <result property="stuBasicDataScoring" column="stu_basic_data_scoring"/>
@@ -20,6 +21,7 @@
 
     <sql id="selectSysTeacherKpiFillingBusinessWorkVo">
         select id,
+               stu_leave_request_scoring,
                stu_leave_materials_scoring,
                stu_filling_materials_scoring,
                stu_basic_data_scoring,
@@ -87,6 +89,7 @@
         insert into sys_teacher_kpi_filling_business_work
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="stuLeaveRequestScoring != null">stu_leave_request_scoring,</if>
             <if test="stuLeaveMaterialsScoring != null">stu_leave_materials_scoring,</if>
             <if test="stuFillingMaterialsScoring != null">stu_filling_materials_scoring,</if>
             <if test="stuBasicDataScoring != null">stu_basic_data_scoring,</if>
@@ -100,6 +103,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="stuLeaveRequestScoring != null">#{stuLeaveRequestScoring},</if>
             <if test="stuLeaveMaterialsScoring != null">#{stuLeaveMaterialsScoring},</if>
             <if test="stuFillingMaterialsScoring != null">#{stuFillingMaterialsScoring},</if>
             <if test="stuBasicDataScoring != null">#{stuBasicDataScoring},</if>
@@ -116,14 +120,11 @@
     <update id="updateSysTeacherKpiFillingBusinessWork" parameterType="SysTeacherKpiFillingBusinessWork">
         update sys_teacher_kpi_filling_business_work
         <trim prefix="SET" suffixOverrides=",">
+            <if test="stuLeaveRequestScoring != null">stu_leave_request_scoring = #{stuLeaveRequestScoring},</if>
             <if test="stuLeaveMaterialsScoring != null">stu_leave_materials_scoring = #{stuLeaveMaterialsScoring},</if>
-            <if test="stuFillingMaterialsScoring != null">stu_filling_materials_scoring =
-                #{stuFillingMaterialsScoring},
-            </if>
+            <if test="stuFillingMaterialsScoring != null">stu_filling_materials_scoring = #{stuFillingMaterialsScoring},</if>
             <if test="stuBasicDataScoring != null">stu_basic_data_scoring = #{stuBasicDataScoring},</if>
-            <if test="stuDisciplinaryViolationScoring != null">stu_disciplinary_violation_scoring =
-                #{stuDisciplinaryViolationScoring},
-            </if>
+            <if test="stuDisciplinaryViolationScoring != null">stu_disciplinary_violation_scoring = #{stuDisciplinaryViolationScoring},</if>
             <if test="handleEventsScoring != null">handle_events_scoring = #{handleEventsScoring},</if>
             <if test="otherTaskScoring != null">other_task_scoring = #{otherTaskScoring},</if>
             <if test="fdyName != null and fdyName != ''">fdy_name = #{fdyName},</if>

srs-teacher/src/main/resources/mapper/teacher/SysTeacherStuNoticeMaterialsMapper.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.teacher.mapper.SysTeacherStuNoticeMaterialsMapper">
+
+    <resultMap type="com.srs.teacher.domain.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>
+
+    <sql id="selectSysTeacherStuNoticeMaterialsVo">
+        select id, development_time, place, class_name, number_of_students, main_content, photo, fdy_name, filling_year, filling_month from sys_teacher_stu_notice_materials
+    </sql>
+
+    <select id="selectSysTeacherStuNoticeMaterialsList" parameterType="com.srs.teacher.domain.SysTeacherStuNoticeMaterials" resultMap="SysTeacherStuNoticeMaterialsResult">
+        <include refid="selectSysTeacherStuNoticeMaterialsVo"/>
+        <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>
+    </select>
+
+    <select id="selectSysTeacherStuNoticeMaterialsByFdyName" parameterType="String" resultMap="SysTeacherStuNoticeMaterialsResult">
+        <include refid="selectSysTeacherStuNoticeMaterialsVo"/>
+        where fdy_name = #{fdyName} and filling_year = #{fillingYear} and filling_month = #{fillingMonth}
+    </select>
+
+    <select id="selectSysTeacherStuNoticeMaterialsById" parameterType="Long" resultMap="SysTeacherStuNoticeMaterialsResult">
+        <include refid="selectSysTeacherStuNoticeMaterialsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysTeacherStuNoticeMaterials" parameterType="com.srs.teacher.domain.SysTeacherStuNoticeMaterials" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_teacher_stu_notice_materials
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="developmentTime != null">development_time,</if>
+            <if test="place != null">place,</if>
+            <if test="className != null">class_name,</if>
+            <if test="numberOfStudents != null">number_of_students,</if>
+            <if test="mainContent != null">main_content,</if>
+            <if test="photo != null">photo,</if>
+            <if test="fdyName != null">fdy_name,</if>
+            <if test="fillingYear != null">filling_year,</if>
+            <if test="fillingMonth != null">filling_month,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="developmentTime != null">#{developmentTime},</if>
+            <if test="place != null">#{place},</if>
+            <if test="className != null">#{className},</if>
+            <if test="numberOfStudents != null">#{numberOfStudents},</if>
+            <if test="mainContent != null">#{mainContent},</if>
+            <if test="photo != null">#{photo},</if>
+            <if test="fdyName != null">#{fdyName},</if>
+            <if test="fillingYear != null">#{fillingYear},</if>
+            <if test="fillingMonth != null">#{fillingMonth},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysTeacherStuNoticeMaterials" parameterType="com.srs.teacher.domain.SysTeacherStuNoticeMaterials">
+        update sys_teacher_stu_notice_materials
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="developmentTime != null">development_time = #{developmentTime},</if>
+            <if test="place != null">place = #{place},</if>
+            <if test="className != null">class_name = #{className},</if>
+            <if test="numberOfStudents != null">number_of_students = #{numberOfStudents},</if>
+            <if test="mainContent != null">main_content = #{mainContent},</if>
+            <if test="photo != null">photo = #{photo},</if>
+            <if test="fdyName != null">fdy_name = #{fdyName},</if>
+            <if test="fillingYear != null">filling_year = #{fillingYear},</if>
+            <if test="fillingMonth != null">filling_month = #{fillingMonth},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysTeacherStuNoticeMaterialsById" parameterType="Long">
+        delete from sys_teacher_stu_notice_materials where id = #{id}
+    </delete>
+
+    <delete id="deleteSysTeacherStuNoticeMaterialsByIds" parameterType="String">
+        delete from sys_teacher_stu_notice_materials where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

srs-teacher/src/main/resources/mapper/teacher/SysTeacherStuTestMaterialsMapper.xml

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.srs.teacher.mapper.SysTeacherStuTestMaterialsMapper">
+
+    <resultMap type="com.srs.teacher.domain.SysTeacherStuTestMaterials" id="SysTeacherStuTestMaterialsResult">
+        <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>
+
+    <sql id="selectSysTeacherStuTestMaterialsVo">
+        select id, development_time, place, class_name, number_of_students, main_content, photo, fdy_name, filling_year, filling_month from sys_teacher_stu_test_materials
+    </sql>
+
+    <select id="selectSysTeacherStuTestMaterialsList" parameterType="com.srs.teacher.domain.SysTeacherStuTestMaterials" resultMap="SysTeacherStuTestMaterialsResult">
+        <include refid="selectSysTeacherStuTestMaterialsVo"/>
+        <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>
+    </select>
+
+    <select id="selectSysTeacherStuTestMaterialsByFdyName" parameterType="String" resultMap="SysTeacherStuTestMaterialsResult">
+        <include refid="selectSysTeacherStuTestMaterialsVo"/>
+        where fdy_name = #{fdyName} and filling_year = #{fillingYear} and filling_month = #{fillingMonth}
+    </select>
+
+    <select id="selectSysTeacherStuTestMaterialsById" parameterType="Long" resultMap="SysTeacherStuTestMaterialsResult">
+        <include refid="selectSysTeacherStuTestMaterialsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysTeacherStuTestMaterials" parameterType="com.srs.teacher.domain.SysTeacherStuTestMaterials" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_teacher_stu_test_materials
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="developmentTime != null">development_time,</if>
+            <if test="place != null">place,</if>
+            <if test="className != null">class_name,</if>
+            <if test="numberOfStudents != null">number_of_students,</if>
+            <if test="mainContent != null">main_content,</if>
+            <if test="photo != null">photo,</if>
+            <if test="fdyName != null">fdy_name,</if>
+            <if test="fillingYear != null">filling_year,</if>
+            <if test="fillingMonth != null">filling_month,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="developmentTime != null">#{developmentTime},</if>
+            <if test="place != null">#{place},</if>
+            <if test="className != null">#{className},</if>
+            <if test="numberOfStudents != null">#{numberOfStudents},</if>
+            <if test="mainContent != null">#{mainContent},</if>
+            <if test="photo != null">#{photo},</if>
+            <if test="fdyName != null">#{fdyName},</if>
+            <if test="fillingYear != null">#{fillingYear},</if>
+            <if test="fillingMonth != null">#{fillingMonth},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysTeacherStuTestMaterials" parameterType="com.srs.teacher.domain.SysTeacherStuTestMaterials">
+        update sys_teacher_stu_test_materials
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="developmentTime != null">development_time = #{developmentTime},</if>
+            <if test="place != null">place = #{place},</if>
+            <if test="className != null">class_name = #{className},</if>
+            <if test="numberOfStudents != null">number_of_students = #{numberOfStudents},</if>
+            <if test="mainContent != null">main_content = #{mainContent},</if>
+            <if test="photo != null">photo = #{photo},</if>
+            <if test="fdyName != null">fdy_name = #{fdyName},</if>
+            <if test="fillingYear != null">filling_year = #{fillingYear},</if>
+            <if test="fillingMonth != null">filling_month = #{fillingMonth},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysTeacherStuTestMaterialsById" parameterType="Long">
+        delete from sys_teacher_stu_test_materials where id = #{id}
+    </delete>
+
+    <delete id="deleteSysTeacherStuTestMaterialsByIds" parameterType="String">
+        delete from sys_teacher_stu_test_materials where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

srs-workstudy/src/main/resources/mapper/workstudy/QgzxMoneyMapper.xml

@@ -228,7 +228,7 @@
         select * from (
         select t2.* from (
         select a.id,a.stu_post_id,a.total_time,a.apply_sign,a.apply_no,a.apply_time,a.apply_status,
-        a.dept_sign,a.dept_cmt,null as dept_time,a.dept_no,null as high_time,a.high_no,a.high_cmt,a.high_sign,
+        a.dept_sign,a.dept_cmt,a.dept_time,a.dept_no,a.high_time,a.high_no,a.high_cmt,a.high_sign,
         a.final_no,a.final_time,a.final_cmt,a.final_sign,a.audit_remark,null as money,
         b.stu_no,c.post_name,d.dept_name,e.dept_name as stu_dept,
         e.stu_name,e.class_name,e.grade_name,f.name as dept_no_name,