12.6新增新教师电子档案功能代码

pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	
+
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
     <version>3.8.3</version>
@@ -11,7 +11,7 @@
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
-    
+
     <properties>
         <ruoyi.version>3.8.3</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,7 +35,7 @@
         <jwt.version>0.9.1</jwt.version>
         <activiti.version>6.0.0</activiti.version>
     </properties>
-	
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
@@ -287,4 +287,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -122,6 +122,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 //打印设备条码信息
                 .antMatchers("/equipmentLedger/getEquipmentledger/**").permitAll()
 
+                //年度考核下载模板
+                .antMatchers("/school/annualAssessment/importTemplate").permitAll()
+
                 .antMatchers("/school/studentStatus/exportStatus/**","/school/student/queryAllInfo/**").permitAll()
 
                 //网页注册登录接口放行

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAnnualAssessment/SchoolAnnualAssessmentController.java

+package yangtz.cs.liu.campus.controller.schoolAnnualAssessment;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
+import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessmentExport;
+import yangtz.cs.liu.campus.domain.teacherFiles.SchoolTeacherBasiclnExport;
+import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
+import yangtz.cs.liu.campus.vo.auditorium.SchoolAuditoriumVo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 年度考核Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@RestController
+@RequestMapping("/school/annualAssessment")
+public class SchoolAnnualAssessmentController extends BaseController {
+
+    @Autowired
+    private ISchoolAnnualAssessmentService schoolAnnualAssessmentService;
+
+    /**
+     * 查询年度考核列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolAnnualAssessment schoolAnnualAssessment)
+    {
+        startPage();
+        List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出年度考核列表
+     */
+    @Log(title = "年度考核", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolAnnualAssessment schoolAnnualAssessment)
+    {
+        List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
+        ExcelUtil<SchoolAnnualAssessment> util = new ExcelUtil<SchoolAnnualAssessment>(SchoolAnnualAssessment.class);
+        util.exportExcel(response, list, "年度考核数据");
+//        List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessment());
+//        List<SchoolAnnualAssessment> list = new ArrayList<>();
+//        List<SchoolAnnualAssessmentExport> exportList = new ArrayList<>();
+//        ExcelUtil<SchoolAnnualAssessmentExport> util = new ExcelUtil<SchoolAnnualAssessmentExport>(SchoolAnnualAssessmentExport.class);
+//        if (StringUtils.isNotNull(export.getIds())){
+//            //选中状态导出
+//            for (Long id : export.getIds()) {
+//                for (SchoolAnnualAssessment schoolAnnualAssessment : schoolAnnualAssessments) {
+//                    if (id.equals(schoolAnnualAssessment.getId())){
+//                        list.add(schoolAnnualAssessment);
+//                    }
+//                }
+//            }
+//            //复制一份
+//            list.stream().forEach(date->{
+//                SchoolAnnualAssessmentExport schoolAnnualAssessmentExport = new SchoolAnnualAssessmentExport();
+//                BeanUtils.copyProperties(date,schoolAnnualAssessmentExport);
+//                exportList.add(schoolAnnualAssessmentExport);
+//            });
+//            util.exportExcel(response, exportList, "年度考核数据");
+//        }else if (StringUtils.isNotNull(export.getId())){
+//            for (SchoolAnnualAssessment schoolAnnualAssessment : schoolAnnualAssessments) {
+//                if (export.getId().equals(schoolAnnualAssessment.getId())){
+//                    SchoolAnnualAssessmentExport schoolAnnualAssessmentExport = new SchoolAnnualAssessmentExport();
+//                    BeanUtils.copyProperties(schoolAnnualAssessment,schoolAnnualAssessmentExport);
+//                    exportList.add(schoolAnnualAssessmentExport);
+//                }
+//            }
+//            util.exportExcel(response, exportList, "年度考核数据");
+//        }else {
+//            SchoolAnnualAssessment schoolAnnualAssessment = new SchoolAnnualAssessment();
+//            BeanUtils.copyProperties(export,schoolAnnualAssessment);
+//            List<SchoolAnnualAssessment> schoolAnnualAssessmentList = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
+//            schoolAnnualAssessmentList.forEach(date->{
+//                SchoolAnnualAssessmentExport schoolAnnualAssessmentExport = new SchoolAnnualAssessmentExport();
+//                BeanUtils.copyProperties(date,schoolAnnualAssessmentExport);
+//                exportList.add(schoolAnnualAssessmentExport);
+//            });
+//            util.exportExcel(response, exportList, "年度考核数据");
+//        }
+    }
+
+    /*
+     * 下载模板
+     * */
+    @PostMapping("/importTemplate")
+    public void importTemplate (HttpServletResponse response) {
+        schoolAnnualAssessmentService.importTemplate(response);
+    }
+
+    @PostMapping("/importData")
+    @Transactional(rollbackFor = Exception.class)
+    public AjaxResult importData(MultipartFile file) throws Exception {
+        ExcelUtil<SchoolAnnualAssessment> util = new ExcelUtil<SchoolAnnualAssessment>(SchoolAnnualAssessment.class);
+        List<SchoolAnnualAssessment> list = util.importExcelNdkh(file.getInputStream());
+        //先校验
+        schoolAnnualAssessmentService.checkImport(list);
+        //数据导入
+        String message = schoolAnnualAssessmentService.importData(list);
+        return AjaxResult.success(message);
+    }
+
+    /**
+     * 获取年度考核详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolAnnualAssessmentService.selectSchoolAnnualAssessmentById(id));
+    }
+
+    /**
+     * 新增年度考核
+     */
+    @Log(title = "年度考核", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolAnnualAssessment schoolAnnualAssessment)
+    {
+        return toAjax(schoolAnnualAssessmentService.insertSchoolAnnualAssessment(schoolAnnualAssessment));
+    }
+
+    /**
+     * 修改年度考核
+     */
+    @Log(title = "年度考核", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolAnnualAssessment schoolAnnualAssessment)
+    {
+        return toAjax(schoolAnnualAssessmentService.updateSchoolAnnualAssessment(schoolAnnualAssessment));
+    }
+
+    /**
+     * 删除年度考核
+     */
+    @Log(title = "年度考核", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolAnnualAssessmentService.deleteSchoolAnnualAssessmentByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java

+package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXacademicWorksService;
+
+/**
+ * 论文著作Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/system/works")
+public class SchoolXacademicWorksController extends BaseController
+{
+    @Autowired
+    private ISchoolXacademicWorksService schoolXacademicWorksService;
+
+    /**
+     * 查询论文著作列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolXacademicWorks schoolXacademicWorks)
+    {
+        startPage();
+        List<SchoolXacademicWorks> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorks);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出论文著作列表
+     */
+    @Log(title = "论文著作", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolXacademicWorks schoolXacademicWorks)
+    {
+        List<SchoolXacademicWorks> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorks);
+        ExcelUtil<SchoolXacademicWorks> util = new ExcelUtil<SchoolXacademicWorks>(SchoolXacademicWorks.class);
+        util.exportExcel(response, list, "论文著作数据");
+    }
+
+    /**
+     * 获取论文著作详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolXacademicWorksService.selectSchoolXacademicWorksById(id));
+    }
+
+    /**
+     * 新增论文著作
+     */
+    @Log(title = "论文著作", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolXacademicWorks schoolXacademicWorks)
+    {
+        return toAjax(schoolXacademicWorksService.insertSchoolXacademicWorks(schoolXacademicWorks));
+    }
+
+    /**
+     * 修改论文著作
+     */
+    @Log(title = "论文著作", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolXacademicWorks schoolXacademicWorks)
+    {
+        return toAjax(schoolXacademicWorksService.updateSchoolXacademicWorks(schoolXacademicWorks));
+    }
+
+    /**
+     * 删除论文著作
+     */
+    @Log(title = "论文著作", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolXacademicWorksService.deleteSchoolXacademicWorksByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java

+package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXcomprehensiveHonors;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXcomprehensiveHonorsService;
+
+/**
+ * 综合荣誉Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/system/honors")
+public class SchoolXcomprehensiveHonorsController extends BaseController
+{
+    @Autowired
+    private ISchoolXcomprehensiveHonorsService schoolXcomprehensiveHonorsService;
+
+    /**
+     * 查询综合荣誉列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    {
+        startPage();
+        List<SchoolXcomprehensiveHonors> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonors);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出综合荣誉列表
+     */
+    @Log(title = "综合荣誉", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    {
+        List<SchoolXcomprehensiveHonors> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonors);
+        ExcelUtil<SchoolXcomprehensiveHonors> util = new ExcelUtil<SchoolXcomprehensiveHonors>(SchoolXcomprehensiveHonors.class);
+        util.exportExcel(response, list, "综合荣誉数据");
+    }
+
+    /**
+     * 获取综合荣誉详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsById(id));
+    }
+
+    /**
+     * 新增综合荣誉
+     */
+    @Log(title = "综合荣誉", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    {
+        return toAjax(schoolXcomprehensiveHonorsService.insertSchoolXcomprehensiveHonors(schoolXcomprehensiveHonors));
+    }
+
+    /**
+     * 修改综合荣誉
+     */
+    @Log(title = "综合荣誉", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    {
+        return toAjax(schoolXcomprehensiveHonorsService.updateSchoolXcomprehensiveHonors(schoolXcomprehensiveHonors));
+    }
+
+    /**
+     * 删除综合荣誉
+     */
+    @Log(title = "综合荣誉", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolXcomprehensiveHonorsService.deleteSchoolXcomprehensiveHonorsByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java

+package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXlectureAwardsService;
+
+/**
+ * 讲课获奖Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/system/awards")
+public class SchoolXlectureAwardsController extends BaseController
+{
+    @Autowired
+    private ISchoolXlectureAwardsService schoolXlectureAwardsService;
+
+    /**
+     * 查询讲课获奖列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:awards:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolXlectureAwards schoolXlectureAwards)
+    {
+        startPage();
+        List<SchoolXlectureAwards> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwards);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出讲课获奖列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:awards:export')")
+    @Log(title = "讲课获奖", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolXlectureAwards schoolXlectureAwards)
+    {
+        List<SchoolXlectureAwards> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwards);
+        ExcelUtil<SchoolXlectureAwards> util = new ExcelUtil<SchoolXlectureAwards>(SchoolXlectureAwards.class);
+        util.exportExcel(response, list, "讲课获奖数据");
+    }
+
+    /**
+     * 获取讲课获奖详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:awards:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolXlectureAwardsService.selectSchoolXlectureAwardsById(id));
+    }
+
+    /**
+     * 新增讲课获奖
+     */
+    @PreAuthorize("@ss.hasPermi('system:awards:add')")
+    @Log(title = "讲课获奖", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolXlectureAwards schoolXlectureAwards)
+    {
+        return toAjax(schoolXlectureAwardsService.insertSchoolXlectureAwards(schoolXlectureAwards));
+    }
+
+    /**
+     * 修改讲课获奖
+     */
+    @PreAuthorize("@ss.hasPermi('system:awards:edit')")
+    @Log(title = "讲课获奖", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolXlectureAwards schoolXlectureAwards)
+    {
+        return toAjax(schoolXlectureAwardsService.updateSchoolXlectureAwards(schoolXlectureAwards));
+    }
+
+    /**
+     * 删除讲课获奖
+     */
+    @PreAuthorize("@ss.hasPermi('system:awards:remove')")
+    @Log(title = "讲课获奖", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolXlectureAwardsService.deleteSchoolXlectureAwardsByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java

+package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteacherAwardsService;
+
+/**
+ * 教师获奖Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/school/teacherAwards")
+public class SchoolXteacherAwardsController extends BaseController
+{
+    @Autowired
+    private ISchoolXteacherAwardsService schoolXteacherAwardsService;
+
+    /**
+     * 查询教师获奖列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolXteacherAwards schoolXteacherAwards)
+    {
+        startPage();
+        List<SchoolXteacherAwards> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwards);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出教师获奖列表
+     */
+    @Log(title = "教师获奖", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolXteacherAwards schoolXteacherAwards)
+    {
+        List<SchoolXteacherAwards> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwards);
+        ExcelUtil<SchoolXteacherAwards> util = new ExcelUtil<SchoolXteacherAwards>(SchoolXteacherAwards.class);
+        util.exportExcel(response, list, "教师获奖数据");
+    }
+
+    /**
+     * 获取教师获奖详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolXteacherAwardsService.selectSchoolXteacherAwardsById(id));
+    }
+
+    /**
+     * 新增教师获奖
+     */
+    @Log(title = "教师获奖", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolXteacherAwards schoolXteacherAwards)
+    {
+        return toAjax(schoolXteacherAwardsService.insertSchoolXteacherAwards(schoolXteacherAwards));
+    }
+
+    /**
+     * 修改教师获奖
+     */
+    @Log(title = "教师获奖", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolXteacherAwards schoolXteacherAwards)
+    {
+        return toAjax(schoolXteacherAwardsService.updateSchoolXteacherAwards(schoolXteacherAwards));
+    }
+
+    /**
+     * 删除教师获奖
+     */
+    @Log(title = "教师获奖", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolXteacherAwardsService.deleteSchoolXteacherAwardsByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java

+package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
+
+/**
+ * 教学成绩Controller
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@RestController
+@RequestMapping("/system/achievements")
+public class SchoolXteachingAchievementsController extends BaseController
+{
+    @Autowired
+    private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
+
+    /**
+     * 查询教学成绩列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(SchoolXteachingAchievements schoolXteachingAchievements)
+    {
+        startPage();
+        List<SchoolXteachingAchievements> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievements);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出教学成绩列表
+     */
+    @Log(title = "教学成绩", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SchoolXteachingAchievements schoolXteachingAchievements)
+    {
+        List<SchoolXteachingAchievements> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievements);
+        ExcelUtil<SchoolXteachingAchievements> util = new ExcelUtil<SchoolXteachingAchievements>(SchoolXteachingAchievements.class);
+        util.exportExcel(response, list, "教学成绩数据");
+    }
+
+    /**
+     * 获取教学成绩详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(schoolXteachingAchievementsService.selectSchoolXteachingAchievementsById(id));
+    }
+
+    /**
+     * 新增教学成绩
+     */
+    @Log(title = "教学成绩", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SchoolXteachingAchievements schoolXteachingAchievements)
+    {
+        return toAjax(schoolXteachingAchievementsService.insertSchoolXteachingAchievements(schoolXteachingAchievements));
+    }
+
+    /**
+     * 修改教学成绩
+     */
+    @Log(title = "教学成绩", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SchoolXteachingAchievements schoolXteachingAchievements)
+    {
+        return toAjax(schoolXteachingAchievementsService.updateSchoolXteachingAchievements(schoolXteachingAchievements));
+    }
+
+    /**
+     * 删除教学成绩
+     */
+    @Log(title = "教学成绩", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(schoolXteachingAchievementsService.deleteSchoolXteachingAchievementsByIds(ids));
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/SchoolTeacherBasiclnformationController.java

@@ -100,7 +100,7 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
         return AjaxResult.success(b);
     }
 
-    @GetMapping(value = "/download")
+    @PostMapping(value = "/download")
     public void downloadFile(HttpServletResponse response) throws Exception {
         // 以流的形式下载文件。
         try {

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolAnnualAssessment/SchoolAnnualAssessment.java

+package yangtz.cs.liu.campus.domain.schoolAnnualAssessment;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+import java.util.Date;
+
+/**
+ * 年度考核对象 school_annual_assessment
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Data
+public class SchoolAnnualAssessment {
+
+    /** 主键id */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 身份证 */
+    @Excel(name = "身份证")
+    private String idCard;
+
+    /** 考核结果(1优秀、2合格、3不定等次、4不予考核、5不合格) */
+    @Excel(name = "考核结果", readConverterExp = "1=优秀,2=合格,3=不定等次,4=不予考核,5=不合格", combo = {"优秀","合格","不定等次","不予考核","不合格"})
+    private String checkResult;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolAnnualAssessment/SchoolAnnualAssessmentExport.java

+package yangtz.cs.liu.campus.domain.schoolAnnualAssessment;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SchoolAnnualAssessmentExport
+{
+
+    /**
+     * 选中导出参数
+     */
+    private Long[] ids;
+
+    /** 主键id */
+    private Long id;
+
+    /** 年度 */
+    @Excel(name = "年度")
+    private Integer year;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 身份证 */
+    @Excel(name = "身份证")
+    private String idCard;
+
+    /** 考核结果(1优秀、2合格、3不定等次、4不予考核、5不合格) */
+    @Excel(name = "考核结果", readConverterExp = "1=优秀,2=合格,3=不定等次,4=不予考核,5=不合格", combo = {"优秀","合格","不定等次","不予考核","不合格"})
+    private String checkResult;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXacademicWorks.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 论文著作对象 school_xacademic_works
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Data
+public class SchoolXacademicWorks
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 学科 */
+    @Excel(name = "学科")
+    private String sub;
+
+    /** 获奖类别 */
+    @Excel(name = "获奖类别")
+    private String awardType;
+
+    /** 获奖级别 */
+    @Excel(name = "获奖级别")
+    private String awardRank;
+
+    /** 获奖等级 */
+    @Excel(name = "获奖等级")
+    private String awardLevel;
+
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String resultName;
+
+    /** 获奖人id */
+    private Long userId;
+
+    /** 获奖人 */
+    @Excel(name = "获奖人")
+    private String userName;
+
+    /** 主办单位 */
+    @Excel(name = "主办单位")
+    private String org;
+
+    /** 获奖时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "获奖时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date awardTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 证书图片名称 */
+    private String pictureName;
+
+    /** 证书图片地址 */
+    private String pictureUrl;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXcomprehensiveHonors.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 综合荣誉对象 school_xcomprehensive_honors
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Data
+public class SchoolXcomprehensiveHonors
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 学科（下拉框） */
+    @Excel(name = "学科")
+    private String sub;
+
+    /** 获奖类别 */
+    @Excel(name = "获奖类别")
+    private String awardType;
+
+    /** 获奖级别（下拉框） */
+    @Excel(name = "获奖级别")
+    private String awardRank;
+
+    /** 获奖等级（下拉框） */
+    @Excel(name = "获奖等级")
+    private String awardLevel;
+
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String resultName;
+
+    /** 获奖人id */
+    private Long userId;
+
+    /** 获奖人 */
+    @Excel(name = "获奖人")
+    private String userName;
+
+    /** 主办单位 */
+    @Excel(name = "主办单位")
+    private String org;
+
+    /** 获奖时间（年月日） */
+    @Excel(name = "获奖时间", readConverterExp = "年=月日")
+    private Date awardTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 证书图片名称 */
+    private String pictureName;
+
+    /** 证书图片地址 */
+    private String pictureUrl;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXlectureAwards.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+
+/**
+ * 讲课获奖对象 school_xlecture_awards
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Data
+public class SchoolXlectureAwards
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 学科 */
+    @Excel(name = "学科")
+    private String sub;
+
+    /** 获奖类别 */
+    @Excel(name = "获奖类别")
+    private String awardType;
+
+    /** 获奖级别 */
+    @Excel(name = "获奖级别")
+    private String awardRank;
+
+    /** 获奖等级 */
+    @Excel(name = "获奖等级")
+    private String awardLevel;
+
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String resultName;
+
+    /** 获奖人id */
+    @Excel(name = "获奖人id")
+    private Long userId;
+
+    /** 获奖人 */
+    @Excel(name = "获奖人")
+    private String userName;
+
+    /** 主办单位 */
+    @Excel(name = "主办单位")
+    private String org;
+
+    /** 获奖时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "获奖时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date awardTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 证书图片名称 */
+    private String pictureName;
+
+    /** 证书图片地址 */
+    private String pictureUrl;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteacherAwards.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 教师获奖对象 school_xteacher_awards
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Data
+public class SchoolXteacherAwards
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 学科 */
+    @Excel(name = "学科")
+    private String sub;
+
+    /** 获奖类别 */
+    @Excel(name = "获奖类别")
+    private String awardType;
+
+    /** 获奖级别 */
+    @Excel(name = "获奖级别")
+    private String awardRank;
+
+    /** 获奖等级 */
+    @Excel(name = "获奖等级")
+    private String awardLevel;
+
+    /** 成果名称 */
+    @Excel(name = "成果名称")
+    private String resultName;
+
+    /** 获奖人id */
+    private Long userId;
+
+    /** 获奖人 */
+    @Excel(name = "获奖人")
+    private String userName;
+
+    /** 主办单位 */
+    @Excel(name = "主办单位")
+    private String org;
+
+    /** 获奖时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "获奖时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date awardTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 证书图片名称 */
+    private String pictureName;
+
+    /** 证书图片地址 */
+    private String pictureUrl;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteachingAchievements.java

+package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 教学成绩对象 school_xteaching_achievements
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Data
+public class SchoolXteachingAchievements
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 学年(下拉框) */
+    @Excel(name = "学年(下拉框)")
+    private String schoolYear;
+
+    /** 学期（下拉框） */
+    @Excel(name = "学期")
+    private String semester;
+
+    /** 考试时间（年月日） */
+    @Excel(name = "考试时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date examTime;
+
+    /** 考试类型（下拉框） */
+    @Excel(name = "考试类型")
+    private String examType;
+
+    /** 届别(下拉框) */
+    @Excel(name = "届别(下拉框)")
+    private String year;
+
+    /** 年级（下拉框） */
+    @Excel(name = "年级")
+    private String grade;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 用户姓名 */
+    @Excel(name = "用户姓名")
+    private String userName;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 学科 */
+    @Excel(name = "学科")
+    private String sub;
+
+    /** 班级 */
+    @Excel(name = "班级")
+    private String className;
+
+    /** 班级类型 */
+    @Excel(name = "班级类型")
+    private String classType;
+
+    /** 考核分 */
+    @Excel(name = "考核分")
+    private BigDecimal assessmentScore;
+
+    /** 创建者 */
+    private String createBy;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    /** 删除状态 */
+    private String delFlag;
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/SchoolTeacherBasicInformation.java

@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.domain.teacherFiles;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.core.domain.OurBaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -44,6 +45,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 档案出生日期 (年月)
      */
+    @JsonFormat(pattern = "yyyy-MM")
     private Date fileBirthDate;
 
 
@@ -76,6 +78,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 入党时间（年月）
      */
+    @JsonFormat(pattern = "yyyy-MM")
     private Date partyMembershipTime;
 
     /**
@@ -91,6 +94,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 现职称取得资格时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date currentProfessionalTitleTime;
 
     /**
@@ -101,6 +105,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 现职称聘任时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date currentHiringProfessionalTitleTime;
 
     /**
@@ -117,6 +122,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 现岗位等级聘任时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date currentJobLevelAppointmentTime;
 
     /**
@@ -142,6 +148,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 到二中工作时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date toSecondMiddleSchoolTime;
 
     /**
@@ -152,11 +159,13 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 教龄起算时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date lengthOfTeacherTime;
 
     /**
      * 工龄起算时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date lengthOfServiceTime;
 
     /**
@@ -187,6 +196,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 毕业时间1 年月
      */
+    @JsonFormat(pattern = "yyyy-MM")
     private Date graduationTime1;
 
     /**
@@ -202,6 +212,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 毕业时间2年月
      */
+    @JsonFormat(pattern = "yyyy-MM")
      private Date graduationTime2;
 
     /**
@@ -217,6 +228,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
     /**
      * 毕业时间3 年月
      */
+    @JsonFormat(pattern = "yyyy-MM")
     private Date graduationTime3;
 
     /**

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolAnnualAssessment/SchoolAnnualAssessmentMapper.java

+package yangtz.cs.liu.campus.mapper.schoolAnnualAssessment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
+
+import java.util.List;
+
+/**
+ * 年度考核Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+public interface SchoolAnnualAssessmentMapper extends BaseMapper<SchoolAnnualAssessment> {
+
+    /**
+     * 查询年度考核
+     *
+     * @param id 年度考核主键
+     * @return 年度考核
+     */
+    public SchoolAnnualAssessment selectSchoolAnnualAssessmentById(Long id);
+
+    /**
+     * 查询年度考核列表
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 年度考核集合
+     */
+    public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessment schoolAnnualAssessment);
+
+    /**
+     * 新增年度考核
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 结果
+     */
+    public int insertSchoolAnnualAssessment(SchoolAnnualAssessment schoolAnnualAssessment);
+
+    /**
+     * 修改年度考核
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 结果
+     */
+    public int updateSchoolAnnualAssessment(SchoolAnnualAssessment schoolAnnualAssessment);
+
+    /**
+     * 删除年度考核
+     *
+     * @param id 年度考核主键
+     * @return 结果
+     */
+    public int deleteSchoolAnnualAssessmentById(Long id);
+
+    /**
+     * 批量删除年度考核
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolAnnualAssessmentByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXacademicWorksMapper.java

+package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
+import java.util.List;
+
+/**
+ * 论文著作Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface SchoolXacademicWorksMapper
+{
+    /**
+     * 查询论文著作
+     *
+     * @param id 论文著作主键
+     * @return 论文著作
+     */
+    public SchoolXacademicWorks selectSchoolXacademicWorksById(Long id);
+
+    /**
+     * 查询论文著作列表
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 论文著作集合
+     */
+    public List<SchoolXacademicWorks> selectSchoolXacademicWorksList(SchoolXacademicWorks schoolXacademicWorks);
+
+    /**
+     * 新增论文著作
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 结果
+     */
+    public int insertSchoolXacademicWorks(SchoolXacademicWorks schoolXacademicWorks);
+
+    /**
+     * 修改论文著作
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 结果
+     */
+    public int updateSchoolXacademicWorks(SchoolXacademicWorks schoolXacademicWorks);
+
+    /**
+     * 删除论文著作
+     *
+     * @param id 论文著作主键
+     * @return 结果
+     */
+    public int deleteSchoolXacademicWorksById(Long id);
+
+    /**
+     * 批量删除论文著作
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXacademicWorksByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsMapper.java

+package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXcomprehensiveHonors;
+import java.util.List;
+
+/**
+ * 综合荣誉Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface SchoolXcomprehensiveHonorsMapper
+{
+    /**
+     * 查询综合荣誉
+     *
+     * @param id 综合荣誉主键
+     * @return 综合荣誉
+     */
+    public SchoolXcomprehensiveHonors selectSchoolXcomprehensiveHonorsById(Long id);
+
+    /**
+     * 查询综合荣誉列表
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 综合荣誉集合
+     */
+    public List<SchoolXcomprehensiveHonors> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
+
+    /**
+     * 新增综合荣誉
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 结果
+     */
+    public int insertSchoolXcomprehensiveHonors(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
+
+    /**
+     * 修改综合荣誉
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 结果
+     */
+    public int updateSchoolXcomprehensiveHonors(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
+
+    /**
+     * 删除综合荣誉
+     *
+     * @param id 综合荣誉主键
+     * @return 结果
+     */
+    public int deleteSchoolXcomprehensiveHonorsById(Long id);
+
+    /**
+     * 批量删除综合荣誉
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXcomprehensiveHonorsByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXlectureAwardsMapper.java

+package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
+
+import java.util.List;
+
+/**
+ * 讲课获奖Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface SchoolXlectureAwardsMapper
+{
+    /**
+     * 查询讲课获奖
+     *
+     * @param id 讲课获奖主键
+     * @return 讲课获奖
+     */
+    public SchoolXlectureAwards selectSchoolXlectureAwardsById(Long id);
+
+    /**
+     * 查询讲课获奖列表
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 讲课获奖集合
+     */
+    public List<SchoolXlectureAwards> selectSchoolXlectureAwardsList(SchoolXlectureAwards schoolXlectureAwards);
+
+    /**
+     * 新增讲课获奖
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 结果
+     */
+    public int insertSchoolXlectureAwards(SchoolXlectureAwards schoolXlectureAwards);
+
+    /**
+     * 修改讲课获奖
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 结果
+     */
+    public int updateSchoolXlectureAwards(SchoolXlectureAwards schoolXlectureAwards);
+
+    /**
+     * 删除讲课获奖
+     *
+     * @param id 讲课获奖主键
+     * @return 结果
+     */
+    public int deleteSchoolXlectureAwardsById(Long id);
+
+    /**
+     * 批量删除讲课获奖
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXlectureAwardsByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteacherAwardsMapper.java

+package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
+
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
+
+import java.util.List;
+
+/**
+ * 教师获奖Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface SchoolXteacherAwardsMapper
+{
+    /**
+     * 查询教师获奖
+     *
+     * @param id 教师获奖主键
+     * @return 教师获奖
+     */
+    public SchoolXteacherAwards selectSchoolXteacherAwardsById(Long id);
+
+    /**
+     * 查询教师获奖列表
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 教师获奖集合
+     */
+    public List<SchoolXteacherAwards> selectSchoolXteacherAwardsList(SchoolXteacherAwards schoolXteacherAwards);
+
+    /**
+     * 新增教师获奖
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 结果
+     */
+    public int insertSchoolXteacherAwards(SchoolXteacherAwards schoolXteacherAwards);
+
+    /**
+     * 修改教师获奖
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 结果
+     */
+    public int updateSchoolXteacherAwards(SchoolXteacherAwards schoolXteacherAwards);
+
+    /**
+     * 删除教师获奖
+     *
+     * @param id 教师获奖主键
+     * @return 结果
+     */
+    public int deleteSchoolXteacherAwardsById(Long id);
+
+    /**
+     * 批量删除教师获奖
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXteacherAwardsByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.java

+package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
+
+import java.util.List;
+
+/**
+ * 教学成绩Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface SchoolXteachingAchievementsMapper
+{
+    /**
+     * 查询教学成绩
+     *
+     * @param id 教学成绩主键
+     * @return 教学成绩
+     */
+    public SchoolXteachingAchievements selectSchoolXteachingAchievementsById(Long id);
+
+    /**
+     * 查询教学成绩列表
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 教学成绩集合
+     */
+    public List<SchoolXteachingAchievements> selectSchoolXteachingAchievementsList(SchoolXteachingAchievements schoolXteachingAchievements);
+
+    /**
+     * 新增教学成绩
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 结果
+     */
+    public int insertSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements);
+
+    /**
+     * 修改教学成绩
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 结果
+     */
+    public int updateSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements);
+
+    /**
+     * 删除教学成绩
+     *
+     * @param id 教学成绩主键
+     * @return 结果
+     */
+    public int deleteSchoolXteachingAchievementsById(Long id);
+
+    /**
+     * 批量删除教学成绩
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXteachingAchievementsByIds(Long[] ids);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolAnnualAssessment/SchoolAnnualAssessmentServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolAnnualAssessment;
+
+import cn.hutool.core.io.resource.ClassPathResource;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysDictDataMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.controller.teacherFiles.SchoolTeacherBasiclnformationController;
+import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
+import yangtz.cs.liu.campus.mapper.schoolAnnualAssessment.SchoolAnnualAssessmentMapper;
+import yangtz.cs.liu.campus.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ * 年度考核Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+@Service
+public class SchoolAnnualAssessmentServiceImpl extends ServiceImpl<SchoolAnnualAssessmentMapper,SchoolAnnualAssessment> implements ISchoolAnnualAssessmentService {
+
+    @Autowired
+    private SchoolAnnualAssessmentMapper schoolAnnualAssessmentMapper;
+    @Autowired
+    private SysDictDataMapper sysDictDataMapper;
+
+    private Logger log = LoggerFactory.getLogger(SchoolAnnualAssessmentServiceImpl.class);
+
+    /**
+     * 查询年度考核
+     *
+     * @param id 年度考核主键
+     * @return 年度考核
+     */
+    @Override
+    public SchoolAnnualAssessment selectSchoolAnnualAssessmentById(Long id)
+    {
+        return schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentById(id);
+    }
+
+    /**
+     * 查询年度考核列表
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 年度考核
+     */
+    @Override
+    public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessment schoolAnnualAssessment)
+    {
+        return schoolAnnualAssessmentMapper.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
+    }
+
+    /**
+     * 新增年度考核
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolAnnualAssessment(SchoolAnnualAssessment schoolAnnualAssessment)
+    {
+        schoolAnnualAssessment.setCreateBy(SecurityUtils.getUsername());
+        schoolAnnualAssessment.setCreateTime(DateUtils.getNowDate());
+        return schoolAnnualAssessmentMapper.insertSchoolAnnualAssessment(schoolAnnualAssessment);
+    }
+
+    /**
+     * 修改年度考核
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolAnnualAssessment(SchoolAnnualAssessment schoolAnnualAssessment)
+    {
+        schoolAnnualAssessment.setUpdateBy(SecurityUtils.getUsername());
+        schoolAnnualAssessment.setUpdateTime(DateUtils.getNowDate());
+        return schoolAnnualAssessmentMapper.updateSchoolAnnualAssessment(schoolAnnualAssessment);
+    }
+
+    /**
+     * 批量删除年度考核
+     *
+     * @param ids 需要删除的年度考核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolAnnualAssessmentByIds(Long[] ids)
+    {
+        return schoolAnnualAssessmentMapper.deleteSchoolAnnualAssessmentByIds(ids);
+    }
+
+    /**
+     * 删除年度考核信息
+     *
+     * @param id 年度考核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolAnnualAssessmentById(Long id)
+    {
+        return schoolAnnualAssessmentMapper.deleteSchoolAnnualAssessmentById(id);
+    }
+
+    /**
+     * 校验导入数据
+     * @param list
+     */
+    @Override
+    public void checkImport(List<SchoolAnnualAssessment> list) {
+        //检验是否为空
+        if (StringUtils.isNull(list) || list.size() == 0) {
+            throw new ServiceException("导入数据不能为空");
+        }
+        //查询考核结果类型字典键值
+        List<SysDictData> checkResult = sysDictDataMapper.selectDictDataByType("check_result");
+        // 准备记录日志数据
+        int failureNum = 0;
+        StringBuilder failureMsg = new StringBuilder();
+        for (SchoolAnnualAssessment schoolAnnualAssessment : list) {
+            if (StringUtils.isNull(schoolAnnualAssessment.getYear())) {
+                failureNum++;
+                failureMsg.append("<br/>" + failureNum + "、年度为空,请您重新输入! ");
+            } else if (StringUtils.isEmpty(schoolAnnualAssessment.getName())) {
+                failureNum++;
+                failureMsg.append("<br/>" + failureNum + "、姓名为空,请您重新输入! ");
+            } else if (StringUtils.isEmpty(schoolAnnualAssessment.getIdCard())) {
+                failureNum++;
+                failureMsg.append("<br/>" + failureNum + "、身份证号为空,请您重新输入! ");
+            } else if (StringUtils.isEmpty(schoolAnnualAssessment.getCheckResult())) {
+                failureNum++;
+                failureMsg.append("<br/>" + failureNum + "、考核结果为空,请您重新输入! ");
+            } else if (schoolAnnualAssessment.getIdCard().length() != 18 && schoolAnnualAssessment.getIdCard().length() != 15){
+                failureNum++;
+                failureMsg.append("<br/>" + failureNum + "、身份证号输入错误,请您重新输入! ");
+            } else {
+                //校验年度是否符合
+                if (schoolAnnualAssessment.getYear().toString().length() != 4){
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、年度输入错误,请您重新输入! ");
+                }
+                for (int i = 0; i < 4; i++) {
+                    if (!Character.isDigit(schoolAnnualAssessment.getYear().toString().charAt(i))){
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、年度输入错误,请您重新输入! ");
+                        break;
+                    }
+                }
+                if(schoolAnnualAssessment.getIdCard().length() == 18){
+                    //校验前十七位是否为数字
+                    for (int i = 0; i < 17; i++) {
+                        if (!Character.isDigit(schoolAnnualAssessment.getIdCard().charAt(i))){
+                            failureNum++;
+                            failureMsg.append("<br/>" + failureNum + "、身份证号输入错误,请您重新输入! ");
+                            break;
+                        }
+                    }
+                }
+                //判断考核结果是否输入正确
+                for (SysDictData sysDictData : checkResult) {
+                    if (!schoolAnnualAssessment.getCheckResult().equals(sysDictData.getDictValue())){
+                        failureNum++;
+                        failureMsg.append("<br/>" + failureNum + "、考核结果输入错误,请您重新输入! ");
+                        break;
+                    }
+                }
+            }
+        }
+        if (failureNum > 0) {
+            failureMsg.insert(0, "很抱歉，导入失败！共" + failureNum + "条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        }
+    }
+
+    /**
+     * 导入数据
+     * @param list
+     * @return
+     */
+    @Override
+    public String importData(List<SchoolAnnualAssessment> list) {
+        StringBuilder successMsg = new StringBuilder();
+        //批量导入年度考核数据
+        boolean b = saveBatch(list);
+        if (!b){
+            throw new ServiceException("导入失败");
+        }
+        successMsg.insert(0, "恭喜您，数据已导入成功！");
+        return successMsg.toString();
+    }
+
+    /**
+     * 下载模板
+     * @param response
+     */
+    @Override
+    public void importTemplate(HttpServletResponse response) {
+        // 以流的形式下载文件。
+        try {
+            //读取文件
+            InputStream resourceAsStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("file/年度考核导入模板.xlsx");
+            InputStream fis = new BufferedInputStream(resourceAsStream);
+            byte[] buffer = new byte[fis.available()];
+            fis.read(buffer);
+            fis.close();
+            // 清空response
+            response.reset();
+            // 设置response的Header
+            response.setHeader("Content-Disposition", "attachment;filename="+java.net.URLEncoder.encode("年度考核导入模板.xlsx", "utf-8"));
+            //response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes()));
+            response.addHeader("Content-Length", "" + buffer.length);
+            OutputStream toClient = new BufferedOutputStream(response.getOutputStream());
+            response.setContentType("application/octet-stream");
+            toClient.write(buffer);
+            toClient.flush();
+            toClient.close();
+        } catch (IOException e) {
+            log.info(e.getMessage());
+        }
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXacademicWorksServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
+import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXacademicWorksMapper;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXacademicWorksService;
+
+/**
+ * 论文著作Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Service
+public class SchoolXacademicWorksServiceImpl implements ISchoolXacademicWorksService
+{
+    @Autowired
+    private SchoolXacademicWorksMapper schoolXacademicWorksMapper;
+
+    /**
+     * 查询论文著作
+     *
+     * @param id 论文著作主键
+     * @return 论文著作
+     */
+    @Override
+    public SchoolXacademicWorks selectSchoolXacademicWorksById(Long id)
+    {
+        return schoolXacademicWorksMapper.selectSchoolXacademicWorksById(id);
+    }
+
+    /**
+     * 查询论文著作列表
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 论文著作
+     */
+    @Override
+    public List<SchoolXacademicWorks> selectSchoolXacademicWorksList(SchoolXacademicWorks schoolXacademicWorks)
+    {
+        return schoolXacademicWorksMapper.selectSchoolXacademicWorksList(schoolXacademicWorks);
+    }
+
+    /**
+     * 新增论文著作
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolXacademicWorks(SchoolXacademicWorks schoolXacademicWorks)
+    {
+        schoolXacademicWorks.setCreateTime(DateUtils.getNowDate());
+        return schoolXacademicWorksMapper.insertSchoolXacademicWorks(schoolXacademicWorks);
+    }
+
+    /**
+     * 修改论文著作
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolXacademicWorks(SchoolXacademicWorks schoolXacademicWorks)
+    {
+        schoolXacademicWorks.setUpdateTime(DateUtils.getNowDate());
+        return schoolXacademicWorksMapper.updateSchoolXacademicWorks(schoolXacademicWorks);
+    }
+
+    /**
+     * 批量删除论文著作
+     *
+     * @param ids 需要删除的论文著作主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXacademicWorksByIds(Long[] ids)
+    {
+        return schoolXacademicWorksMapper.deleteSchoolXacademicWorksByIds(ids);
+    }
+
+    /**
+     * 删除论文著作信息
+     *
+     * @param id 论文著作主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXacademicWorksById(Long id)
+    {
+        return schoolXacademicWorksMapper.deleteSchoolXacademicWorksById(id);
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXcomprehensiveHonors;
+import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsMapper;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXcomprehensiveHonorsService;
+
+/**
+ * 综合荣誉Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Service
+public class SchoolXcomprehensiveHonorsServiceImpl implements ISchoolXcomprehensiveHonorsService
+{
+    @Autowired
+    private SchoolXcomprehensiveHonorsMapper schoolXcomprehensiveHonorsMapper;
+
+    /**
+     * 查询综合荣誉
+     *
+     * @param id 综合荣誉主键
+     * @return 综合荣誉
+     */
+    @Override
+    public SchoolXcomprehensiveHonors selectSchoolXcomprehensiveHonorsById(Long id)
+    {
+        return schoolXcomprehensiveHonorsMapper.selectSchoolXcomprehensiveHonorsById(id);
+    }
+
+    /**
+     * 查询综合荣誉列表
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 综合荣誉
+     */
+    @Override
+    public List<SchoolXcomprehensiveHonors> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    {
+        return schoolXcomprehensiveHonorsMapper.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonors);
+    }
+
+    /**
+     * 新增综合荣誉
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolXcomprehensiveHonors(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    {
+        schoolXcomprehensiveHonors.setCreateTime(DateUtils.getNowDate());
+        return schoolXcomprehensiveHonorsMapper.insertSchoolXcomprehensiveHonors(schoolXcomprehensiveHonors);
+    }
+
+    /**
+     * 修改综合荣誉
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolXcomprehensiveHonors(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
+    {
+        schoolXcomprehensiveHonors.setUpdateTime(DateUtils.getNowDate());
+        return schoolXcomprehensiveHonorsMapper.updateSchoolXcomprehensiveHonors(schoolXcomprehensiveHonors);
+    }
+
+    /**
+     * 批量删除综合荣誉
+     *
+     * @param ids 需要删除的综合荣誉主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXcomprehensiveHonorsByIds(Long[] ids)
+    {
+        return schoolXcomprehensiveHonorsMapper.deleteSchoolXcomprehensiveHonorsByIds(ids);
+    }
+
+    /**
+     * 删除综合荣誉信息
+     *
+     * @param id 综合荣誉主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXcomprehensiveHonorsById(Long id)
+    {
+        return schoolXcomprehensiveHonorsMapper.deleteSchoolXcomprehensiveHonorsById(id);
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXlectureAwardsServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
+import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXlectureAwardsMapper;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXlectureAwardsService;
+
+/**
+ * 讲课获奖Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Service
+public class SchoolXlectureAwardsServiceImpl implements ISchoolXlectureAwardsService
+{
+    @Autowired
+    private SchoolXlectureAwardsMapper schoolXlectureAwardsMapper;
+
+    /**
+     * 查询讲课获奖
+     *
+     * @param id 讲课获奖主键
+     * @return 讲课获奖
+     */
+    @Override
+    public SchoolXlectureAwards selectSchoolXlectureAwardsById(Long id)
+    {
+        return schoolXlectureAwardsMapper.selectSchoolXlectureAwardsById(id);
+    }
+
+    /**
+     * 查询讲课获奖列表
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 讲课获奖
+     */
+    @Override
+    public List<SchoolXlectureAwards> selectSchoolXlectureAwardsList(SchoolXlectureAwards schoolXlectureAwards)
+    {
+        return schoolXlectureAwardsMapper.selectSchoolXlectureAwardsList(schoolXlectureAwards);
+    }
+
+    /**
+     * 新增讲课获奖
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolXlectureAwards(SchoolXlectureAwards schoolXlectureAwards)
+    {
+        schoolXlectureAwards.setCreateTime(DateUtils.getNowDate());
+        return schoolXlectureAwardsMapper.insertSchoolXlectureAwards(schoolXlectureAwards);
+    }
+
+    /**
+     * 修改讲课获奖
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolXlectureAwards(SchoolXlectureAwards schoolXlectureAwards)
+    {
+        schoolXlectureAwards.setUpdateTime(DateUtils.getNowDate());
+        return schoolXlectureAwardsMapper.updateSchoolXlectureAwards(schoolXlectureAwards);
+    }
+
+    /**
+     * 批量删除讲课获奖
+     *
+     * @param ids 需要删除的讲课获奖主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXlectureAwardsByIds(Long[] ids)
+    {
+        return schoolXlectureAwardsMapper.deleteSchoolXlectureAwardsByIds(ids);
+    }
+
+    /**
+     * 删除讲课获奖信息
+     *
+     * @param id 讲课获奖主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXlectureAwardsById(Long id)
+    {
+        return schoolXlectureAwardsMapper.deleteSchoolXlectureAwardsById(id);
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteacherAwardsServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
+import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteacherAwardsMapper;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteacherAwardsService;
+
+/**
+ * 教师获奖Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Service
+public class SchoolXteacherAwardsServiceImpl implements ISchoolXteacherAwardsService
+{
+    @Autowired
+    private SchoolXteacherAwardsMapper schoolXteacherAwardsMapper;
+
+    /**
+     * 查询教师获奖
+     *
+     * @param id 教师获奖主键
+     * @return 教师获奖
+     */
+    @Override
+    public SchoolXteacherAwards selectSchoolXteacherAwardsById(Long id)
+    {
+        return schoolXteacherAwardsMapper.selectSchoolXteacherAwardsById(id);
+    }
+
+    /**
+     * 查询教师获奖列表
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 教师获奖
+     */
+    @Override
+    public List<SchoolXteacherAwards> selectSchoolXteacherAwardsList(SchoolXteacherAwards schoolXteacherAwards)
+    {
+        return schoolXteacherAwardsMapper.selectSchoolXteacherAwardsList(schoolXteacherAwards);
+    }
+
+    /**
+     * 新增教师获奖
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolXteacherAwards(SchoolXteacherAwards schoolXteacherAwards)
+    {
+        schoolXteacherAwards.setCreateTime(DateUtils.getNowDate());
+        return schoolXteacherAwardsMapper.insertSchoolXteacherAwards(schoolXteacherAwards);
+    }
+
+    /**
+     * 修改教师获奖
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolXteacherAwards(SchoolXteacherAwards schoolXteacherAwards)
+    {
+        schoolXteacherAwards.setUpdateTime(DateUtils.getNowDate());
+        return schoolXteacherAwardsMapper.updateSchoolXteacherAwards(schoolXteacherAwards);
+    }
+
+    /**
+     * 批量删除教师获奖
+     *
+     * @param ids 需要删除的教师获奖主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXteacherAwardsByIds(Long[] ids)
+    {
+        return schoolXteacherAwardsMapper.deleteSchoolXteacherAwardsByIds(ids);
+    }
+
+    /**
+     * 删除教师获奖信息
+     *
+     * @param id 教师获奖主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXteacherAwardsById(Long id)
+    {
+        return schoolXteacherAwardsMapper.deleteSchoolXteacherAwardsById(id);
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteachingAchievementsServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
+import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteachingAchievementsMapper;
+import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
+
+/**
+ * 教学成绩Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+@Service
+public class SchoolXteachingAchievementsServiceImpl implements ISchoolXteachingAchievementsService
+{
+    @Autowired
+    private SchoolXteachingAchievementsMapper schoolXteachingAchievementsMapper;
+
+    /**
+     * 查询教学成绩
+     *
+     * @param id 教学成绩主键
+     * @return 教学成绩
+     */
+    @Override
+    public SchoolXteachingAchievements selectSchoolXteachingAchievementsById(Long id)
+    {
+        return schoolXteachingAchievementsMapper.selectSchoolXteachingAchievementsById(id);
+    }
+
+    /**
+     * 查询教学成绩列表
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 教学成绩
+     */
+    @Override
+    public List<SchoolXteachingAchievements> selectSchoolXteachingAchievementsList(SchoolXteachingAchievements schoolXteachingAchievements)
+    {
+        return schoolXteachingAchievementsMapper.selectSchoolXteachingAchievementsList(schoolXteachingAchievements);
+    }
+
+    /**
+     * 新增教学成绩
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 结果
+     */
+    @Override
+    public int insertSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements)
+    {
+        schoolXteachingAchievements.setCreateTime(DateUtils.getNowDate());
+        return schoolXteachingAchievementsMapper.insertSchoolXteachingAchievements(schoolXteachingAchievements);
+    }
+
+    /**
+     * 修改教学成绩
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 结果
+     */
+    @Override
+    public int updateSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements)
+    {
+        schoolXteachingAchievements.setUpdateTime(DateUtils.getNowDate());
+        return schoolXteachingAchievementsMapper.updateSchoolXteachingAchievements(schoolXteachingAchievements);
+    }
+
+    /**
+     * 批量删除教学成绩
+     *
+     * @param ids 需要删除的教学成绩主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXteachingAchievementsByIds(Long[] ids)
+    {
+        return schoolXteachingAchievementsMapper.deleteSchoolXteachingAchievementsByIds(ids);
+    }
+
+    /**
+     * 删除教学成绩信息
+     *
+     * @param id 教学成绩主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSchoolXteachingAchievementsById(Long id)
+    {
+        return schoolXteachingAchievementsMapper.deleteSchoolXteachingAchievementsById(id);
+    }
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/SchoolTeacherBasichlnformationServicelmpl.java

@@ -74,8 +74,10 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
         int ageFromIdCard = IdCardNumberUtils.getAgeFromIdCard(schoolTeacherBasicInformation.getIdCard());
         schoolTeacherBasicInformation.setAge(ageFromIdCard);
         //2.计算档案年龄
-        int age = this.getAge(schoolTeacherBasicInformation.getFileBirthDate());
-        schoolTeacherBasicInformation.setFileAge(age);
+        if (StringUtils.isNotNull(schoolTeacherBasicInformation.getFileBirthDate())){
+            int age = this.getAge(schoolTeacherBasicInformation.getFileBirthDate());
+            schoolTeacherBasicInformation.setFileAge(age);
+        }
         //3.到二中工作年限
         int nl = this.workAge(sdf.parse(format),schoolTeacherBasicInformation.getToSecondMiddleSchoolTime());
         schoolTeacherBasicInformation.setToSecondAge(nl);

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolAnnualAssessment/ISchoolAnnualAssessmentService.java

+package yangtz.cs.liu.campus.service.schoolAnnualAssessment;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 年度考核Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-05
+ */
+public interface ISchoolAnnualAssessmentService extends IService<SchoolAnnualAssessment> {
+
+    /**
+     * 查询年度考核
+     *
+     * @param id 年度考核主键
+     * @return 年度考核
+     */
+    public SchoolAnnualAssessment selectSchoolAnnualAssessmentById(Long id);
+
+    /**
+     * 查询年度考核列表
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 年度考核集合
+     */
+    public List<SchoolAnnualAssessment> selectSchoolAnnualAssessmentList(SchoolAnnualAssessment schoolAnnualAssessment);
+
+    /**
+     * 新增年度考核
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 结果
+     */
+    public int insertSchoolAnnualAssessment(SchoolAnnualAssessment schoolAnnualAssessment);
+
+    /**
+     * 修改年度考核
+     *
+     * @param schoolAnnualAssessment 年度考核
+     * @return 结果
+     */
+    public int updateSchoolAnnualAssessment(SchoolAnnualAssessment schoolAnnualAssessment);
+
+    /**
+     * 批量删除年度考核
+     *
+     * @param ids 需要删除的年度考核主键集合
+     * @return 结果
+     */
+    public int deleteSchoolAnnualAssessmentByIds(Long[] ids);
+
+    /**
+     * 删除年度考核信息
+     *
+     * @param id 年度考核主键
+     * @return 结果
+     */
+    public int deleteSchoolAnnualAssessmentById(Long id);
+
+    /**
+     * 校验导入数据
+     * @param list
+     */
+    void checkImport(List<SchoolAnnualAssessment> list);
+
+    /**
+     * 导入数据
+     * @param list
+     * @return
+     */
+    String importData(List<SchoolAnnualAssessment> list);
+
+    /**
+     * 下载模板
+     * @param response
+     */
+    void importTemplate (HttpServletResponse response);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXacademicWorksService.java

+package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
+import java.util.List;
+
+/**
+ * 论文著作Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface ISchoolXacademicWorksService
+{
+    /**
+     * 查询论文著作
+     *
+     * @param id 论文著作主键
+     * @return 论文著作
+     */
+    public SchoolXacademicWorks selectSchoolXacademicWorksById(Long id);
+
+    /**
+     * 查询论文著作列表
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 论文著作集合
+     */
+    public List<SchoolXacademicWorks> selectSchoolXacademicWorksList(SchoolXacademicWorks schoolXacademicWorks);
+
+    /**
+     * 新增论文著作
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 结果
+     */
+    public int insertSchoolXacademicWorks(SchoolXacademicWorks schoolXacademicWorks);
+
+    /**
+     * 修改论文著作
+     *
+     * @param schoolXacademicWorks 论文著作
+     * @return 结果
+     */
+    public int updateSchoolXacademicWorks(SchoolXacademicWorks schoolXacademicWorks);
+
+    /**
+     * 批量删除论文著作
+     *
+     * @param ids 需要删除的论文著作主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXacademicWorksByIds(Long[] ids);
+
+    /**
+     * 删除论文著作信息
+     *
+     * @param id 论文著作主键
+     * @return 结果
+     */
+    public int deleteSchoolXacademicWorksById(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXcomprehensiveHonorsService.java

+package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXcomprehensiveHonors;
+
+import java.util.List;
+
+/**
+ * 综合荣誉Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface ISchoolXcomprehensiveHonorsService
+{
+    /**
+     * 查询综合荣誉
+     *
+     * @param id 综合荣誉主键
+     * @return 综合荣誉
+     */
+    public SchoolXcomprehensiveHonors selectSchoolXcomprehensiveHonorsById(Long id);
+
+    /**
+     * 查询综合荣誉列表
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 综合荣誉集合
+     */
+    public List<SchoolXcomprehensiveHonors> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
+
+    /**
+     * 新增综合荣誉
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 结果
+     */
+    public int insertSchoolXcomprehensiveHonors(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
+
+    /**
+     * 修改综合荣誉
+     *
+     * @param schoolXcomprehensiveHonors 综合荣誉
+     * @return 结果
+     */
+    public int updateSchoolXcomprehensiveHonors(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
+
+    /**
+     * 批量删除综合荣誉
+     *
+     * @param ids 需要删除的综合荣誉主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXcomprehensiveHonorsByIds(Long[] ids);
+
+    /**
+     * 删除综合荣誉信息
+     *
+     * @param id 综合荣誉主键
+     * @return 结果
+     */
+    public int deleteSchoolXcomprehensiveHonorsById(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXlectureAwardsService.java

+package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
+
+import java.util.List;
+
+/**
+ * 讲课获奖Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface ISchoolXlectureAwardsService
+{
+    /**
+     * 查询讲课获奖
+     *
+     * @param id 讲课获奖主键
+     * @return 讲课获奖
+     */
+    public SchoolXlectureAwards selectSchoolXlectureAwardsById(Long id);
+
+    /**
+     * 查询讲课获奖列表
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 讲课获奖集合
+     */
+    public List<SchoolXlectureAwards> selectSchoolXlectureAwardsList(SchoolXlectureAwards schoolXlectureAwards);
+
+    /**
+     * 新增讲课获奖
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 结果
+     */
+    public int insertSchoolXlectureAwards(SchoolXlectureAwards schoolXlectureAwards);
+
+    /**
+     * 修改讲课获奖
+     *
+     * @param schoolXlectureAwards 讲课获奖
+     * @return 结果
+     */
+    public int updateSchoolXlectureAwards(SchoolXlectureAwards schoolXlectureAwards);
+
+    /**
+     * 批量删除讲课获奖
+     *
+     * @param ids 需要删除的讲课获奖主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXlectureAwardsByIds(Long[] ids);
+
+    /**
+     * 删除讲课获奖信息
+     *
+     * @param id 讲课获奖主键
+     * @return 结果
+     */
+    public int deleteSchoolXlectureAwardsById(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteacherAwardsService.java

+package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
+
+import java.util.List;
+
+/**
+ * 教师获奖Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface ISchoolXteacherAwardsService
+{
+    /**
+     * 查询教师获奖
+     *
+     * @param id 教师获奖主键
+     * @return 教师获奖
+     */
+    public SchoolXteacherAwards selectSchoolXteacherAwardsById(Long id);
+
+    /**
+     * 查询教师获奖列表
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 教师获奖集合
+     */
+    public List<SchoolXteacherAwards> selectSchoolXteacherAwardsList(SchoolXteacherAwards schoolXteacherAwards);
+
+    /**
+     * 新增教师获奖
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 结果
+     */
+    public int insertSchoolXteacherAwards(SchoolXteacherAwards schoolXteacherAwards);
+
+    /**
+     * 修改教师获奖
+     *
+     * @param schoolXteacherAwards 教师获奖
+     * @return 结果
+     */
+    public int updateSchoolXteacherAwards(SchoolXteacherAwards schoolXteacherAwards);
+
+    /**
+     * 批量删除教师获奖
+     *
+     * @param ids 需要删除的教师获奖主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXteacherAwardsByIds(Long[] ids);
+
+    /**
+     * 删除教师获奖信息
+     *
+     * @param id 教师获奖主键
+     * @return 结果
+     */
+    public int deleteSchoolXteacherAwardsById(Long id);
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteachingAchievementsService.java

+package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
+
+import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
+
+import java.util.List;
+
+/**
+ * 教学成绩Service接口
+ *
+ * @author ruoyi
+ * @date 2023-12-06
+ */
+public interface ISchoolXteachingAchievementsService
+{
+    /**
+     * 查询教学成绩
+     *
+     * @param id 教学成绩主键
+     * @return 教学成绩
+     */
+    public SchoolXteachingAchievements selectSchoolXteachingAchievementsById(Long id);
+
+    /**
+     * 查询教学成绩列表
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 教学成绩集合
+     */
+    public List<SchoolXteachingAchievements> selectSchoolXteachingAchievementsList(SchoolXteachingAchievements schoolXteachingAchievements);
+
+    /**
+     * 新增教学成绩
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 结果
+     */
+    public int insertSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements);
+
+    /**
+     * 修改教学成绩
+     *
+     * @param schoolXteachingAchievements 教学成绩
+     * @return 结果
+     */
+    public int updateSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements);
+
+    /**
+     * 批量删除教学成绩
+     *
+     * @param ids 需要删除的教学成绩主键集合
+     * @return 结果
+     */
+    public int deleteSchoolXteachingAchievementsByIds(Long[] ids);
+
+    /**
+     * 删除教学成绩信息
+     *
+     * @param id 教学成绩主键
+     * @return 结果
+     */
+    public int deleteSchoolXteachingAchievementsById(Long id);
+}

smart-campus/src/main/resources/mapper/schoolAnnualAssessment/SchoolAnnualAssessmentMapper.xml

+<?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="yangtz.cs.liu.campus.mapper.schoolAnnualAssessment.SchoolAnnualAssessmentMapper">
+
+    <resultMap type="SchoolAnnualAssessment" id="SchoolAnnualAssessmentResult">
+        <result property="id"    column="id"    />
+        <result property="year"    column="year"    />
+        <result property="name"    column="name"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="checkResult"    column="check_result"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSchoolAnnualAssessmentVo">
+        select id, year, name, id_card, check_result, remark, create_by, create_Time, update_by, update_time, del_flag from school_annual_assessment
+    </sql>
+
+    <select id="selectSchoolAnnualAssessmentList" parameterType="SchoolAnnualAssessment" resultMap="SchoolAnnualAssessmentResult">
+        <include refid="selectSchoolAnnualAssessmentVo"/>
+        <where>
+            del_flag = '0'
+            <if test="year != null "> and year = #{year}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="checkResult != null  and checkResult != ''"> and check_result = #{checkResult}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
+            <if test="createBy != null  and createBy != ''"> and create_by = #{createBy}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by = #{updateBy}</if>
+            <if test="updateTime != null"> and update_time = #{updateTime}</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectSchoolAnnualAssessmentById" parameterType="Long" resultMap="SchoolAnnualAssessmentResult">
+        <include refid="selectSchoolAnnualAssessmentVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolAnnualAssessment" parameterType="SchoolAnnualAssessment" useGeneratedKeys="true" keyProperty="id">
+        insert into school_annual_assessment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="year != null">year,</if>
+            <if test="name != null and name != ''">name,</if>
+            <if test="idCard != null and idCard != ''">id_card,</if>
+            <if test="checkResult != null and checkResult != ''">check_result,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="year != null">#{year},</if>
+            <if test="name != null and name != ''">#{name},</if>
+            <if test="idCard != null and idCard != ''">#{idCard},</if>
+            <if test="checkResult != null and checkResult != ''">#{checkResult},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolAnnualAssessment" parameterType="SchoolAnnualAssessment">
+        update school_annual_assessment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="year != null">year = #{year},</if>
+            <if test="name != null and name != ''">name = #{name},</if>
+            <if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
+            <if test="checkResult != null and checkResult != ''">check_result = #{checkResult},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null"> create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteSchoolAnnualAssessmentById" parameterType="Long">
+        update school_annual_assessment set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteSchoolAnnualAssessmentByIds" parameterType="String">
+        update school_annual_assessment set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXacademicWorksMapper.xml

+<?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="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXacademicWorksMapper">
+
+    <resultMap type="SchoolXacademicWorks" id="SchoolXacademicWorksResult">
+        <result property="id"    column="id"    />
+        <result property="sub"    column="sub"    />
+        <result property="awardType"    column="award_type"    />
+        <result property="awardRank"    column="award_rank"    />
+        <result property="awardLevel"    column="award_level"    />
+        <result property="resultName"    column="result_name"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="org"    column="org"    />
+        <result property="awardTime"    column="award_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="pictureName"    column="picture_name"    />
+        <result property="pictureUrl"    column="picture_url"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSchoolXacademicWorksVo">
+        select id, sub, award_type, award_rank, award_level, result_name, user_id, user_name, org, award_time, remark, picture_name, picture_url, create_by, create_time, update_by, update_time, del_flag from school_xacademic_works
+    </sql>
+
+    <select id="selectSchoolXacademicWorksList" parameterType="SchoolXacademicWorks" resultMap="SchoolXacademicWorksResult">
+        <include refid="selectSchoolXacademicWorksVo"/>
+        <where>
+            del_flag = '0'
+            <if test="sub != null  and sub != ''"> and sub = #{sub}</if>
+            <if test="awardType != null  and awardType != ''"> and award_type = #{awardType}</if>
+            <if test="awardRank != null  and awardRank != ''"> and award_rank = #{awardRank}</if>
+            <if test="awardLevel != null  and awardLevel != ''"> and award_level = #{awardLevel}</if>
+            <if test="resultName != null  and resultName != ''"> and result_name like concat('%', #{resultName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="org != null  and org != ''"> and org = #{org}</if>
+            <if test="awardTime != null "> and award_time = #{awardTime}</if>
+            <if test="pictureName != null  and pictureName != ''"> and picture_name like concat('%', #{pictureName}, '%')</if>
+            <if test="pictureUrl != null  and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
+        </where>
+        order create_time DESC
+    </select>
+
+    <select id="selectSchoolXacademicWorksById" parameterType="Long" resultMap="SchoolXacademicWorksResult">
+        <include refid="selectSchoolXacademicWorksVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolXacademicWorks" parameterType="SchoolXacademicWorks" useGeneratedKeys="true" keyProperty="id">
+        insert into school_xacademic_works
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sub != null and sub != ''">sub,</if>
+            <if test="awardType != null and awardType != ''">award_type,</if>
+            <if test="awardRank != null and awardRank != ''">award_rank,</if>
+            <if test="awardLevel != null and awardLevel != ''">award_level,</if>
+            <if test="resultName != null and resultName != ''">result_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="org != null and org != ''">org,</if>
+            <if test="awardTime != null">award_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="pictureName != null and pictureName != ''">picture_name,</if>
+            <if test="pictureUrl != null and pictureUrl != ''">picture_url,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sub != null and sub != ''">#{sub},</if>
+            <if test="awardType != null and awardType != ''">#{awardType},</if>
+            <if test="awardRank != null and awardRank != ''">#{awardRank},</if>
+            <if test="awardLevel != null and awardLevel != ''">#{awardLevel},</if>
+            <if test="resultName != null and resultName != ''">#{resultName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="org != null and org != ''">#{org},</if>
+            <if test="awardTime != null">#{awardTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="pictureName != null and pictureName != ''">#{pictureName},</if>
+            <if test="pictureUrl != null and pictureUrl != ''">#{pictureUrl},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolXacademicWorks" parameterType="SchoolXacademicWorks">
+        update school_xacademic_works
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sub != null and sub != ''">sub = #{sub},</if>
+            <if test="awardType != null and awardType != ''">award_type = #{awardType},</if>
+            <if test="awardRank != null and awardRank != ''">award_rank = #{awardRank},</if>
+            <if test="awardLevel != null and awardLevel != ''">award_level = #{awardLevel},</if>
+            <if test="resultName != null and resultName != ''">result_name = #{resultName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="org != null and org != ''">org = #{org},</if>
+            <if test="awardTime != null">award_time = #{awardTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="pictureName != null and pictureName != ''">picture_name = #{pictureName},</if>
+            <if test="pictureUrl != null and pictureUrl != ''">picture_url = #{pictureUrl},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXacademicWorksById" parameterType="Long">
+        update school_xacademic_works set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXacademicWorksByIds" parameterType="String">
+        update school_xacademic_works set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsMapper.xml

+<?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="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsMapper">
+
+    <resultMap type="SchoolXcomprehensiveHonors" id="SchoolXcomprehensiveHonorsResult">
+        <result property="id"    column="id"    />
+        <result property="sub"    column="sub"    />
+        <result property="awardType"    column="award_type"    />
+        <result property="awardRank"    column="award_rank"    />
+        <result property="awardLevel"    column="award_level"    />
+        <result property="resultName"    column="result_name"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="org"    column="org"    />
+        <result property="awardTime"    column="award_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="pictureName"    column="picture_name"    />
+        <result property="pictureUrl"    column="picture_url"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSchoolXcomprehensiveHonorsVo">
+        select id, sub, award_type, award_rank, award_level, result_name, user_id, user_name, org, award_time, remark, picture_name, picture_url, create_by, create_time, update_by, update_time, del_flag from school_xcomprehensive_honors
+    </sql>
+
+    <select id="selectSchoolXcomprehensiveHonorsList" parameterType="SchoolXcomprehensiveHonors" resultMap="SchoolXcomprehensiveHonorsResult">
+        <include refid="selectSchoolXcomprehensiveHonorsVo"/>
+        <where>
+            del_flag = '0'
+            <if test="sub != null  and sub != ''"> and sub = #{sub}</if>
+            <if test="awardType != null  and awardType != ''"> and award_type = #{awardType}</if>
+            <if test="awardRank != null  and awardRank != ''"> and award_rank = #{awardRank}</if>
+            <if test="awardLevel != null  and awardLevel != ''"> and award_level = #{awardLevel}</if>
+            <if test="resultName != null  and resultName != ''"> and result_name like concat('%', #{resultName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="org != null  and org != ''"> and org = #{org}</if>
+            <if test="awardTime != null "> and award_time = #{awardTime}</if>
+            <if test="pictureName != null  and pictureName != ''"> and picture_name like concat('%', #{pictureName}, '%')</if>
+            <if test="pictureUrl != null  and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectSchoolXcomprehensiveHonorsById" parameterType="Long" resultMap="SchoolXcomprehensiveHonorsResult">
+        <include refid="selectSchoolXcomprehensiveHonorsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolXcomprehensiveHonors" parameterType="SchoolXcomprehensiveHonors" useGeneratedKeys="true" keyProperty="id">
+        insert into school_xcomprehensive_honors
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sub != null and sub != ''">sub,</if>
+            <if test="awardType != null and awardType != ''">award_type,</if>
+            <if test="awardRank != null and awardRank != ''">award_rank,</if>
+            <if test="awardLevel != null and awardLevel != ''">award_level,</if>
+            <if test="resultName != null and resultName != ''">result_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="org != null and org != ''">org,</if>
+            <if test="awardTime != null">award_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="pictureName != null and pictureName != ''">picture_name,</if>
+            <if test="pictureUrl != null and pictureUrl != ''">picture_url,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sub != null and sub != ''">#{sub},</if>
+            <if test="awardType != null and awardType != ''">#{awardType},</if>
+            <if test="awardRank != null and awardRank != ''">#{awardRank},</if>
+            <if test="awardLevel != null and awardLevel != ''">#{awardLevel},</if>
+            <if test="resultName != null and resultName != ''">#{resultName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="org != null and org != ''">#{org},</if>
+            <if test="awardTime != null">#{awardTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="pictureName != null and pictureName != ''">#{pictureName},</if>
+            <if test="pictureUrl != null and pictureUrl != ''">#{pictureUrl},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolXcomprehensiveHonors" parameterType="SchoolXcomprehensiveHonors">
+        update school_xcomprehensive_honors
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sub != null and sub != ''">sub = #{sub},</if>
+            <if test="awardType != null and awardType != ''">award_type = #{awardType},</if>
+            <if test="awardRank != null and awardRank != ''">award_rank = #{awardRank},</if>
+            <if test="awardLevel != null and awardLevel != ''">award_level = #{awardLevel},</if>
+            <if test="resultName != null and resultName != ''">result_name = #{resultName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="org != null and org != ''">org = #{org},</if>
+            <if test="awardTime != null">award_time = #{awardTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="pictureName != null and pictureName != ''">picture_name = #{pictureName},</if>
+            <if test="pictureUrl != null and pictureUrl != ''">picture_url = #{pictureUrl},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXcomprehensiveHonorsById" parameterType="Long">
+        update school_xcomprehensive_honors set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXcomprehensiveHonorsByIds" parameterType="String">
+        update school_xcomprehensive_honors set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXlectureAwardsMapper.xml

+<?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="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXlectureAwardsMapper">
+
+    <resultMap type="SchoolXlectureAwards" id="SchoolXlectureAwardsResult">
+        <result property="id"    column="id"    />
+        <result property="sub"    column="sub"    />
+        <result property="awardType"    column="award_type"    />
+        <result property="awardRank"    column="award_rank"    />
+        <result property="awardLevel"    column="award_level"    />
+        <result property="resultName"    column="result_name"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="org"    column="org"    />
+        <result property="awardTime"    column="award_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="pictureName"    column="picture_name"    />
+        <result property="pictureUrl"    column="picture_url"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="upate_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSchoolXlectureAwardsVo">
+        select id, sub, award_type, award_rank, award_level, result_name, user_id, user_name, org, award_time, remark, picture_name, picture_url, create_by, create_time, update_by, update_time, del_flag from school_xlecture_awards
+    </sql>
+
+    <select id="selectSchoolXlectureAwardsList" parameterType="SchoolXlectureAwards" resultMap="SchoolXlectureAwardsResult">
+        <include refid="selectSchoolXlectureAwardsVo"/>
+        <where>
+            del_flag = '0'
+            <if test="sub != null  and sub != ''"> and sub = #{sub}</if>
+            <if test="awardType != null  and awardType != ''"> and award_type = #{awardType}</if>
+            <if test="awardRank != null  and awardRank != ''"> and award_rank = #{awardRank}</if>
+            <if test="awardLevel != null  and awardLevel != ''"> and award_level = #{awardLevel}</if>
+            <if test="resultName != null  and resultName != ''"> and result_name like concat('%', #{resultName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="org != null  and org != ''"> and org = #{org}</if>
+            <if test="awardTime != null "> and award_time = #{awardTime}</if>
+            <if test="pictureName != null  and pictureName != ''"> and picture_name like concat('%', #{pictureName}, '%')</if>
+            <if test="pictureUrl != null  and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectSchoolXlectureAwardsById" parameterType="Long" resultMap="SchoolXlectureAwardsResult">
+        <include refid="selectSchoolXlectureAwardsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolXlectureAwards" parameterType="SchoolXlectureAwards" useGeneratedKeys="true" keyProperty="id">
+        insert into school_xlecture_awards
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sub != null and sub != ''">sub,</if>
+            <if test="awardType != null and awardType != ''">award_type,</if>
+            <if test="awardRank != null and awardRank != ''">award_rank,</if>
+            <if test="awardLevel != null and awardLevel != ''">award_level,</if>
+            <if test="resultName != null and resultName != ''">result_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="org != null and org != ''">org,</if>
+            <if test="awardTime != null">award_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="pictureName != null and pictureName != ''">picture_name,</if>
+            <if test="pictureUrl != null and pictureUrl != ''">picture_url,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sub != null and sub != ''">#{sub},</if>
+            <if test="awardType != null and awardType != ''">#{awardType},</if>
+            <if test="awardRank != null and awardRank != ''">#{awardRank},</if>
+            <if test="awardLevel != null and awardLevel != ''">#{awardLevel},</if>
+            <if test="resultName != null and resultName != ''">#{resultName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="org != null and org != ''">#{org},</if>
+            <if test="awardTime != null">#{awardTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="pictureName != null and pictureName != ''">#{pictureName},</if>
+            <if test="pictureUrl != null and pictureUrl != ''">#{pictureUrl},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolXlectureAwards" parameterType="SchoolXlectureAwards">
+        update school_xlecture_awards
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sub != null and sub != ''">sub = #{sub},</if>
+            <if test="awardType != null and awardType != ''">award_type = #{awardType},</if>
+            <if test="awardRank != null and awardRank != ''">award_rank = #{awardRank},</if>
+            <if test="awardLevel != null and awardLevel != ''">award_level = #{awardLevel},</if>
+            <if test="resultName != null and resultName != ''">result_name = #{resultName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="org != null and org != ''">org = #{org},</if>
+            <if test="awardTime != null">award_time = #{awardTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="pictureName != null and pictureName != ''">picture_name = #{pictureName},</if>
+            <if test="pictureUrl != null and pictureUrl != ''">picture_url = #{pictureUrl},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXlectureAwardsById" parameterType="Long">
+        update school_xlecture_awards set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXlectureAwardsByIds" parameterType="String">
+        update school_xlecture_awards set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteacherAwardsMapper.xml

+<?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="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteacherAwardsMapper">
+
+    <resultMap type="SchoolXteacherAwards" id="SchoolXteacherAwardsResult">
+        <result property="id"    column="id"    />
+        <result property="sub"    column="sub"    />
+        <result property="awardType"    column="award_type"    />
+        <result property="awardRank"    column="award_rank"    />
+        <result property="awardLevel"    column="award_level"    />
+        <result property="resultName"    column="result_name"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="org"    column="org"    />
+        <result property="awardTime"    column="award_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="pictureName"    column="picture_name"    />
+        <result property="pictureUrl"    column="picture_url"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSchoolXteacherAwardsVo">
+        select id, sub, award_type, award_rank, award_level, result_name, user_id, user_name, org, award_time, remark, picture_name, picture_url, create_by, create_time, update_by, update_time, del_flag from school_xteacher_awards
+    </sql>
+
+    <select id="selectSchoolXteacherAwardsList" parameterType="SchoolXteacherAwards" resultMap="SchoolXteacherAwardsResult">
+        <include refid="selectSchoolXteacherAwardsVo"/>
+        <where>
+            del_flag = '0'
+            <if test="sub != null  and sub != ''"> and sub = #{sub}</if>
+            <if test="awardType != null  and awardType != ''"> and award_type = #{awardType}</if>
+            <if test="awardRank != null  and awardRank != ''"> and award_rank = #{awardRank}</if>
+            <if test="awardLevel != null  and awardLevel != ''"> and award_level = #{awardLevel}</if>
+            <if test="resultName != null  and resultName != ''"> and result_name like concat('%', #{resultName}, '%')</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="org != null  and org != ''"> and org = #{org}</if>
+            <if test="awardTime != null "> and award_time = #{awardTime}</if>
+            <if test="pictureName != null  and pictureName != ''"> and picture_name like concat('%', #{pictureName}, '%')</if>
+            <if test="pictureUrl != null  and pictureUrl != ''"> and picture_url = #{pictureUrl}</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectSchoolXteacherAwardsById" parameterType="Long" resultMap="SchoolXteacherAwardsResult">
+        <include refid="selectSchoolXteacherAwardsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolXteacherAwards" parameterType="SchoolXteacherAwards" useGeneratedKeys="true" keyProperty="id">
+        insert into school_xteacher_awards
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sub != null and sub != ''">sub,</if>
+            <if test="awardType != null and awardType != ''">award_type,</if>
+            <if test="awardRank != null and awardRank != ''">award_rank,</if>
+            <if test="awardLevel != null and awardLevel != ''">award_level,</if>
+            <if test="resultName != null and resultName != ''">result_name,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="org != null and org != ''">org,</if>
+            <if test="awardTime != null">award_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="pictureName != null and pictureName != ''">picture_name,</if>
+            <if test="pictureUrl != null and pictureUrl != ''">picture_url,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sub != null and sub != ''">#{sub},</if>
+            <if test="awardType != null and awardType != ''">#{awardType},</if>
+            <if test="awardRank != null and awardRank != ''">#{awardRank},</if>
+            <if test="awardLevel != null and awardLevel != ''">#{awardLevel},</if>
+            <if test="resultName != null and resultName != ''">#{resultName},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="org != null and org != ''">#{org},</if>
+            <if test="awardTime != null">#{awardTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="pictureName != null and pictureName != ''">#{pictureName},</if>
+            <if test="pictureUrl != null and pictureUrl != ''">#{pictureUrl},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolXteacherAwards" parameterType="SchoolXteacherAwards">
+        update school_xteacher_awards
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sub != null and sub != ''">sub = #{sub},</if>
+            <if test="awardType != null and awardType != ''">award_type = #{awardType},</if>
+            <if test="awardRank != null and awardRank != ''">award_rank = #{awardRank},</if>
+            <if test="awardLevel != null and awardLevel != ''">award_level = #{awardLevel},</if>
+            <if test="resultName != null and resultName != ''">result_name = #{resultName},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="org != null and org != ''">org = #{org},</if>
+            <if test="awardTime != null">award_time = #{awardTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="pictureName != null and pictureName != ''">picture_name = #{pictureName},</if>
+            <if test="pictureUrl != null and pictureUrl != ''">picture_url = #{pictureUrl},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXteacherAwardsById" parameterType="Long">
+        update school_xteacher_awards set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXteacherAwardsByIds" parameterType="String">
+        update school_xteacher_awards set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml

+<?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="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteachingAchievementsMapper">
+
+    <resultMap type="SchoolXteachingAchievements" id="SchoolXteachingAchievementsResult">
+        <result property="id"    column="id"    />
+        <result property="schoolYear"    column="school_year"    />
+        <result property="semester"    column="semester"    />
+        <result property="examTime"    column="exam_time"    />
+        <result property="examType"    column="exam_type"    />
+        <result property="year"    column="year"    />
+        <result property="grade"    column="grade"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="sub"    column="sub"    />
+        <result property="className"    column="class_name"    />
+        <result property="classType"    column="class_type"    />
+        <result property="assessmentScore"    column="assessment_score"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSchoolXteachingAchievementsVo">
+        select id, school_year, semester, exam_time, exam_type, year, grade, user_id, user_name, id_card, sub, class_name, class_type, assessment_score, remark, create_by, create_time, update_by, update_time, del_flag from school_xteaching_achievements
+    </sql>
+
+    <select id="selectSchoolXteachingAchievementsList" parameterType="SchoolXteachingAchievements" resultMap="SchoolXteachingAchievementsResult">
+        <include refid="selectSchoolXteachingAchievementsVo"/>
+        <where>
+            del_flag = '0'
+            <if test="schoolYear != null  and schoolYear != ''"> and school_year = #{schoolYear}</if>
+            <if test="semester != null  and semester != ''"> and semester = #{semester}</if>
+            <if test="examTime != null "> and exam_time = #{examTime}</if>
+            <if test="examType != null  and examType != ''"> and exam_type = #{examType}</if>
+            <if test="year != null  and year != ''"> and year = #{year}</if>
+            <if test="grade != null  and grade != ''"> and grade = #{grade}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
+            <if test="sub != null  and sub != ''"> and sub = #{sub}</if>
+            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
+            <if test="classType != null  and classType != ''"> and class_type = #{classType}</if>
+            <if test="assessmentScore != null "> and assessment_score = #{assessmentScore}</if>
+        </where>
+        order by create_time DESC
+    </select>
+
+    <select id="selectSchoolXteachingAchievementsById" parameterType="Long" resultMap="SchoolXteachingAchievementsResult">
+        <include refid="selectSchoolXteachingAchievementsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSchoolXteachingAchievements" parameterType="SchoolXteachingAchievements" useGeneratedKeys="true" keyProperty="id">
+        insert into school_xteaching_achievements
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="schoolYear != null and schoolYear != ''">school_year,</if>
+            <if test="semester != null and semester != ''">semester,</if>
+            <if test="examTime != null">exam_time,</if>
+            <if test="examType != null and examType != ''">exam_type,</if>
+            <if test="year != null and year != ''">year,</if>
+            <if test="grade != null and grade != ''">grade,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="idCard != null and idCard != ''">id_card,</if>
+            <if test="sub != null and sub != ''">sub,</if>
+            <if test="className != null and className != ''">class_name,</if>
+            <if test="classType != null and classType != ''">class_type,</if>
+            <if test="assessmentScore != null">assessment_score,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="schoolYear != null and schoolYear != ''">#{schoolYear},</if>
+            <if test="semester != null and semester != ''">#{semester},</if>
+            <if test="examTime != null">#{examTime},</if>
+            <if test="examType != null and examType != ''">#{examType},</if>
+            <if test="year != null and year != ''">#{year},</if>
+            <if test="grade != null and grade != ''">#{grade},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="idCard != null and idCard != ''">#{idCard},</if>
+            <if test="sub != null and sub != ''">#{sub},</if>
+            <if test="className != null and className != ''">#{className},</if>
+            <if test="classType != null and classType != ''">#{classType},</if>
+            <if test="assessmentScore != null">#{assessmentScore},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSchoolXteachingAchievements" parameterType="SchoolXteachingAchievements">
+        update school_xteaching_achievements
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="schoolYear != null and schoolYear != ''">school_year = #{schoolYear},</if>
+            <if test="semester != null and semester != ''">semester = #{semester},</if>
+            <if test="examTime != null">exam_time = #{examTime},</if>
+            <if test="examType != null and examType != ''">exam_type = #{examType},</if>
+            <if test="year != null and year != ''">year = #{year},</if>
+            <if test="grade != null and grade != ''">grade = #{grade},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null and userName != ''">user_name = #{userName},</if>
+            <if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
+            <if test="sub != null and sub != ''">sub = #{sub},</if>
+            <if test="className != null and className != ''">class_name = #{className},</if>
+            <if test="classType != null and classType != ''">class_type = #{classType},</if>
+            <if test="assessmentScore != null">assessment_score = #{assessmentScore},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXteachingAchievementsById" parameterType="Long">
+        update school_xteaching_achievements set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="deleteSchoolXteachingAchievementsByIds" parameterType="String">
+        update school_xteaching_achievements set del_flag = '1' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>