Skip to content

D
dd_school
Commit a7bfa0b9 by xuwenhao
Options

12.15修改教师电子档案

parent 0dc47068
Showing with 1299 additions and 136 deletions
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
......@@ -5,22 +5,30 @@ import com.ruoyi.common.core.domain.entity.SysDictData;
/**
* 字典 业务层
*
*
* @author ruoyi
*/
public interface ISysDictDataService
{
/**
* 根据条件分页查询字典数据
*
*
* @param dictData 字典数据信息
* @return 字典数据集合信息
*/
public List<SysDictData> selectDictDataList(SysDictData dictData);
/**
* 根据字典类型查询字典数据
*
* @param dictType 字典类型
* @return 字典数据集合信息
*/
public List<SysDictData> selectDictDataByType(String dictType);
/**
* 根据字典类型和字典键值查询字典数据信息
*
*
* @param dictType 字典类型
* @param dictValue 字典键值
* @return 字典标签
......@@ -29,7 +37,7 @@ public interface ISysDictDataService
/**
* 根据字典数据ID查询信息
*
*
* @param dictCode 字典数据ID
* @return 字典数据
*/
......@@ -37,14 +45,14 @@ public interface ISysDictDataService
/**
* 批量删除字典数据信息
*
*
* @param dictCodes 需要删除的字典数据ID
*/
public void deleteDictDataByIds(Long[] dictCodes);
/**
* 新增保存字典数据信息
*
*
* @param dictData 字典数据信息
* @return 结果
*/
......@@ -52,7 +60,7 @@ public interface ISysDictDataService
/**
* 修改保存字典数据信息
*
*
* @param dictData 字典数据信息
* @return 结果
*/
......
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
......@@ -10,7 +10,7 @@ import com.ruoyi.system.service.ISysDictDataService;
/**
* 字典 业务层处理
*
*
* @author ruoyi
*/
@Service
......@@ -21,7 +21,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
/**
* 根据条件分页查询字典数据
*
*
* @param dictData 字典数据信息
* @return 字典数据集合信息
*/
......@@ -31,9 +31,14 @@ public class SysDictDataServiceImpl implements ISysDictDataService
return dictDataMapper.selectDictDataList(dictData);
}
@Override
public List<SysDictData> selectDictDataByType(String dictType) {
return dictDataMapper.selectDictDataByType(dictType);
}
/**
* 根据字典类型和字典键值查询字典数据信息
*
*
* @param dictType 字典类型
* @param dictValue 字典键值
* @return 字典标签
......@@ -46,7 +51,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
/**
* 根据字典数据ID查询信息
*
*
* @param dictCode 字典数据ID
* @return 字典数据
*/
......@@ -58,7 +63,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
/**
* 批量删除字典数据信息
*
*
* @param dictCodes 需要删除的字典数据ID
*/
@Override
......@@ -75,7 +80,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
/**
* 新增保存字典数据信息
*
*
* @param data 字典数据信息
* @return 结果
*/
......@@ -93,7 +98,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
/**
* 修改保存字典数据信息
*
*
* @param data 字典数据信息
* @return 结果
*/
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/fudao/FudaoStudentController.java
......@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.fudao;
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.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -10,6 +11,7 @@ import yangtz.cs.liu.campus.domain.fudao.FudaoStudent;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.domain.schoolRewardsPunishments.SchoolScDiscipline;
import yangtz.cs.liu.campus.service.fudao.FudaoStudentService;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
......@@ -25,18 +27,42 @@ public class FudaoStudentController extends BaseController {
//查询辅导学生获奖列表
@GetMapping("/studentlist")
public TableDataInfo list(FudaoStudent fudaoStudent){
public TableDataInfo list(FudaoStudentVo fudaoStudentVo){
fudaoStudentVo.setAuditstate("0");
startPage();
List<FudaoStudent> list = fudaoStudentService.querylist(fudaoStudent);
List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo);
list.forEach(list1 -> {
list1.setGrowthType("学生获奖");
});
return getDataTable(list);
}
//查询辅导学生获奖列表(个人)
@GetMapping("/studentlistGr")
public TableDataInfo listGr(FudaoStudentVo fudaoStudentVo){
fudaoStudentVo.setUserid(SecurityUtils.getUserId());
startPage();
List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo);
list.forEach(list1 -> {
list1.setGrowthType("学生获奖");
});
return getDataTable(list);
}
/**
* 查看详情
* @param id
* @return
*/
@GetMapping("/{id}")
public AjaxResult getInfo(@PathVariable Long id){
return AjaxResult.success(fudaoStudentService.selectTutorStudentById(id));
}
//新增辅导学生获奖（管理）
@PostMapping("/addgl")
public AjaxResult addgl(@RequestBody FudaoStudent fudaoStudent){
fudaoStudent.setAuditstate("1");
fudaoStudent.setAuditstate("2");
return toAjax(fudaoStudentService.insert(fudaoStudent));
}
......@@ -49,7 +75,7 @@ public class FudaoStudentController extends BaseController {
//删除
@DeleteMapping("/delete/{ids}")
public AjaxResult remove(@PathVariable Long[] ids){
return toAjax(fudaoStudentService.deleteids(ids));
return toAjax(fudaoStudentService.delete(ids));
}
//修改
......@@ -60,10 +86,32 @@ public class FudaoStudentController extends BaseController {
//导出
@PostMapping("/export/{ids}")
public void export(HttpServletResponse response, @PathVariable("ids") List<Integer> ids) {
List<FudaoStudent> list = fudaoStudentService.listByIds(ids);
ExcelUtil<FudaoStudent> util = new ExcelUtil<>(FudaoStudent.class);
@PostMapping("/export")
public void export(HttpServletResponse response, FudaoStudentVo fudaoStudentVo) {
int i = 0;
fudaoStudentVo.setAuditstate("0");
List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo);
for (FudaoStudentVo studentVo : list) {
i++;
studentVo.setXh(i);
studentVo.setGrowthType("学生获奖");
}
ExcelUtil<FudaoStudentVo> util = new ExcelUtil<FudaoStudentVo>(FudaoStudentVo.class);
util.exportExcel(response, list, "辅导学生获奖");
}
//导出(个人)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, FudaoStudentVo fudaoStudentVo) {
int i = 0;
fudaoStudentVo.setUserid(SecurityUtils.getUserId());
List<FudaoStudentVo> list = fudaoStudentService.querylist(fudaoStudentVo);
for (FudaoStudentVo studentVo : list) {
i++;
studentVo.setXh(i);
studentVo.setGrowthType("学生获奖");
}
ExcelUtil<FudaoStudentVo> util = new ExcelUtil<FudaoStudentVo>(FudaoStudentVo.class);
util.exportExcel(response, list, "辅导学生获奖");
}
......@@ -72,7 +120,7 @@ public class FudaoStudentController extends BaseController {
@PutMapping("/submit")
public AjaxResult submit(@RequestBody FudaoStudent fudaoStudent)
{
return toAjax(fudaoStudentService.updateById(fudaoStudent));
return toAjax(fudaoStudentService.submit(fudaoStudent));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/fudao/FudaoTeacherController.java
......@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.fudao;
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.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -10,6 +11,7 @@ import yangtz.cs.liu.campus.domain.fudao.FudaoStudent;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.domain.student.SchoolEducation;
import yangtz.cs.liu.campus.service.fudao.FudaoTeacherService;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
......@@ -24,17 +26,43 @@ public class FudaoTeacherController extends BaseController {
//查询辅导教师获奖列表
@GetMapping("/teacher")
public TableDataInfo list(FudaoTeacher fudaoTeacher){
public TableDataInfo list(FudaoTeacherVo fudaoTeacherVo){
fudaoTeacherVo.setAuditstate("0");
startPage();
List<FudaoTeacher> list = fudaoTeacherService.querylist(fudaoTeacher);
List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo);
list.forEach(list1 -> {
list1.setGrowthType("教师获奖");
});
return getDataTable(list);
}
//查询辅导教师获奖列表(个人)
@GetMapping("/teacherGr")
public TableDataInfo listGr(FudaoTeacherVo fudaoTeacherVo){
fudaoTeacherVo.setUserid(SecurityUtils.getUserId());
startPage();
List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo);
list.forEach(list1 -> {
list1.setGrowthType("教师获奖");
});
return getDataTable(list);
}
/**
* 查询详情
* @param id
* @return
*/
@GetMapping("/{id}")
public AjaxResult selectT(@PathVariable Long id){
return AjaxResult.success(fudaoTeacherService.selectTutorAwardById(id));
}
//新增辅导教师获奖（管理员）
@PostMapping("/addgl")
public AjaxResult addgl(@RequestBody FudaoTeacher fudaoTeacher){
fudaoTeacher.setAuditstate("1");
fudaoTeacher.setAuditstate("2");
return toAjax(fudaoTeacherService.insert(fudaoTeacher));
}
......@@ -47,7 +75,7 @@ public class FudaoTeacherController extends BaseController {
//删除
@DeleteMapping("/delete/{ids}")
public AjaxResult remove(@PathVariable Long[] ids){
return toAjax(fudaoTeacherService.deleteids(ids));
return toAjax(fudaoTeacherService.delete(ids));
}
//修改
......@@ -57,10 +85,32 @@ public class FudaoTeacherController extends BaseController {
}
//导出
@PostMapping("/export/{ids}")
public void export(HttpServletResponse response, @PathVariable("ids") List<Integer> ids) {
List<FudaoTeacher> list = fudaoTeacherService.listByIds(ids);
ExcelUtil<FudaoTeacher> util = new ExcelUtil<>(FudaoTeacher.class);
@PostMapping("/export")
public void export(HttpServletResponse response, FudaoTeacherVo fudaoTeacherVo) {
int i = 0;
fudaoTeacherVo.setAuditstate("0");
List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo);
for (FudaoTeacherVo teacherVo : list) {
i ++;
teacherVo.setXh(i);
teacherVo.setGrowthType("辅导教师获奖");
}
ExcelUtil<FudaoTeacherVo> util = new ExcelUtil<FudaoTeacherVo>(FudaoTeacherVo.class);
util.exportExcel(response, list, "辅导教师获奖");
}
//导出(个人)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, FudaoTeacherVo fudaoTeacherVo) {
int i = 0;
fudaoTeacherVo.setUserid(SecurityUtils.getUserId());
List<FudaoTeacherVo> list = fudaoTeacherService.querylist(fudaoTeacherVo);
for (FudaoTeacherVo teacherVo : list) {
i ++;
teacherVo.setXh(i);
teacherVo.setGrowthType("辅导教师获奖");
}
ExcelUtil<FudaoTeacherVo> util = new ExcelUtil<FudaoTeacherVo>(FudaoTeacherVo.class);
util.exportExcel(response, list, "辅导教师获奖");
}
......@@ -68,6 +118,6 @@ public class FudaoTeacherController extends BaseController {
@PutMapping("/submit")
public AjaxResult submit(@RequestBody FudaoTeacher fudaoTeacher)
{
return toAjax(fudaoTeacherService.updateById(fudaoTeacher));
return toAjax(fudaoTeacherService.submit(fudaoTeacher));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAnnualAssessment/SchoolAnnualAssessmentController.java
......@@ -6,14 +6,18 @@ 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.poi.ExcelUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
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.service.schoolAnnualAssessment.ISchoolAnnualAssessmentService;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -32,6 +36,7 @@ public class SchoolAnnualAssessmentController extends BaseController {
/**
* 查询年度考核列表
*/
// @PreAuthorize("@ss.hasPermi('school:annualAssessment:list')")
@GetMapping("/list")
public TableDataInfo list(SchoolAnnualAssessment schoolAnnualAssessment)
{
......@@ -43,13 +48,24 @@ public class SchoolAnnualAssessmentController extends BaseController {
/**
* 导出年度考核列表
*/
// @PreAuthorize("@ss.hasPermi('school:annualAssessment:export')")
@Log(title = "年度考核", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolAnnualAssessment schoolAnnualAssessment)
{
int i = 0;
List<SchoolAnnualAssessment> list = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(schoolAnnualAssessment);
ExcelUtil<SchoolAnnualAssessment> util = new ExcelUtil<SchoolAnnualAssessment>(SchoolAnnualAssessment.class);
util.exportExcel(response, list, "年度考核数据");
List<SchoolAnnualAssessmentExport> exportList = new ArrayList<>();
for (SchoolAnnualAssessment annualAssessment : list) {
//转导出实体
i ++;
SchoolAnnualAssessmentExport schoolAnnualAssessmentExport = new SchoolAnnualAssessmentExport();
BeanUtils.copyProperties(annualAssessment,schoolAnnualAssessmentExport);
schoolAnnualAssessmentExport.setXh(i);
exportList.add(schoolAnnualAssessmentExport);
}
ExcelUtil<SchoolAnnualAssessmentExport> util = new ExcelUtil<SchoolAnnualAssessmentExport>(SchoolAnnualAssessmentExport.class);
util.exportExcel(response, exportList, "年度考核数据");
// List<SchoolAnnualAssessment> schoolAnnualAssessments = schoolAnnualAssessmentService.selectSchoolAnnualAssessmentList(new SchoolAnnualAssessment());
// List<SchoolAnnualAssessment> list = new ArrayList<>();
// List<SchoolAnnualAssessmentExport> exportList = new ArrayList<>();
......@@ -100,6 +116,13 @@ public class SchoolAnnualAssessmentController extends BaseController {
schoolAnnualAssessmentService.importTemplate(response);
}
/**
* 导入年度考核数据
* @param file
* @return
* @throws Exception
*/
// @PreAuthorize("@ss.hasPermi('school:annualAssessment:importData')")
@PostMapping("/importData")
@Transactional(rollbackFor = Exception.class)
public AjaxResult importData(MultipartFile file) throws Exception {
......@@ -124,6 +147,7 @@ public class SchoolAnnualAssessmentController extends BaseController {
/**
* 新增年度考核
*/
// @PreAuthorize("@ss.hasPermi('school:annualAssessment:add')")
@Log(title = "年度考核", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolAnnualAssessment schoolAnnualAssessment)
......@@ -134,6 +158,7 @@ public class SchoolAnnualAssessmentController extends BaseController {
/**
* 修改年度考核
*/
// @PreAuthorize("@ss.hasPermi('school:annualAssessment:edit')")
@Log(title = "年度考核", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolAnnualAssessment schoolAnnualAssessment)
......@@ -144,6 +169,7 @@ public class SchoolAnnualAssessmentController extends BaseController {
/**
* 删除年度考核
*/
// @PreAuthorize("@ss.hasPermi('school:annualAssessment:remove')")
@Log(title = "年度考核", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java
......@@ -44,6 +44,8 @@ public class SchoolXacademicWorksController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SchoolXacademicWorksVo schoolXacademicWorksVo)
{
//查询审核中的数据
schoolXacademicWorksVo.setAuditState("0");
startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list);
......@@ -68,7 +70,7 @@ public class SchoolXacademicWorksController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:works:exportGr')")
@Log(title = "论文著作", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, @RequestBody SchoolXacademicWorksVo schoolXacademicWorksVo)
public void exportGr(HttpServletResponse response, SchoolXacademicWorksVo schoolXacademicWorksVo)
{
int i = 0;
schoolXacademicWorksVo.setUserId(SecurityUtils.getUserId());
......@@ -88,9 +90,11 @@ public class SchoolXacademicWorksController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:works:export')")
@Log(title = "论文著作", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestBody SchoolXacademicWorksVo schoolXacademicWorksVo)
public void export(HttpServletResponse response, SchoolXacademicWorksVo schoolXacademicWorksVo)
{
int i = 0;
//查询审核中的数据
schoolXacademicWorksVo.setAuditState("0");
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java
......@@ -44,6 +44,8 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
//查询审核中的数据
schoolXcomprehensiveHonorsVo.setAuditState("0");
startPage();
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list);
......@@ -68,7 +70,7 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:honors:exportGr')")
@Log(title = "综合荣誉", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, @RequestBody SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
public void exportGr(HttpServletResponse response, SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
int i = 0;
schoolXcomprehensiveHonorsVo.setUserId(SecurityUtils.getUserId());
......@@ -88,9 +90,11 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:honors:export')")
@Log(title = "综合荣誉", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestBody SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
public void export(HttpServletResponse response, SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
int i = 0;
//查询审核中的数据
schoolXcomprehensiveHonorsVo.setAuditState("0");
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java
......@@ -44,6 +44,8 @@ public class SchoolXlectureAwardsController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
//查询审核中的数据
schoolXlectureAwardsVo.setAuditState("0");
startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list);
......@@ -68,7 +70,7 @@ public class SchoolXlectureAwardsController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:awards:exportGr')")
@Log(title = "讲课获奖", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, @RequestBody SchoolXlectureAwardsVo schoolXlectureAwardsVo)
public void exportGr(HttpServletResponse response, SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
int i = 0;
schoolXlectureAwardsVo.setUserId(SecurityUtils.getUserId());
......@@ -88,9 +90,11 @@ public class SchoolXlectureAwardsController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:awards:export')")
@Log(title = "讲课获奖", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestBody SchoolXlectureAwardsVo schoolXlectureAwardsVo)
public void export(HttpServletResponse response, SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
int i = 0;
//查询审核中的数据
schoolXlectureAwardsVo.setAuditState("0");
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXprojectResearchController.java 0 → 100644
package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
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.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXprojectResearch;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXprojectResearchService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 课题研究Controller
*
* @author ruoyi
* @date 2023-12-13
*/
@RestController
@RequestMapping("/system/research")
public class SchoolXprojectResearchController extends BaseController {
@Autowired
private ISchoolXprojectResearchService schoolXprojectResearchService;
/**
* 查询课题研究列表
*/
// @PreAuthorize("@ss.hasPermi('system:research:list')")
@GetMapping("/list")
public TableDataInfo list(SchoolXprojectResearchVo schoolXprojectResearchVo)
{
//过滤未提交的数据
schoolXprojectResearchVo.setAuditState("0");
startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list);
}
/**
* 查询课题研究列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:research:listGr')")
@GetMapping("/listGr")
public TableDataInfo listGr(SchoolXprojectResearchVo schoolXprojectResearchVo)
{
schoolXprojectResearchVo.setUserId(SecurityUtils.getUserId());
startPage();
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
return getDataTable(list);
}
/**
* 导出课题研究列表
*/
// @PreAuthorize("@ss.hasPermi('system:research:exportGr')")
@Log(title = "课题研究", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, SchoolXprojectResearchVo schoolXprojectResearchVo)
{
int i = 0;
schoolXprojectResearchVo.setUserId(SecurityUtils.getUserId());
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo xprojectResearchVo : list) {
i ++;
xprojectResearchVo.setXh(i);
xprojectResearchVo.setGrowthType("课题研究");
}
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据");
}
/**
* 导出课题研究列表
*/
// @PreAuthorize("@ss.hasPermi('system:research:export')")
@Log(title = "课题研究", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolXprojectResearchVo schoolXprojectResearchVo)
{
int i = 0;
//过滤未提交的数据
schoolXprojectResearchVo.setAuditState("0");
List<SchoolXprojectResearchVo> list = schoolXprojectResearchService.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
for (SchoolXprojectResearchVo xprojectResearchVo : list) {
i ++;
xprojectResearchVo.setXh(i);
xprojectResearchVo.setGrowthType("课题研究");
}
ExcelUtil<SchoolXprojectResearchVo> util = new ExcelUtil<SchoolXprojectResearchVo>(SchoolXprojectResearchVo.class);
util.exportExcel(response, list, "课题研究数据");
}
/**
* 获取课题研究详细信息
*/
// @PreAuthorize("@ss.hasPermi('system:research:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(schoolXprojectResearchService.selectSchoolXprojectResearchById(id));
}
/**
* 新增课题研究
*/
// @PreAuthorize("@ss.hasPermi('system:research:add')")
@Log(title = "课题研究", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolXprojectResearch schoolXprojectResearch)
{
return toAjax(schoolXprojectResearchService.insertSchoolXprojectResearch(schoolXprojectResearch));
}
/**
* 修改课题研究
*/
// @PreAuthorize("@ss.hasPermi('system:research:edit')")
@Log(title = "课题研究", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolXprojectResearch schoolXprojectResearch)
{
return toAjax(schoolXprojectResearchService.updateSchoolXprojectResearch(schoolXprojectResearch));
}
/**
* 删除课题研究
*/
// @PreAuthorize("@ss.hasPermi('system:research:remove')")
@Log(title = "课题研究", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolXprojectResearchService.deleteSchoolXprojectResearchByIds(ids));
}
/**
* 审核
*/
// @PreAuthorize("@ss.hasPermi('system:research:audit')")
@PostMapping("/audit")
public AjaxResult audit(@RequestBody SchoolXprojectResearch schoolXprojectResearch){
return toAjax(schoolXprojectResearchService.audit(schoolXprojectResearch));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java
......@@ -44,6 +44,8 @@ public class SchoolXteacherAwardsController extends BaseController
@GetMapping("/list")
public TableDataInfo list(SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
//查询审核中的数据
schoolXteacherAwardsVo.setAuditState("0");
startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list);
......@@ -68,7 +70,7 @@ public class SchoolXteacherAwardsController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:awards:exportGr')")
@Log(title = "教师获奖", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response,@RequestBody SchoolXteacherAwardsVo schoolXteacherAwardsVo)
public void exportGr(HttpServletResponse response, SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
int i = 0;
schoolXteacherAwardsVo.setUserId(SecurityUtils.getUserId());
......@@ -88,9 +90,11 @@ public class SchoolXteacherAwardsController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:awards:export')")
@Log(title = "教师获奖", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response,@RequestBody SchoolXteacherAwardsVo schoolXteacherAwardsVo)
public void export(HttpServletResponse response, SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
int i = 0;
//查询审核中的数据
schoolXteacherAwardsVo.setAuditState("0");
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java
......@@ -4,7 +4,9 @@ import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.service.ISysDictDataService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
......@@ -40,6 +42,8 @@ public class SchoolXteachingAchievementsController extends BaseController
{
@Autowired
private ISchoolXteachingAchievementsService schoolXteachingAchievementsService;
@Autowired
private ISysDictDataService sysDictDataService;
/**
* 查询教学成绩列表
......@@ -59,7 +63,7 @@ public class SchoolXteachingAchievementsController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:achievements:export')")
@Log(title = "教学成绩", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestBody SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
public void export(HttpServletResponse response, SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
{
int i = 0;
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/fudao/FudaoStudent.java
package yangtz.cs.liu.campus.domain.fudao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
......@@ -9,6 +12,7 @@ import java.util.Date;
public class FudaoStudent extends OurBaseEntity {
//id
@TableId(value = "id", type = IdType.AUTO)
private Long id;
//学科
......@@ -42,7 +46,8 @@ public class FudaoStudent extends OurBaseEntity {
private String org;
//获奖时间
private String awardtime;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date awardtime;
//备注
private String remark;
......@@ -57,12 +62,14 @@ public class FudaoStudent extends OurBaseEntity {
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;
//删除状态
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/fudao/FudaoTeacher.java
package yangtz.cs.liu.campus.domain.fudao;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.core.domain.OurBaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
......@@ -9,6 +12,7 @@ import java.util.Date;
public class FudaoTeacher extends OurBaseEntity {
//id
@TableId(value = "id", type = IdType.AUTO)
private Long id;
//学科
......@@ -44,7 +48,8 @@ public class FudaoTeacher extends OurBaseEntity {
//审核状态
private String auditstate;
//获奖时间
private String awardtime;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date awardtime;
//备注
private String remark;
......@@ -59,12 +64,14 @@ public class FudaoTeacher extends OurBaseEntity {
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;
//删除状态
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolAnnualAssessment/SchoolAnnualAssessmentExport.java
......@@ -10,24 +10,21 @@ import java.util.Date;
public class SchoolAnnualAssessmentExport
{
/**
* 选中导出参数
*/
private Long[] ids;
/** 主键id */
private Long id;
/** 年度 */
@Excel(name = "年度")
private Integer year;
@Excel(name = "序号")
private Integer xh;
/** 姓名 */
@Excel(name = "姓名")
private String name;
/** 年度 */
@Excel(name = "年度",combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
private Integer year;
/** 身份证 */
@Excel(name = "身份证")
private String idCard;
/** 考核结果(1优秀、2合格、3不定等次、4不予考核、5不合格) */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXprojectResearch.java 0 → 100644
package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
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 java.util.Date;
/**
* 课题研究对象 school_xproject_research
*
* @author ruoyi
* @date 2023-12-13
*/
@Data
public class SchoolXprojectResearch {
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学科(下拉框) */
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 获奖类别 */
@Excel(name = "获奖类别",combo = {"规划办课题","教科院课题","社科联课题","学会等非官方课题","其他"},
readConverterExp = "1=规划办课题,2=教科院课题,3=社科联课题,4=学会等非官方课题,5=其他")
private String awardType;
/** 获奖级别 */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级 */
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
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;
/** 审核状态（0未提交，1审核中，2同意，3驳回） */
private String auditState;
/** 创建者 */
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/mapper/fudao/FudaoStudentMapper.java
......@@ -4,15 +4,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import yangtz.cs.liu.campus.domain.fudao.FudaoStudent;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import java.util.List;
@Mapper
public interface FudaoStudentMapper extends BaseMapper<FudaoStudent> {
List<FudaoStudent> querylist(FudaoStudent fudaoStudent);
List<FudaoStudentVo> querylist(FudaoStudentVo fudaoStudentVo);
FudaoStudentVo selectTutorStudentById(Long id);
public int add(FudaoStudent fudaoStudent);
public int deleteByIds(Long[] ids);
public int deleteids(Long[] ids);
public int updatefudao(FudaoStudent fudaoStudent);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/fudao/FudaoTeacherMapper.java
......@@ -3,16 +3,20 @@ package yangtz.cs.liu.campus.mapper.fudao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import java.util.List;
@Mapper
public interface FudaoTeacherMapper extends BaseMapper<FudaoTeacher> {
List<FudaoTeacher> querylist(FudaoTeacher fudaoTeacher);
List<FudaoTeacherVo> querylist(FudaoTeacherVo fudaoTeacherVo);
FudaoTeacherVo selectTutorAwardById(Long id);
public int add(FudaoTeacher fudaoTeacher);
public int deleteByIds(Long[] ids);
public int deleteids(Long[] ids);
public int updatefudao(FudaoTeacher fudaoTeacher);
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXprojectResearchMapper.java 0 → 100644
package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXprojectResearch;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo;
import java.util.List;
/**
* 课题研究Mapper接口
*
* @author ruoyi
* @date 2023-12-13
*/
public interface SchoolXprojectResearchMapper extends BaseMapper<SchoolXprojectResearch> {
/**
* 查询课题研究
*
* @param id 课题研究主键
* @return 课题研究
*/
public SchoolXprojectResearchVo selectSchoolXprojectResearchById(Long id);
/**
* 查询课题研究列表
*
* @param schoolXprojectResearchVo 课题研究
* @return 课题研究集合
*/
public List<SchoolXprojectResearchVo> selectSchoolXprojectResearchList(SchoolXprojectResearchVo schoolXprojectResearchVo);
/**
* 新增课题研究
*
* @param schoolXprojectResearch 课题研究
* @return 结果
*/
public int insertSchoolXprojectResearch(SchoolXprojectResearch schoolXprojectResearch);
/**
* 修改课题研究
*
* @param schoolXprojectResearch 课题研究
* @return 结果
*/
public int updateSchoolXprojectResearch(SchoolXprojectResearch schoolXprojectResearch);
/**
* 删除课题研究
*
* @param id 课题研究主键
* @return 结果
*/
public int deleteSchoolXprojectResearchById(Long id);
/**
* 批量删除课题研究
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteSchoolXprojectResearchByIds(Long[] ids);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/fudao/FudaoStudentService.java
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.fudao.FudaoStudent;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import java.util.List;
......@@ -11,12 +12,16 @@ import java.util.List;
@Service
public interface FudaoStudentService extends IService<FudaoStudent> {
List<FudaoStudent> querylist(FudaoStudent fudaoStudent);
List<FudaoStudentVo> querylist(FudaoStudentVo fudaoStudentVo);
public int insert(FudaoStudent fudaoStudent);
public int deleteids(Long[] ids);
public int delete(Long[] ids);
public int updatefudao(FudaoStudent fudaoStudent);
FudaoStudentVo selectTutorStudentById(Long id);
int submit(FudaoStudent fudaoStudent);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/fudao/FudaoTeacherService.java
......@@ -3,20 +3,29 @@ package yangtz.cs.liu.campus.service.fudao;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.fudao.FudaoTeacher;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import java.util.List;
@Service
public interface FudaoTeacherService extends IService<FudaoTeacher> {
//查询
List<FudaoTeacher> querylist(FudaoTeacher fudaoTeacher);
List<FudaoTeacherVo> querylist(FudaoTeacherVo fudaoTeacherVo);
FudaoTeacherVo selectTutorAwardById(Long id);
//新增
public int insert(FudaoTeacher fudaoTeacher);
//删除
public int deleteids(Long[] ids);
public int delete(Long[] ids);
//修改
public int updatefudao(FudaoTeacher fudaoTeacher);
/**
* 审核
* @param fudaoTeacher
* @return
*/
int submit(FudaoTeacher fudaoTeacher);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/fudao/FudaoStudentImpl.java
......@@ -12,6 +12,7 @@ import yangtz.cs.liu.campus.mapper.fudao.FudaoStudentMapper;
import yangtz.cs.liu.campus.mapper.fudao.FudaoTeacherMapper;
import yangtz.cs.liu.campus.service.fudao.FudaoStudentService;
import yangtz.cs.liu.campus.service.fudao.FudaoTeacherService;
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import java.util.List;
......@@ -22,8 +23,8 @@ public class FudaoStudentImpl extends ServiceImpl<FudaoStudentMapper,FudaoStuden
private FudaoStudentMapper fudaoStudentMapper;
@Override
public List<FudaoStudent> querylist(FudaoStudent fudaoStudent) {
return fudaoStudentMapper.querylist(fudaoStudent);
public List<FudaoStudentVo> querylist(FudaoStudentVo fudaoStudentVo) {
return fudaoStudentMapper.querylist(fudaoStudentVo);
}
......@@ -31,8 +32,6 @@ public class FudaoStudentImpl extends ServiceImpl<FudaoStudentMapper,FudaoStuden
@Override
public int insert(FudaoStudent fudaoStudent) {
SysUser user = SecurityUtils.getLoginUser().getUser();
fudaoStudent.setUserid(user.getUserId());
fudaoStudent.setUsername(user.getUserName());
fudaoStudent.setCreateby(user.getUserName());
fudaoStudent.setCreatetime(DateUtils.getNowDate());
int s=fudaoStudentMapper.add(fudaoStudent);
......@@ -41,11 +40,10 @@ public class FudaoStudentImpl extends ServiceImpl<FudaoStudentMapper,FudaoStuden
}
@Override
public int deleteids(Long[] ids) {
return fudaoStudentMapper.deleteids(ids);
public int delete(Long[] ids) {
return fudaoStudentMapper.deleteByIds(ids);
}
@Override
public int updatefudao(FudaoStudent fudaoStudent) {
fudaoStudent.setUpdateBy(SecurityUtils.getLoginUser().getUser().getUserName());
......@@ -53,4 +51,14 @@ public class FudaoStudentImpl extends ServiceImpl<FudaoStudentMapper,FudaoStuden
return fudaoStudentMapper.updatefudao(fudaoStudent);
}
@Override
public FudaoStudentVo selectTutorStudentById(Long id) {
return fudaoStudentMapper.selectTutorStudentById(id);
}
@Override
public int submit(FudaoStudent fudaoStudent) {
return fudaoStudentMapper.updatefudao(fudaoStudent);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/fudao/FudaoTeacherImpl.java
......@@ -14,6 +14,7 @@ import yangtz.cs.liu.campus.mapper.fudao.FudaoTeacherMapper;
import yangtz.cs.liu.campus.mapper.student.SchoolEducationDetailsMapper;
import yangtz.cs.liu.campus.service.fudao.FudaoTeacherService;
import yangtz.cs.liu.campus.service.student.ISchoolEducationDetailsService;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import java.util.List;
......@@ -23,17 +24,20 @@ public class FudaoTeacherImpl extends ServiceImpl<FudaoTeacherMapper, FudaoTeach
private FudaoTeacherMapper fudaoTeacherMapper;
@Override
public List<FudaoTeacher> querylist(FudaoTeacher fudaoTeacher) {
return fudaoTeacherMapper.querylist(fudaoTeacher);
public List<FudaoTeacherVo> querylist(FudaoTeacherVo fudaoTeacherVo) {
return fudaoTeacherMapper.querylist(fudaoTeacherVo);
}
@Override
public FudaoTeacherVo selectTutorAwardById(Long id) {
return fudaoTeacherMapper.selectTutorAwardById(id);
}
@Transactional
@Override
public int insert(FudaoTeacher fudaoTeacher) {
SysUser user = SecurityUtils.getLoginUser().getUser();
fudaoTeacher.setUserid(user.getUserId());
fudaoTeacher.setUsername(user.getUserName());
fudaoTeacher.setCreateby(user.getUserName());
fudaoTeacher.setCreateby(SecurityUtils.getUsername());
fudaoTeacher.setCreatetime(DateUtils.getNowDate());
int s=fudaoTeacherMapper.add(fudaoTeacher);
// insertSchoolAccessory(fudaoTeacher);
......@@ -41,8 +45,8 @@ public class FudaoTeacherImpl extends ServiceImpl<FudaoTeacherMapper, FudaoTeach
}
@Override
public int deleteids(Long[] ids) {
return fudaoTeacherMapper.deleteids(ids);
public int delete(Long[] ids) {
return fudaoTeacherMapper.deleteByIds(ids);
}
......@@ -53,6 +57,10 @@ public class FudaoTeacherImpl extends ServiceImpl<FudaoTeacherMapper, FudaoTeach
return fudaoTeacherMapper.updatefudao(fudaoTeacher);
}
@Override
public int submit(FudaoTeacher fudaoTeacher) {
return fudaoTeacherMapper.updatefudao(fudaoTeacher);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXprojectResearchServiceImpl.java 0 → 100644
package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXprojectResearch;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXprojectResearchMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXprojectResearchService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo;
import java.util.List;
/**
* 课题研究Service业务层处理
*
* @author ruoyi
* @date 2023-12-13
*/
@Service
public class SchoolXprojectResearchServiceImpl extends ServiceImpl<SchoolXprojectResearchMapper,SchoolXprojectResearch> implements ISchoolXprojectResearchService {
@Autowired
private SchoolXprojectResearchMapper schoolXprojectResearchMapper;
/**
* 查询课题研究
*
* @param id 课题研究主键
* @return 课题研究
*/
@Override
public SchoolXprojectResearchVo selectSchoolXprojectResearchById(Long id)
{
return schoolXprojectResearchMapper.selectSchoolXprojectResearchById(id);
}
/**
* 查询课题研究列表
*
* @param schoolXprojectResearchVo 课题研究
* @return 课题研究
*/
@Override
public List<SchoolXprojectResearchVo> selectSchoolXprojectResearchList(SchoolXprojectResearchVo schoolXprojectResearchVo)
{
return schoolXprojectResearchMapper.selectSchoolXprojectResearchList(schoolXprojectResearchVo);
}
/**
* 新增课题研究
*
* @param schoolXprojectResearch 课题研究
* @return 结果
*/
@Override
public int insertSchoolXprojectResearch(SchoolXprojectResearch schoolXprojectResearch)
{
schoolXprojectResearch.setCreateBy(SecurityUtils.getUsername());
schoolXprojectResearch.setCreateTime(DateUtils.getNowDate());
return schoolXprojectResearchMapper.insertSchoolXprojectResearch(schoolXprojectResearch);
}
/**
* 修改课题研究
*
* @param schoolXprojectResearch 课题研究
* @return 结果
*/
@Override
public int updateSchoolXprojectResearch(SchoolXprojectResearch schoolXprojectResearch)
{
schoolXprojectResearch.setUpdateBy(SecurityUtils.getUsername());
schoolXprojectResearch.setUpdateTime(DateUtils.getNowDate());
return schoolXprojectResearchMapper.updateSchoolXprojectResearch(schoolXprojectResearch);
}
/**
* 批量删除课题研究
*
* @param ids 需要删除的课题研究主键
* @return 结果
*/
@Override
public int deleteSchoolXprojectResearchByIds(Long[] ids)
{
return schoolXprojectResearchMapper.deleteSchoolXprojectResearchByIds(ids);
}
/**
* 删除课题研究信息
*
* @param id 课题研究主键
* @return 结果
*/
@Override
public int deleteSchoolXprojectResearchById(Long id)
{
return schoolXprojectResearchMapper.deleteSchoolXprojectResearchById(id);
}
/**
* 审核
* @param schoolXprojectResearch
* @return
*/
@Override
public int audit(SchoolXprojectResearch schoolXprojectResearch) {
return schoolXprojectResearchMapper.updateSchoolXprojectResearch(schoolXprojectResearch);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteachingAchievementsServiceImpl.java
......@@ -100,6 +100,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
throw new ServiceException("班级输入错误，请重新输入！");
}
}
schoolXteachingAchievements.setClassName(newClassName);
//判断考核分是否正确
if (!schoolXteachingAchievements.getAssessmentScore().toString().matches("\\d+(\\.\\d+)?")){
throw new ServiceException("考核分输入错误，请重新输入！");
......@@ -137,6 +138,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
throw new ServiceException("班级输入错误，请重新输入！");
}
}
schoolXteachingAchievements.setClassName(newClassName);
//判断考核分是否正确
if (!schoolXteachingAchievements.getAssessmentScore().toString().matches("\\d+(\\.\\d+)?")){
throw new ServiceException("考核分输入错误，请重新输入！");
......@@ -345,6 +347,7 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
failureMsg.append("<br/>" + failureNum + "、班级输入错误,请您重新输入! ");
}
}
schoolXteachingAchievements.setClassName(newClassName);
//判断班级类型是否正确
String classType = schoolXteachingAchievements.getClassType();
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXprojectResearchService.java 0 → 100644
package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXprojectResearch;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo;
import java.util.List;
/**
* 课题研究Service接口
*
* @author ruoyi
* @date 2023-12-13
*/
public interface ISchoolXprojectResearchService extends IService<SchoolXprojectResearch> {
/**
* 查询课题研究
*
* @param id 课题研究主键
* @return 课题研究
*/
public SchoolXprojectResearchVo selectSchoolXprojectResearchById(Long id);
/**
* 查询课题研究列表
*
* @param schoolXprojectResearchVo 课题研究
* @return 课题研究集合
*/
public List<SchoolXprojectResearchVo> selectSchoolXprojectResearchList(SchoolXprojectResearchVo schoolXprojectResearchVo);
/**
* 新增课题研究
*
* @param schoolXprojectResearch 课题研究
* @return 结果
*/
public int insertSchoolXprojectResearch(SchoolXprojectResearch schoolXprojectResearch);
/**
* 修改课题研究
*
* @param schoolXprojectResearch 课题研究
* @return 结果
*/
public int updateSchoolXprojectResearch(SchoolXprojectResearch schoolXprojectResearch);
/**
* 批量删除课题研究
*
* @param ids 需要删除的课题研究主键集合
* @return 结果
*/
public int deleteSchoolXprojectResearchByIds(Long[] ids);
/**
* 删除课题研究信息
*
* @param id 课题研究主键
* @return 结果
*/
public int deleteSchoolXprojectResearchById(Long id);
/**
* 审核
* @param schoolXprojectResearch
* @return
*/
int audit(SchoolXprojectResearch schoolXprojectResearch);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/fudao/FudaoStudentVo.java 0 → 100644
package yangtz.cs.liu.campus.vo.fudao;
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 java.util.Date;
@Data
public class FudaoStudentVo {
@Excel(name = "序号")
private Integer xh;
/** 成长类型 */
@Excel(name = "成长类型")
private String growthType;
//id
@TableId(value = "id", type = IdType.AUTO)
private Long id;
//学科
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
//获奖类别
@Excel(name = "获奖类别",combo = {"奥赛类","作文类","科创类","演讲类","体育类","表演类","绘画类","其他类"},
readConverterExp = "1=奥赛类,2=作文类,3=科创类,4=演讲类,5=体育类,6=表演类,7=绘画类,8=其他类")
private String awardtype;
//审核状态
private String auditstate;
//获奖级别
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardrank;
//获奖等级
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardlevel;
//成果名称
@Excel(name = "比赛名称")
private String resultname;
//获奖人id
private Long userid;
//获奖人
@Excel(name = "获奖人")
private String username;
//指导教师
@Excel(name = "指导教师")
private String guidanceteacher;
//主办单位
@Excel(name = "主办单位")
private String org;
//获奖时间
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "获奖时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date awardtime;
//备注
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;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
//删除状态
private int delflag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/fudao/FudaoTeacherVo.java 0 → 100644
package yangtz.cs.liu.campus.vo.fudao;
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 java.util.Date;
@Data
public class FudaoTeacherVo {
@Excel(name = "序号")
private Integer xh;
/** 成长类型 */
@Excel(name = "成长类型")
private String growthType;
//id
@TableId(value = "id", type = IdType.AUTO)
private Long id;
//学科
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
//获奖类别
@Excel(name = "获奖类别",combo = {"学科带头人评选","教学能手评选","优质课比赛","公开课比赛","其他讲课比赛"},
readConverterExp = "1=学科带头人评选,2=教学能手评选,3=优质课比赛,4=公开课比赛,5=其他讲课比赛")
private String awardtype;
//获奖等级
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardlevel;
//获奖级别
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardrank;
//比赛名称
@Excel(name = "比赛名称")
private String competitionname;
//获奖人id
private Long userid;
//获奖人
@Excel(name = "获奖人")
private String username;
//指导教师
@Excel(name = "指导教师")
private String guidanceteacher;
//辅导职责
@Excel(name = "辅导职责",combo = {"首席指导教师","影子指导教师","其他"},
readConverterExp = "1=首席指导教师,2=影子指导教师,3=其他")
private String coachingr;
//主办单位
@Excel(name = "主办单位")
private String org;
//审核状态
private String auditstate;
//获奖时间
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "获奖时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date awardtime;
//备注
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;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
//删除状态
private int delflag;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXacademicWorksVo.java
......@@ -33,23 +33,23 @@ public class SchoolXacademicWorksVo
readConverterExp = "1=论著-独著,2=论文-公开发表,3=论著-合著(编者）,4=论文-核心期刊,5=论著-合著(主编）,6=论著-合著(副主编）,7=其他")
private String awardType;
/** 获奖级别 */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级 */
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 获奖级别 */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 成果名称 */
@Excel(name = "成果名称")
@Excel(name = "论文论著-成果名称")
private String resultName;
/** 获奖人id */
private Long userId;
/** 获奖人 */
@Excel(name = "获奖者")
@Excel(name = "获奖人")
private String userName;
/** 主办单位 */
......@@ -62,7 +62,6 @@ public class SchoolXacademicWorksVo
private Date awardTime;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 证书图片名称 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsVo.java
......@@ -31,23 +31,23 @@ public class SchoolXcomprehensiveHonorsVo
@Excel(name = "获奖类别")
private String awardType;
/** 获奖级别（下拉框） */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级（下拉框） */
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 获奖级别（下拉框） */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 成果名称 */
@Excel(name = "成果名称")
@Excel(name = "综合荣誉-成果名称")
private String resultName;
/** 获奖人id */
private Long userId;
/** 获奖人 */
@Excel(name = "获奖者")
@Excel(name = "获奖人")
private String userName;
/** 主办单位 */
......@@ -55,12 +55,11 @@ public class SchoolXcomprehensiveHonorsVo
private String org;
/** 获奖时间（年月日） */
@Excel(name = "获奖时间")
@Excel(name = "获奖时间",width = 30,dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date awardTime;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 证书图片名称 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXlectureAwardsVo.java
......@@ -33,23 +33,23 @@ public class SchoolXlectureAwardsVo
@Excel(name = "获奖类别",combo = {"优质课","公开课","优课","其他","说课","经验介绍","示范课"},readConverterExp = "1=优质课,2=公开课,3=优课,4=其他,5=说课,6=经验介绍,7=示范课")
private String awardType;
/** 获奖级别 */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级 */
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 获奖级别 */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 成果名称 */
@Excel(name = "成果名称")
@Excel(name = "讲课获奖-成果名称")
private String resultName;
/** 获奖人id */
private Long userId;
/** 获奖人 */
@Excel(name = "获奖者")
@Excel(name = "获奖人")
private String userName;
/** 主办单位 */
......@@ -62,7 +62,6 @@ public class SchoolXlectureAwardsVo
private Date awardTime;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 证书图片名称 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXprojectResearchVo.java 0 → 100644
package yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn;
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 java.util.Date;
@Data
public class SchoolXprojectResearchVo {
/** 序号 */
@Excel(name = "序号")
private Integer xh;
/** 成长类型 */
@Excel(name = "成长类型")
private String growthType;
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学科(下拉框) */
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 获奖类别 */
@Excel(name = "获奖类别",combo = {"规划办课题","教科院课题","社科联课题","学会等非官方课题","其他"},
readConverterExp = "1=规划办课题,2=教科院课题,3=社科联课题,4=学会等非官方课题,5=其他")
private String awardType;
/** 获奖等级 */
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 获奖级别 */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 成果名称 */
@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;
/** 备注 */
private String remark;
/** 证书图片名称 */
private String pictureName;
/** 证书图片地址 */
private String pictureUrl;
/** 审核状态（0未提交，1审核中，2同意，3驳回） */
private String auditState;
/** 创建者 */
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;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXteacherAwardsVo.java
......@@ -35,23 +35,23 @@ public class SchoolXteacherAwardsVo
"8=其他,9=高考功勋教师,10=增量优秀教师,11=市高考评奖")
private String awardType;
/** 获奖级别 */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级 */
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 获奖级别 */
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 成果名称 */
@Excel(name = "成果名称")
@Excel(name = "教学获奖-成果名称")
private String resultName;
/** 获奖人id */
private Long userId;
/** 获奖人 */
@Excel(name = "获奖者")
@Excel(name = "获奖人")
private String userName;
/** 主办单位 */
......@@ -64,7 +64,6 @@ public class SchoolXteacherAwardsVo
private Date awardTime;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 证书图片名称 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXteachingAchievementsVo.java
......@@ -29,7 +29,7 @@ public class SchoolXteachingAchievementsVo {
private String semester;
/** 考试时间（年月日） */
@Excel(name = "考试时间")
@Excel(name = "考试时间",width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date examTime;
......@@ -43,7 +43,7 @@ public class SchoolXteachingAchievementsVo {
private String year;
/** 年级（下拉框） */
@Excel(name = "年级", combo = {"高一","高二","高三"})
@Excel(name = "年级", combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
private String grade;
/** 用户id */
......
smart-campus/src/main/resources/mapper/fudao/FudaoStudentMapper.xml
......@@ -2,7 +2,7 @@
<!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.fudao.FudaoStudentMapper">
<resultMap type="FudaoStudent" id="FudaoStudentResult">
<resultMap type="yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo" id="FudaoStudentResult">
<result property="id" column="id" />
<result property="sub" column="sub" />
<result property="awardtype" column="award_type" />
......@@ -26,27 +26,35 @@
</resultMap>
<select id="querylist" parameterType="FudaoStudent" resultMap="FudaoStudentResult">
<select id="querylist" parameterType="yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo" resultMap="FudaoStudentResult">
SELECT id,sub,award_type,award_rank,award_level,result_name,guidance_teacher,user_id,user_name,org,award_time,remark,picture_name,audit_state,
picture_url,create_by,create_time,update_by,update_time,del_flag
FROM school_xtutor_student_award
<where>
del_flag = '0'
<if test="id != null and id != ''"> and id = #{id}</if>
<if test="id != null "> and id = #{id}</if>
<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 award_rank = #{awardrank}</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="guidanceteacher != null and guidanceteacher != ''"> and guidance_teacher = #{guidanceteacher}</if>
<if test="auditstate != null and auditstate != ''"> and audit_state = #{auditstate}</if>
<if test="guidanceteacher != null and guidanceteacher != ''"> and guidance_teacher like concat('%', #{guidanceteacher}, '%')</if>
<if test="auditstate != null and auditstate != ''"> and audit_state != #{auditstate}</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 like concat('%', #{org}, '%')</if>
<if test="awardtime != null"> and award_time = #{awardtime}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
order by create_time DESC
</select>
<select id="selectTutorStudentById" parameterType="Long" resultMap="FudaoStudentResult">
SELECT id,sub,award_type,award_rank,award_level,result_name,guidance_teacher,user_id,user_name,org,award_time,remark,picture_name,audit_state,
picture_url,create_by,create_time,update_by,update_time,del_flag
FROM school_xtutor_student_award where id = #{id}
</select>
<insert id="add" parameterType="FudaoTeacher" useGeneratedKeys="true" keyProperty="id">
insert into school_xtutor_student_award
......@@ -55,8 +63,8 @@
<if test="awardtype != null">award_type,</if>
<if test="awardrank != null">award_rank,</if>
<if test="awardlevel != null">award_level,</if>
<if test="resultname != null">result_name</if>
<if test="auditstate != null">audit_state</if>
<if test="resultname != null">result_name,</if>
<if test="auditstate != null">audit_state,</if>
<if test="guidanceteacher != null">guidance_teacher,</if>
<if test="userid != null">user_id,</if>
<if test="username != null">user_name,</if>
......@@ -90,12 +98,14 @@
<if test="createtime != null">#{createtime},</if>
<if test="updateby != null">#{updateby},</if>
<if test="updatetime != null">#{updatetime},</if>
<if test="delflag != null">#{delflag},</if>
</trim>
</insert>
<update id="delete" parameterType="Long">
update school_xtutor_student_award set del_flag = '1' where id = #{id}
</update>
<update id="deleteids" parameterType="String">
<update id="deleteByIds" parameterType="String">
update school_xtutor_student_award set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
......@@ -124,7 +134,6 @@
<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">del_flag = #{delflag},</if>
</trim>
where id = #{id}
</update>
......
smart-campus/src/main/resources/mapper/fudao/FudaoTeacherMapper.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.fudao.FudaoTeacherMapper">
<resultMap type="FudaoTeacher" id="FudaoTeacherResult">
<resultMap type="yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo" id="FudaoTeacherResult">
<result property="id" column="id" />
<result property="sub" column="sub" />
<result property="awardtype" column="award_type" />
......@@ -24,27 +24,35 @@
<result property="updatetime" column="update_time" />
<result property="delflag" column="del_flag" />
</resultMap>
<select id="querylist" parameterType="FudaoTeacher" resultMap="FudaoTeacherResult">
<select id="querylist" parameterType="yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo" resultMap="FudaoTeacherResult">
SELECT id,sub,award_type,award_rank,award_level,coaching_responsibilities,competition_name,guidance_teacher,user_id,user_name,org,audit_state,award_time,remark,picture_name,
picture_url,create_by,create_time,update_by,update_time,del_flag
FROM school_xtutor_award
<where>
del_flag = '0'
<if test="id != null and id != ''"> and id = #{id}</if>
<if test="id != null "> and id = #{id}</if>
<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 award_rank = #{awardrank}</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="competitionname != null and competitionname != ''"> and competition_name like concat('%', #{competitionname}, '%')</if>
<if test="guidanceteacher != null and guidanceteacher != ''"> and guidance_teacher = #{guidanceteacher}</if>
<if test="auditstate != null and auditstate != ''"> and audit_state = #{auditstate}</if>
<if test="guidanceteacher != null and guidanceteacher != ''"> and guidance_teacher like concat('%', #{guidanceteacher}, '%')</if>
<if test="auditstate != null and auditstate != ''"> and audit_state != #{auditstate}</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 like concat('%', #{org}, '%')</if>
<if test="awardtime != null"> and award_time = #{awardtime}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
order by create_time DESC
</select>
<select id="selectTutorAwardById" parameterType="Long" resultMap="FudaoTeacherResult">
SELECT id,sub,award_type,award_rank,award_level,coaching_responsibilities,competition_name,guidance_teacher,user_id,user_name,org,audit_state,award_time,remark,picture_name,
picture_url,create_by,create_time,update_by,update_time,del_flag
FROM school_xtutor_award where id = #{id}
</select>
<insert id="add" parameterType="FudaoTeacher" useGeneratedKeys="true" keyProperty="id">
insert into school_xtutor_award
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -52,7 +60,7 @@
<if test="awardtype != null">award_type,</if>
<if test="awardrank != null">award_rank,</if>
<if test="awardlevel != null">award_level,</if>
<if test="auditstate != null">audit_state</if>
<if test="auditstate != null">audit_state,</if>
<if test="coachingr != null">coaching_responsibilities,</if>
<if test="competitionname != null">competition_name,</if>
<if test="guidanceteacher != null">guidance_teacher,</if>
......@@ -67,15 +75,14 @@
<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">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="sub != null">#{sub},</if>
<if test="awardtype != null">#{awardtype},</if>
<if test="awardrank != null">#{awardrank},</if>
<if test="awardlevel != null">#{awardlevel},</if>
<if test="coachingr != null">#{coachingr},</if>
<if test="auditstate != null">#{auditstate},</if>
<if test="coachingr != null">#{coachingr},</if>
<if test="competitionname != null">#{competitionname},</if>
<if test="guidanceteacher != null">#{guidanceteacher},</if>
<if test="userid != null">#{userid},</if>
......@@ -89,12 +96,14 @@
<if test="createtime != null">#{createtime},</if>
<if test="updateby != null">#{updateby},</if>
<if test="updatetime != null">#{updatetime},</if>
<if test="delflag != null">#{delflag},</if>
</trim>
</insert>
<update id="delete" parameterType="Long">
update school_xtutor_award set del_flag = '1' where id = #{id}
</update>
<update id="deleteids" parameterType="String">
<update id="deleteByIds" parameterType="String">
update school_xtutor_award set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
......@@ -123,8 +132,8 @@
<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">del_flag = #{delflag},</if>
</trim>
where id = #{id}
</update>
</mapper>
\ No newline at end of file
</mapper>
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXacademicWorksMapper.xml
......@@ -46,7 +46,7 @@
<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>
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
order by create_time DESC
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsMapper.xml
......@@ -46,7 +46,7 @@
<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>
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
order by create_time DESC
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXlectureAwardsMapper.xml
......@@ -46,7 +46,7 @@
<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>
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
order by create_time DESC
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXprojectResearchMapper.xml 0 → 100644
<?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.SchoolXprojectResearchMapper">
<resultMap type="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo" id="SchoolXprojectResearchResult">
<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="auditState" column="audit_state" />
<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="selectSchoolXprojectResearchVo">
select id, sub, award_type, award_rank, award_level, result_name, user_id, user_name, org, award_time, remark, picture_name, picture_url, audit_state, create_by, create_time, update_by, update_time, del_flag from school_xproject_research
</sql>
<select id="selectSchoolXprojectResearchList" parameterType="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo" resultMap="SchoolXprojectResearchResult">
<include refid="selectSchoolXprojectResearchVo"/>
<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>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
order by create_time DESC
</select>
<select id="selectSchoolXprojectResearchById" parameterType="Long" resultMap="SchoolXprojectResearchResult">
<include refid="selectSchoolXprojectResearchVo"/>
where id = #{id}
</select>
<insert id="insertSchoolXprojectResearch" parameterType="SchoolXprojectResearch" useGeneratedKeys="true" keyProperty="id">
insert into school_xproject_research
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="sub != null">sub,</if>
<if test="awardType != null">award_type,</if>
<if test="awardRank != null">award_rank,</if>
<if test="awardLevel != null">award_level,</if>
<if test="resultName != null">result_name,</if>
<if test="userId != null">user_id,</if>
<if test="userName != null">user_name,</if>
<if test="org != null">org,</if>
<if test="awardTime != null">award_time,</if>
<if test="remark != null">remark,</if>
<if test="pictureName != null">picture_name,</if>
<if test="pictureUrl != null">picture_url,</if>
<if test="auditState != null and auditState != ''">audit_state,</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">#{sub},</if>
<if test="awardType != null">#{awardType},</if>
<if test="awardRank != null">#{awardRank},</if>
<if test="awardLevel != null">#{awardLevel},</if>
<if test="resultName != null">#{resultName},</if>
<if test="userId != null">#{userId},</if>
<if test="userName != null">#{userName},</if>
<if test="org != null">#{org},</if>
<if test="awardTime != null">#{awardTime},</if>
<if test="remark != null">#{remark},</if>
<if test="pictureName != null">#{pictureName},</if>
<if test="pictureUrl != null">#{pictureUrl},</if>
<if test="auditState != null and auditState != ''">#{auditState},</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="updateSchoolXprojectResearch" parameterType="SchoolXprojectResearch">
update school_xproject_research
<trim prefix="SET" suffixOverrides=",">
<if test="sub != null">sub = #{sub},</if>
<if test="awardType != null">award_type = #{awardType},</if>
<if test="awardRank != null">award_rank = #{awardRank},</if>
<if test="awardLevel != null">award_level = #{awardLevel},</if>
<if test="resultName != null">result_name = #{resultName},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="userName != null">user_name = #{userName},</if>
<if test="org != null">org = #{org},</if>
<if test="awardTime != null">award_time = #{awardTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="pictureName != null">picture_name = #{pictureName},</if>
<if test="pictureUrl != null">picture_url = #{pictureUrl},</if>
<if test="auditState != null and auditState != ''">audit_state = #{auditState},</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="deleteSchoolXprojectResearchById" parameterType="Long">
update school_xproject_research set del_flag = '1' where id = #{id}
</update>
<update id="deleteSchoolXprojectResearchByIds" parameterType="String">
update school_xproject_research 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
......@@ -46,7 +46,7 @@
<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>
<if test="auditState != null and auditState != ''"> and audit_state = #{auditState}</if>
<if test="auditState != null and auditState != ''"> and audit_state != #{auditState}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and award_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
order by create_time DESC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment