From 2b4f56753f83188a400b521cd0e45a9983fc5db1 Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Wed, 25 Mar 2026 16:48:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srs-admin/src/main/resources/application.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srs-admin/src/main/resources/application.yml b/srs-admin/src/main/resources/application.yml index 381a6ad..a7c6f17 100644 --- a/srs-admin/src/main/resources/application.yml +++ b/srs-admin/src/main/resources/application.yml @@ -9,7 +9,8 @@ srs: # 实例演示开关 demoEnabled: true # 文件路径 示例( Windows配置D:/srs/uploadPath,Linux配置 /home/srs/uploadPath)#D:/srs/uploadPath - profile: D:/srs/uploadPath #/usr/local/java/srs/uploadPath + # 后续发布代码，这里路径不能变 + profile: /usr/local/java/srs/uploadPath #profile: D:/srs/uploadPath #/srs/uploadPath # 获取ip地址开关 addressEnabled: false @@ -64,8 +65,8 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: -# active: druid #正式环境 - active: dev #测试环境 + active: druid #正式环境 +# active: dev #测试环境 # 文件上传 servlet: multipart: From ce18d4ca1fe604a80b36020cf07a3ae0072e99aa Mon Sep 17 00:00:00 2001 From: 15976874561 <2553956742@qq.com> Date: Wed, 25 Mar 2026 17:18:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom.xml=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=ADmaven=E7=89=88=E6=9C=AC=E4=B8=BA17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srs-admin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srs-admin/pom.xml b/srs-admin/pom.xml index bc42448..e98bc63 100644 --- a/srs-admin/pom.xml +++ b/srs-admin/pom.xml @@ -220,8 +220,8 @@ org.apache.maven.plugins maven-compiler-plugin - 14 - 14 + 17 + 17 From d24c3cf2694431934fa3809767dc6bdb099c04b1 Mon Sep 17 00:00:00 2001 From: Stickman <2048979561@qq.com> Date: Thu, 26 Mar 2026 17:18:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BE=85=E5=AF=BC=E5=91=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=9B=B4=E6=94=B9=E4=B8=9A=E5=8A=A1=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...FillingBonusPointsMaterialsController.java | 90 +++++++++++++ ...TeacherKpiFillingBonusPointsMaterials.java | 81 ++++++++++++ ...rKpiFillingBonusPointsMaterialsMapper.java | 34 +++++ ...KpiFillingBonusPointsMaterialsService.java | 34 +++++ ...illingBonusPointsMaterialsServiceImpl.java | 61 +++++++++ ...erKpiFillingBonusPointsMaterialsMapper.xml | 125 ++++++++++++++++++ 6 files changed, 425 insertions(+) create mode 100644 srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBonusPointsMaterialsController.java create mode 100644 srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBonusPointsMaterials.java create mode 100644 srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBonusPointsMaterialsMapper.java create mode 100644 srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBonusPointsMaterialsService.java create mode 100644 srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBonusPointsMaterialsServiceImpl.java create mode 100644 srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBonusPointsMaterialsMapper.xml diff --git a/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBonusPointsMaterialsController.java b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBonusPointsMaterialsController.java new file mode 100644 index 0000000..d82e738 --- /dev/null +++ b/srs-admin/src/main/java/com/srs/web/controller/teacher/SysTeacherKpiFillingBonusPointsMaterialsController.java @@ -0,0 +1,90 @@ +package com.srs.web.controller.teacher; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.srs.common.annotation.Log; +import com.srs.common.annotation.RepeatSubmit; +import com.srs.common.core.controller.BaseController; +import com.srs.common.core.domain.AjaxResult; +import com.srs.common.core.page.TableDataInfo; +import com.srs.common.enums.BusinessType; +import com.srs.common.utils.poi.ExcelUtil; +import com.srs.teacher.domain.SysTeacherKpiFillingBonusPointsMaterials; +import com.srs.teacher.service.ISysTeacherKpiFillingBonusPointsMaterialsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 业绩考核-个人填报-加分项佐证材料Controller + * + * @author Codex + * @date 2026-03-26 + */ +@RestController +@RequestMapping("/teacher/kpiFillingBonusPointsMaterials") +@Api(value = "业绩考核-个人填报-加分项佐证材料管理", tags = "业绩考核-个人填报-加分项佐证材料管理") +public class SysTeacherKpiFillingBonusPointsMaterialsController extends BaseController { + @Autowired + private ISysTeacherKpiFillingBonusPointsMaterialsService materialsService; + + @GetMapping("/list") + @ApiOperation("查询业绩考核-个人填报-加分项佐证材料列表") + public TableDataInfo list(SysTeacherKpiFillingBonusPointsMaterials materials) { + startPage(); + List list = materialsService.selectSysTeacherKpiFillingBonusPointsMaterialsList(materials); + return getDataTable(list); + } + + @GetMapping("/getByFdyNameAndYearAndMonth") + @ApiOperation("根据辅导员姓名、年月查询加分项佐证材料列表") + public TableDataInfo getByFdyNameAndYearAndMonth(@RequestParam String fdyName, + @RequestParam String fillingYear, + @RequestParam String fillingMonth, + @RequestParam(required = false) String classType, + @RequestParam(required = false) String bonusType) { + startPage(); + List list = materialsService.selectSysTeacherKpiFillingBonusPointsMaterialsByFdyName(fdyName, fillingYear, fillingMonth, classType, bonusType); + return getDataTable(list); + } + + @PostMapping("/export") + @Log(title = "业绩考核-个人填报-加分项佐证材料", businessType = BusinessType.EXPORT) + @ApiOperation("导出业绩考核-个人填报-加分项佐证材料列表") + public void export(HttpServletResponse response, SysTeacherKpiFillingBonusPointsMaterials materials) { + List list = materialsService.selectSysTeacherKpiFillingBonusPointsMaterialsList(materials); + ExcelUtil util = new ExcelUtil<>(SysTeacherKpiFillingBonusPointsMaterials.class); + util.exportExcel(response, list, "业绩考核-个人填报-加分项佐证材料数据"); + } + + @GetMapping(value = "/{id}") + @ApiOperation("获取业绩考核-个人填报-加分项佐证材料详情") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return success(materialsService.selectSysTeacherKpiFillingBonusPointsMaterialsById(id)); + } + + @PostMapping("/add") + @Log(title = "业绩考核-个人填报-加分项佐证材料", businessType = BusinessType.INSERT) + @ApiOperation("新增业绩考核-个人填报-加分项佐证材料") + @RepeatSubmit(interval = 1000, message = "请求过于频繁") + public AjaxResult add(@RequestBody SysTeacherKpiFillingBonusPointsMaterials materials) { + return toAjax(materialsService.insertSysTeacherKpiFillingBonusPointsMaterials(materials)); + } + + @PostMapping("/update") + @Log(title = "业绩考核-个人填报-加分项佐证材料", businessType = BusinessType.UPDATE) + @ApiOperation("修改业绩考核-个人填报-加分项佐证材料") + @RepeatSubmit(interval = 1000, message = "请求过于频繁") + public AjaxResult edit(@RequestBody SysTeacherKpiFillingBonusPointsMaterials materials) { + return toAjax(materialsService.updateSysTeacherKpiFillingBonusPointsMaterials(materials)); + } + + @PostMapping("/{ids}") + @Log(title = "业绩考核-个人填报-加分项佐证材料", businessType = BusinessType.DELETE) + @ApiOperation("删除业绩考核-个人填报-加分项佐证材料") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(materialsService.deleteSysTeacherKpiFillingBonusPointsMaterialsByIds(ids)); + } +} diff --git a/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBonusPointsMaterials.java b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBonusPointsMaterials.java new file mode 100644 index 0000000..d67a02b --- /dev/null +++ b/srs-teacher/src/main/java/com/srs/teacher/domain/SysTeacherKpiFillingBonusPointsMaterials.java @@ -0,0 +1,81 @@ +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_kpi_filling_bonus_points_materials + * + * @author Codex + * @date 2026-03-26 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@NoArgsConstructor +@AllArgsConstructor +@Builder +@ApiModel(value = "SysTeacherKpiFillingBonusPointsMaterials对象", description = "业绩考核-个人填报-加分项佐证材料") +@TableName("sys_teacher_kpi_filling_bonus_points_materials") +public class SysTeacherKpiFillingBonusPointsMaterials extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("加分项类型") + @TableField("bonus_type") + @Excel(name = "加分项类型") + private String bonusType; + + @ApiModelProperty("加分分值") + @TableField("bonus_scoring") + @Excel(name = "加分分值") + private Integer bonusScoring; + + @ApiModelProperty("佐证说明") + @TableField("main_content") + @Excel(name = "佐证说明") + private String mainContent; + + @ApiModelProperty("发生时间") + @TableField("development_time") + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "发生时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date developmentTime; + + @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; + + @ApiModelProperty("班级类型 graduate-毕业班 ungraduate-非毕业班") + @TableField("class_type") + @Excel(name = "班级类型") + private String classType; +} diff --git a/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBonusPointsMaterialsMapper.java b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBonusPointsMaterialsMapper.java new file mode 100644 index 0000000..b69bb2b --- /dev/null +++ b/srs-teacher/src/main/java/com/srs/teacher/mapper/SysTeacherKpiFillingBonusPointsMaterialsMapper.java @@ -0,0 +1,34 @@ +package com.srs.teacher.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.srs.teacher.domain.SysTeacherKpiFillingBonusPointsMaterials; +import org.apache.ibatis.annotations.Param; + +/** + * 业绩考核-个人填报-加分项佐证材料Mapper接口 + * + * @author Codex + * @date 2026-03-26 + */ +public interface SysTeacherKpiFillingBonusPointsMaterialsMapper extends BaseMapper { + SysTeacherKpiFillingBonusPointsMaterials selectSysTeacherKpiFillingBonusPointsMaterialsById(Long id); + + List selectSysTeacherKpiFillingBonusPointsMaterialsList(SysTeacherKpiFillingBonusPointsMaterials materials); + + List selectSysTeacherKpiFillingBonusPointsMaterialsByFdyName( + @Param("fdyName") String fdyName, + @Param("fillingYear") String fillingYear, + @Param("fillingMonth") String fillingMonth, + @Param("classType") String classType, + @Param("bonusType") String bonusType); + + int insertSysTeacherKpiFillingBonusPointsMaterials(SysTeacherKpiFillingBonusPointsMaterials materials); + + int updateSysTeacherKpiFillingBonusPointsMaterials(SysTeacherKpiFillingBonusPointsMaterials materials); + + int deleteSysTeacherKpiFillingBonusPointsMaterialsById(Long id); + + int deleteSysTeacherKpiFillingBonusPointsMaterialsByIds(Long[] ids); +} diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBonusPointsMaterialsService.java b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBonusPointsMaterialsService.java new file mode 100644 index 0000000..c4d1a69 --- /dev/null +++ b/srs-teacher/src/main/java/com/srs/teacher/service/ISysTeacherKpiFillingBonusPointsMaterialsService.java @@ -0,0 +1,34 @@ +package com.srs.teacher.service; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.srs.teacher.domain.SysTeacherKpiFillingBonusPointsMaterials; +import org.apache.ibatis.annotations.Param; + +/** + * 业绩考核-个人填报-加分项佐证材料Service接口 + * + * @author Codex + * @date 2026-03-26 + */ +public interface ISysTeacherKpiFillingBonusPointsMaterialsService extends IService { + SysTeacherKpiFillingBonusPointsMaterials selectSysTeacherKpiFillingBonusPointsMaterialsById(Long id); + + List selectSysTeacherKpiFillingBonusPointsMaterialsList(SysTeacherKpiFillingBonusPointsMaterials materials); + + List selectSysTeacherKpiFillingBonusPointsMaterialsByFdyName( + @Param("fdyName") String fdyName, + @Param("fillingYear") String fillingYear, + @Param("fillingMonth") String fillingMonth, + @Param("classType") String classType, + @Param("bonusType") String bonusType); + + int insertSysTeacherKpiFillingBonusPointsMaterials(SysTeacherKpiFillingBonusPointsMaterials materials); + + int updateSysTeacherKpiFillingBonusPointsMaterials(SysTeacherKpiFillingBonusPointsMaterials materials); + + int deleteSysTeacherKpiFillingBonusPointsMaterialsByIds(Long[] ids); + + int deleteSysTeacherKpiFillingBonusPointsMaterialsById(Long id); +} diff --git a/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBonusPointsMaterialsServiceImpl.java b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBonusPointsMaterialsServiceImpl.java new file mode 100644 index 0000000..f5f2778 --- /dev/null +++ b/srs-teacher/src/main/java/com/srs/teacher/service/impl/SysTeacherKpiFillingBonusPointsMaterialsServiceImpl.java @@ -0,0 +1,61 @@ +package com.srs.teacher.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.srs.common.utils.SecurityUtils; +import com.srs.teacher.domain.SysTeacherKpiFillingBonusPointsMaterials; +import com.srs.teacher.mapper.SysTeacherKpiFillingBonusPointsMaterialsMapper; +import com.srs.teacher.service.ISysTeacherKpiFillingBonusPointsMaterialsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * 业绩考核-个人填报-加分项佐证材料Service业务层处理 + * + * @author Codex + * @date 2026-03-26 + */ +@Service +public class SysTeacherKpiFillingBonusPointsMaterialsServiceImpl extends ServiceImpl implements ISysTeacherKpiFillingBonusPointsMaterialsService { + @Autowired + private SysTeacherKpiFillingBonusPointsMaterialsMapper materialsMapper; + + @Override + public SysTeacherKpiFillingBonusPointsMaterials selectSysTeacherKpiFillingBonusPointsMaterialsById(Long id) { + return materialsMapper.selectSysTeacherKpiFillingBonusPointsMaterialsById(id); + } + + @Override + public List selectSysTeacherKpiFillingBonusPointsMaterialsList(SysTeacherKpiFillingBonusPointsMaterials materials) { + materials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName()); + return materialsMapper.selectSysTeacherKpiFillingBonusPointsMaterialsList(materials); + } + + @Override + public List selectSysTeacherKpiFillingBonusPointsMaterialsByFdyName(String fdyName, String fillingYear, String fillingMonth, String classType, String bonusType) { + return materialsMapper.selectSysTeacherKpiFillingBonusPointsMaterialsByFdyName(fdyName, fillingYear, fillingMonth, classType, bonusType); + } + + @Override + public int insertSysTeacherKpiFillingBonusPointsMaterials(SysTeacherKpiFillingBonusPointsMaterials materials) { + materials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName()); + return materialsMapper.insertSysTeacherKpiFillingBonusPointsMaterials(materials); + } + + @Override + public int updateSysTeacherKpiFillingBonusPointsMaterials(SysTeacherKpiFillingBonusPointsMaterials materials) { + materials.setFdyName(SecurityUtils.getLoginUser().getUser().getNickName()); + return materialsMapper.updateSysTeacherKpiFillingBonusPointsMaterials(materials); + } + + @Override + public int deleteSysTeacherKpiFillingBonusPointsMaterialsByIds(Long[] ids) { + return materialsMapper.deleteSysTeacherKpiFillingBonusPointsMaterialsByIds(ids); + } + + @Override + public int deleteSysTeacherKpiFillingBonusPointsMaterialsById(Long id) { + return materialsMapper.deleteSysTeacherKpiFillingBonusPointsMaterialsById(id); + } +} diff --git a/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBonusPointsMaterialsMapper.xml b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBonusPointsMaterialsMapper.xml new file mode 100644 index 0000000..edda8cf --- /dev/null +++ b/srs-teacher/src/main/resources/mapper/teacher/SysTeacherKpiFillingBonusPointsMaterialsMapper.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + select id, bonus_type, bonus_scoring, main_content, development_time, photo, fdy_name, filling_year, filling_month, class_type + from sys_teacher_kpi_filling_bonus_points_materials + + + + + + + + + + insert into sys_teacher_kpi_filling_bonus_points_materials + + bonus_type, + bonus_scoring, + main_content, + development_time, + photo, + fdy_name, + filling_year, + filling_month, + class_type, + + + #{bonusType}, + #{bonusScoring}, + #{mainContent}, + #{developmentTime}, + #{photo}, + #{fdyName}, + #{fillingYear}, + #{fillingMonth}, + #{classType}, + + + + + update sys_teacher_kpi_filling_bonus_points_materials + + bonus_type = #{bonusType}, + bonus_scoring = #{bonusScoring}, + main_content = #{mainContent}, + development_time = #{developmentTime}, + photo = #{photo}, + fdy_name = #{fdyName}, + filling_year = #{fillingYear}, + filling_month = #{fillingMonth}, + class_type = #{classType}, + + where id = #{id} + + + + delete + from sys_teacher_kpi_filling_bonus_points_materials + where id = #{id} + + + + delete from sys_teacher_kpi_filling_bonus_points_materials where id in + + #{id} + + +