Skip to content

D
dd_school
Commit f23b67bc by xuwenhao
Options

12.12教师电子档案4.2-4.6功能

parent 23b03d41
Showing with 1444 additions and 134 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java
......@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -20,6 +22,7 @@ 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;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
/**
* 论文著作Controller
......@@ -37,29 +40,71 @@ public class SchoolXacademicWorksController extends BaseController
/**
* 查询论文著作列表
*/
// @PreAuthorize("@ss.hasPermi('system:works:list')")
@GetMapping("/list")
public TableDataInfo list(SchoolXacademicWorks schoolXacademicWorks)
public TableDataInfo list(SchoolXacademicWorksVo schoolXacademicWorksVo)
{
startPage();
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list);
}
/**
* 查询论文著作列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:works:listGr')")
@GetMapping("/listGr")
public TableDataInfo listGr(SchoolXacademicWorksVo schoolXacademicWorksVo)
{
schoolXacademicWorksVo.setUserId(SecurityUtils.getUserId());
startPage();
List<SchoolXacademicWorks> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorks);
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
return getDataTable(list);
}
/**
* 导出论文著作列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:works:exportGr')")
@Log(title = "论文著作", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, @RequestBody SchoolXacademicWorksVo schoolXacademicWorksVo)
{
int i = 0;
schoolXacademicWorksVo.setUserId(SecurityUtils.getUserId());
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++;
xacademicWorksVo.setXh(i);
xacademicWorksVo.setGrowthType("论文论著");
}
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据");
}
/**
* 导出论文著作列表
*/
// @PreAuthorize("@ss.hasPermi('system:works:export')")
@Log(title = "论文著作", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolXacademicWorks schoolXacademicWorks)
public void export(HttpServletResponse response, @RequestBody SchoolXacademicWorksVo schoolXacademicWorksVo)
{
List<SchoolXacademicWorks> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorks);
ExcelUtil<SchoolXacademicWorks> util = new ExcelUtil<SchoolXacademicWorks>(SchoolXacademicWorks.class);
int i = 0;
List<SchoolXacademicWorksVo> list = schoolXacademicWorksService.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
for (SchoolXacademicWorksVo xacademicWorksVo : list) {
i ++;
xacademicWorksVo.setXh(i);
xacademicWorksVo.setGrowthType("论文论著");
}
ExcelUtil<SchoolXacademicWorksVo> util = new ExcelUtil<SchoolXacademicWorksVo>(SchoolXacademicWorksVo.class);
util.exportExcel(response, list, "论文著作数据");
}
/**
* 获取论文著作详细信息
*/
// @PreAuthorize("@ss.hasPermi('system:works:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -69,6 +114,7 @@ public class SchoolXacademicWorksController extends BaseController
/**
* 新增论文著作
*/
// @PreAuthorize("@ss.hasPermi('system:works:add')")
@Log(title = "论文著作", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolXacademicWorks schoolXacademicWorks)
......@@ -79,6 +125,7 @@ public class SchoolXacademicWorksController extends BaseController
/**
* 修改论文著作
*/
// @PreAuthorize("@ss.hasPermi('system:works:edit')")
@Log(title = "论文著作", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolXacademicWorks schoolXacademicWorks)
......@@ -89,10 +136,20 @@ public class SchoolXacademicWorksController extends BaseController
/**
* 删除论文著作
*/
// @PreAuthorize("@ss.hasPermi('system:works:remove')")
@Log(title = "论文著作", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolXacademicWorksService.deleteSchoolXacademicWorksByIds(ids));
}
/**
* 审核
*/
// @PreAuthorize("@ss.hasPermi('system:works:audit')")
@PostMapping("/audit")
public AjaxResult audit(@RequestBody SchoolXacademicWorks schoolXacademicWorks){
return toAjax(schoolXacademicWorksService.audit(schoolXacademicWorks));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java
......@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -20,6 +22,7 @@ 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;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
/**
* 综合荣誉Controller
......@@ -37,29 +40,71 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
/**
* 查询综合荣誉列表
*/
// @PreAuthorize("@ss.hasPermi('system:honors:list')")
@GetMapping("/list")
public TableDataInfo list(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
public TableDataInfo list(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
startPage();
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list);
}
/**
* 查询综合荣誉列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:honors:listGr')")
@GetMapping("/listGr")
public TableDataInfo listGr(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
schoolXcomprehensiveHonorsVo.setUserId(SecurityUtils.getUserId());
startPage();
List<SchoolXcomprehensiveHonors> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonors);
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
return getDataTable(list);
}
/**
* 导出综合荣誉列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:honors:exportGr')")
@Log(title = "综合荣誉", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, @RequestBody SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
int i = 0;
schoolXcomprehensiveHonorsVo.setUserId(SecurityUtils.getUserId());
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++;
xcomprehensiveHonorsVo.setXh(i);
xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
}
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据");
}
/**
* 导出综合荣誉列表
*/
// @PreAuthorize("@ss.hasPermi('system:honors:export')")
@Log(title = "综合荣誉", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
public void export(HttpServletResponse response, @RequestBody SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
List<SchoolXcomprehensiveHonors> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonors);
ExcelUtil<SchoolXcomprehensiveHonors> util = new ExcelUtil<SchoolXcomprehensiveHonors>(SchoolXcomprehensiveHonors.class);
int i = 0;
List<SchoolXcomprehensiveHonorsVo> list = schoolXcomprehensiveHonorsService.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
for (SchoolXcomprehensiveHonorsVo xcomprehensiveHonorsVo : list) {
i ++;
xcomprehensiveHonorsVo.setXh(i);
xcomprehensiveHonorsVo.setGrowthType("综合荣誉");
}
ExcelUtil<SchoolXcomprehensiveHonorsVo> util = new ExcelUtil<SchoolXcomprehensiveHonorsVo>(SchoolXcomprehensiveHonorsVo.class);
util.exportExcel(response, list, "综合荣誉数据");
}
/**
* 获取综合荣誉详细信息
*/
// @PreAuthorize("@ss.hasPermi('system:honors:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -69,6 +114,7 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
/**
* 新增综合荣誉
*/
// @PreAuthorize("@ss.hasPermi('system:honors:add')")
@Log(title = "综合荣誉", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
......@@ -79,6 +125,7 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
/**
* 修改综合荣誉
*/
// @PreAuthorize("@ss.hasPermi('system:honors:edit')")
@Log(title = "综合荣誉", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
......@@ -89,10 +136,20 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
/**
* 删除综合荣誉
*/
// @PreAuthorize("@ss.hasPermi('system:honors:remove')")
@Log(title = "综合荣誉", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolXcomprehensiveHonorsService.deleteSchoolXcomprehensiveHonorsByIds(ids));
}
/**
* 审核
*/
// @PreAuthorize("@ss.hasPermi('system:honors:audit')")
@PostMapping("/audit")
public AjaxResult audit(@RequestBody SchoolXcomprehensiveHonors schoolXcomprehensiveHonors){
return toAjax(schoolXcomprehensiveHonorsService.audit(schoolXcomprehensiveHonors));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java
......@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -20,6 +22,7 @@ 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;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
/**
* 讲课获奖Controller
......@@ -37,32 +40,71 @@ public class SchoolXlectureAwardsController extends BaseController
/**
* 查询讲课获奖列表
*/
@PreAuthorize("@ss.hasPermi('system:awards:list')")
// @PreAuthorize("@ss.hasPermi('system:awards:list')")
@GetMapping("/list")
public TableDataInfo list(SchoolXlectureAwards schoolXlectureAwards)
public TableDataInfo list(SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
startPage();
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list);
}
/**
* 查询讲课获奖列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:awards:listGr')")
@GetMapping("/listGr")
public TableDataInfo listGr(SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
schoolXlectureAwardsVo.setUserId(SecurityUtils.getUserId());
startPage();
List<SchoolXlectureAwards> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwards);
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
return getDataTable(list);
}
/**
* 导出讲课获奖列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:awards:exportGr')")
@Log(title = "讲课获奖", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response, @RequestBody SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
int i = 0;
schoolXlectureAwardsVo.setUserId(SecurityUtils.getUserId());
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++;
xlectureAwardsVo.setXh(i);
xlectureAwardsVo.setGrowthType("讲课获奖");
}
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据");
}
/**
* 导出讲课获奖列表
*/
@PreAuthorize("@ss.hasPermi('system:awards:export')")
// @PreAuthorize("@ss.hasPermi('system:awards:export')")
@Log(title = "讲课获奖", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolXlectureAwards schoolXlectureAwards)
public void export(HttpServletResponse response, @RequestBody SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
List<SchoolXlectureAwards> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwards);
ExcelUtil<SchoolXlectureAwards> util = new ExcelUtil<SchoolXlectureAwards>(SchoolXlectureAwards.class);
int i = 0;
List<SchoolXlectureAwardsVo> list = schoolXlectureAwardsService.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
for (SchoolXlectureAwardsVo xlectureAwardsVo : list) {
i ++;
xlectureAwardsVo.setXh(i);
xlectureAwardsVo.setGrowthType("讲课获奖");
}
ExcelUtil<SchoolXlectureAwardsVo> util = new ExcelUtil<SchoolXlectureAwardsVo>(SchoolXlectureAwardsVo.class);
util.exportExcel(response, list, "讲课获奖数据");
}
/**
* 获取讲课获奖详细信息
*/
@PreAuthorize("@ss.hasPermi('system:awards:query')")
// @PreAuthorize("@ss.hasPermi('system:awards:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -72,7 +114,7 @@ public class SchoolXlectureAwardsController extends BaseController
/**
* 新增讲课获奖
*/
@PreAuthorize("@ss.hasPermi('system:awards:add')")
// @PreAuthorize("@ss.hasPermi('system:awards:add')")
@Log(title = "讲课获奖", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolXlectureAwards schoolXlectureAwards)
......@@ -83,7 +125,7 @@ public class SchoolXlectureAwardsController extends BaseController
/**
* 修改讲课获奖
*/
@PreAuthorize("@ss.hasPermi('system:awards:edit')")
// @PreAuthorize("@ss.hasPermi('system:awards:edit')")
@Log(title = "讲课获奖", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolXlectureAwards schoolXlectureAwards)
......@@ -94,11 +136,20 @@ public class SchoolXlectureAwardsController extends BaseController
/**
* 删除讲课获奖
*/
@PreAuthorize("@ss.hasPermi('system:awards:remove')")
// @PreAuthorize("@ss.hasPermi('system:awards:remove')")
@Log(title = "讲课获奖", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolXlectureAwardsService.deleteSchoolXlectureAwardsByIds(ids));
}
/**
* 审核
*/
// @PreAuthorize("@ss.hasPermi('system:awards:audit')")
@PostMapping("/audit")
public AjaxResult audit(@RequestBody SchoolXlectureAwards schoolXlectureAwards){
return toAjax(schoolXlectureAwardsService.audit(schoolXlectureAwards));
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java
......@@ -2,7 +2,10 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
......@@ -19,6 +22,7 @@ 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;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
/**
* 教师获奖Controller
......@@ -36,29 +40,71 @@ public class SchoolXteacherAwardsController extends BaseController
/**
* 查询教师获奖列表
*/
// @PreAuthorize("@ss.hasPermi('system:awards:list')")
@GetMapping("/list")
public TableDataInfo list(SchoolXteacherAwards schoolXteacherAwards)
public TableDataInfo list(SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
startPage();
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list);
}
/**
* 查询教师获奖列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:awards:listGr')")
@GetMapping("/listGr")
public TableDataInfo listGr(SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
schoolXteacherAwardsVo.setUserId(SecurityUtils.getUserId());
startPage();
List<SchoolXteacherAwards> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwards);
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
return getDataTable(list);
}
/**
* 导出教师获奖列表(个人)
*/
// @PreAuthorize("@ss.hasPermi('system:awards:exportGr')")
@Log(title = "教师获奖", businessType = BusinessType.EXPORT)
@PostMapping("/exportGr")
public void exportGr(HttpServletResponse response,@RequestBody SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
int i = 0;
schoolXteacherAwardsVo.setUserId(SecurityUtils.getUserId());
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++;
xteacherAwardsVo.setXh(i);
xteacherAwardsVo.setGrowthType("教学获奖");
}
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据");
}
/**
* 导出教师获奖列表
*/
// @PreAuthorize("@ss.hasPermi('system:awards:export')")
@Log(title = "教师获奖", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolXteacherAwards schoolXteacherAwards)
public void export(HttpServletResponse response,@RequestBody SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
List<SchoolXteacherAwards> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwards);
ExcelUtil<SchoolXteacherAwards> util = new ExcelUtil<SchoolXteacherAwards>(SchoolXteacherAwards.class);
int i = 0;
List<SchoolXteacherAwardsVo> list = schoolXteacherAwardsService.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
for (SchoolXteacherAwardsVo xteacherAwardsVo : list) {
i ++;
xteacherAwardsVo.setXh(i);
xteacherAwardsVo.setGrowthType("教学获奖");
}
ExcelUtil<SchoolXteacherAwardsVo> util = new ExcelUtil<SchoolXteacherAwardsVo>(SchoolXteacherAwardsVo.class);
util.exportExcel(response, list, "教师获奖数据");
}
/**
* 获取教师获奖详细信息
*/
// @PreAuthorize("@ss.hasPermi('system:awards:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -68,6 +114,7 @@ public class SchoolXteacherAwardsController extends BaseController
/**
* 新增教师获奖
*/
// @PreAuthorize("@ss.hasPermi('system:awards:add')")
@Log(title = "教师获奖", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolXteacherAwards schoolXteacherAwards)
......@@ -78,6 +125,7 @@ public class SchoolXteacherAwardsController extends BaseController
/**
* 修改教师获奖
*/
// @PreAuthorize("@ss.hasPermi('system:awards:edit')")
@Log(title = "教师获奖", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolXteacherAwards schoolXteacherAwards)
......@@ -88,10 +136,20 @@ public class SchoolXteacherAwardsController extends BaseController
/**
* 删除教师获奖
*/
// @PreAuthorize("@ss.hasPermi('system:awards:remove')")
@Log(title = "教师获奖", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolXteacherAwardsService.deleteSchoolXteacherAwardsByIds(ids));
}
/**
* 审核
*/
// @PreAuthorize("@ss.hasPermi('system:awards:audit')")
@PostMapping("/audit")
public AjaxResult audit(@RequestBody SchoolXteacherAwards schoolXteacherAwards){
return toAjax(schoolXteacherAwardsService.audit(schoolXteacherAwards));
}
}
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 java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
......@@ -18,8 +22,11 @@ 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 org.springframework.web.multipart.MultipartFile;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
/**
* 教学成绩Controller
......@@ -37,29 +44,61 @@ public class SchoolXteachingAchievementsController extends BaseController
/**
* 查询教学成绩列表
*/
// @PreAuthorize("@ss.hasPermi('system:achievements:list')")
@GetMapping("/list")
public TableDataInfo list(SchoolXteachingAchievements schoolXteachingAchievements)
public TableDataInfo list(SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
{
startPage();
List<SchoolXteachingAchievements> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievements);
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
return getDataTable(list);
}
/**
* 导出教学成绩列表
*/
// @PreAuthorize("@ss.hasPermi('system:achievements:export')")
@Log(title = "教学成绩", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolXteachingAchievements schoolXteachingAchievements)
public void export(HttpServletResponse response, @RequestBody SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
{
List<SchoolXteachingAchievements> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievements);
ExcelUtil<SchoolXteachingAchievements> util = new ExcelUtil<SchoolXteachingAchievements>(SchoolXteachingAchievements.class);
int i = 0;
List<SchoolXteachingAchievementsVo> list = schoolXteachingAchievementsService.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
for (SchoolXteachingAchievementsVo schoolXteachingAchievementsVo1 : list) {
i ++;
schoolXteachingAchievementsVo1.setXh(i);
}
ExcelUtil<SchoolXteachingAchievementsVo> util = new ExcelUtil<SchoolXteachingAchievementsVo>(SchoolXteachingAchievementsVo.class);
util.exportExcel(response, list, "教学成绩数据");
}
/*
* 下载模板
* */
@PostMapping("/importTemplate")
public void importTemplate (HttpServletResponse response) {
schoolXteachingAchievementsService.importTemplate(response);
}
/**
* 导入教学成绩
*/
// @PreAuthorize("@ss.hasPermi('system:achievements:importData')")
@PostMapping("/importData")
@Transactional(rollbackFor = Exception.class)
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<SchoolXteachingAchievements> util = new ExcelUtil<SchoolXteachingAchievements>(SchoolXteachingAchievements.class);
List<SchoolXteachingAchievements> list = util.importExcelNdkh(file.getInputStream());
//先校验
schoolXteachingAchievementsService.checkImport(list);
//数据导入
String message = schoolXteachingAchievementsService.importData(list);
return AjaxResult.success(message);
}
/**
* 获取教学成绩详细信息
*/
// @PreAuthorize("@ss.hasPermi('system:achievements:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
......@@ -69,6 +108,7 @@ public class SchoolXteachingAchievementsController extends BaseController
/**
* 新增教学成绩
*/
// @PreAuthorize("@ss.hasPermi('system:achievements:add')")
@Log(title = "教学成绩", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody SchoolXteachingAchievements schoolXteachingAchievements)
......@@ -79,6 +119,7 @@ public class SchoolXteachingAchievementsController extends BaseController
/**
* 修改教学成绩
*/
// @PreAuthorize("@ss.hasPermi('system:achievements:edit')")
@Log(title = "教学成绩", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody SchoolXteachingAchievements schoolXteachingAchievements)
......@@ -89,10 +130,21 @@ public class SchoolXteachingAchievementsController extends BaseController
/**
* 删除教学成绩
*/
// @PreAuthorize("@ss.hasPermi('system:achievements:remove')")
@Log(title = "教学成绩", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(schoolXteachingAchievementsService.deleteSchoolXteachingAchievementsByIds(ids));
}
/**
* 获取所有用户
*/
@GetMapping("/getUserList")
public TableDataInfo getUserList(SysUser sysUser){
startPage();
List<Map<String, Object>> list = schoolXteachingAchievementsService.getUserList(sysUser);
return getDataTable(list);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXacademicWorks.java
......@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
......@@ -18,22 +20,25 @@ public class SchoolXacademicWorks
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学科 */
@Excel(name = "学科")
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 获奖类别 */
@Excel(name = "获奖类别")
@Excel(name = "获奖类别",combo = {"论著-独著","论文-公开发表","论著-合著(编者）","论文-核心期刊","论著-合著(主编）","论著-合著(副主编）","其他"},
readConverterExp = "1=论著-独著,2=论文-公开发表,3=论著-合著(编者）,4=论文-核心期刊,5=论著-合著(主编）,6=论著-合著(副主编）,7=其他")
private String awardType;
/** 获奖级别 */
@Excel(name = "获奖级别")
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级 */
@Excel(name = "获奖等级")
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 成果名称 */
......@@ -44,7 +49,7 @@ public class SchoolXacademicWorks
private Long userId;
/** 获奖人 */
@Excel(name = "获奖人")
@Excel(name = "获奖者")
private String userName;
/** 主办单位 */
......@@ -66,6 +71,9 @@ public class SchoolXacademicWorks
/** 证书图片地址 */
private String pictureUrl;
/** 审核状态（0未提交，1审核中，2通过，3驳回） */
private String auditState;
/** 创建者 */
private String createBy;
......
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.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
......@@ -17,10 +20,12 @@ public class SchoolXcomprehensiveHonors
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学科（下拉框） */
@Excel(name = "学科")
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 获奖类别 */
......@@ -28,11 +33,11 @@ public class SchoolXcomprehensiveHonors
private String awardType;
/** 获奖级别（下拉框） */
@Excel(name = "获奖级别")
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级（下拉框） */
@Excel(name = "获奖等级")
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 成果名称 */
......@@ -43,7 +48,7 @@ public class SchoolXcomprehensiveHonors
private Long userId;
/** 获奖人 */
@Excel(name = "获奖人")
@Excel(name = "获奖者")
private String userName;
/** 主办单位 */
......@@ -51,7 +56,8 @@ public class SchoolXcomprehensiveHonors
private String org;
/** 获奖时间（年月日） */
@Excel(name = "获奖时间", readConverterExp = "年=月日")
@Excel(name = "获奖时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date awardTime;
/** 备注 */
......@@ -64,6 +70,9 @@ public class SchoolXcomprehensiveHonors
/** 证书图片地址 */
private String pictureUrl;
/** 审核状态（0未提交，1审核中，2通过，3驳回） */
private String auditState;
/** 创建者 */
private String createBy;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXlectureAwards.java
......@@ -2,6 +2,8 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
......@@ -18,22 +20,24 @@ public class SchoolXlectureAwards
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学科 */
@Excel(name = "学科")
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 获奖类别 */
@Excel(name = "获奖类别")
@Excel(name = "获奖类别",combo = {"优质课","公开课","优课","其他","说课","经验介绍","示范课"},readConverterExp = "1=优质课,2=公开课,3=优课,4=其他,5=说课,6=经验介绍,7=示范课")
private String awardType;
/** 获奖级别 */
@Excel(name = "获奖级别")
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级 */
@Excel(name = "获奖等级")
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 成果名称 */
......@@ -41,11 +45,10 @@ public class SchoolXlectureAwards
private String resultName;
/** 获奖人id */
@Excel(name = "获奖人id")
private Long userId;
/** 获奖人 */
@Excel(name = "获奖人")
@Excel(name = "获奖者")
private String userName;
/** 主办单位 */
......@@ -67,6 +70,9 @@ public class SchoolXlectureAwards
/** 证书图片地址 */
private String pictureUrl;
/** 审核状态（0未提交，1审核中，2通过，3驳回） */
private String auditState;
/** 创建者 */
private String createBy;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteacherAwards.java
......@@ -2,7 +2,9 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
......@@ -22,22 +24,26 @@ public class SchoolXteacherAwards
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学科 */
@Excel(name = "学科")
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 获奖类别 */
@Excel(name = "获奖类别")
@Excel(name = "获奖类别",combo = {"学科带头人","教学能手","教学科研专家","教学科研成果","增量优秀班主任","高考功勋班主任","教学资源","其他","高考功勋教师",
"增量优秀教师","市高考评奖"},readConverterExp = "1=学科带头人,2=教学能手,3=教学科研专家,4=教学科研成果,5=增量优秀班主任,6=高考功勋班主任,7=教学资源," +
"8=其他,9=高考功勋教师,10=增量优秀教师,11=市高考评奖")
private String awardType;
/** 获奖级别 */
@Excel(name = "获奖级别")
@Excel(name = "获奖级别",combo = {"国家级","省部级","市级","县区级","校级","其他"},readConverterExp = "1=国家级,2=省部级,3=市级,4=县区级,5=校级,6=其他")
private String awardRank;
/** 获奖等级 */
@Excel(name = "获奖等级")
@Excel(name = "获奖等级",combo = {"特等奖","一等奖","二等奖","三等奖","优秀奖","不设等级"},readConverterExp = "1=特等奖,2=一等奖,3=二等级,4=三等奖,5=优秀奖,6=不设等级")
private String awardLevel;
/** 成果名称 */
......@@ -48,7 +54,7 @@ public class SchoolXteacherAwards
private Long userId;
/** 获奖人 */
@Excel(name = "获奖人")
@Excel(name = "获奖者")
private String userName;
/** 主办单位 */
......@@ -70,6 +76,9 @@ public class SchoolXteacherAwards
/** 证书图片地址 */
private String pictureUrl;
/** 审核状态（0未提交，1审核中，2通过，3驳回） */
private String auditState;
/** 创建者 */
private String createBy;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolXteachingAchievements.java
......@@ -3,13 +3,11 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
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
......@@ -23,14 +21,16 @@ public class SchoolXteachingAchievements
private static final long serialVersionUID = 1L;
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 学年(下拉框) */
@Excel(name = "学年(下拉框)")
@Excel(name = "学年",combo = {"2018-2019","2019-2020","2020-2021","2021-2022","2022-2023","2023-2024","2024-2025","2025-2026",
"2026-2027","2027-2028","2028-2029","2029-2030","2030-2031","2031-2032","2032-2033"})
private String schoolYear;
/** 学期（下拉框） */
@Excel(name = "学期")
@Excel(name = "学期",combo = {"第一学期","第二学期"}, readConverterExp = "1=第一学期,2=第二学期")
private String semester;
/** 考试时间（年月日） */
......@@ -39,23 +39,23 @@ public class SchoolXteachingAchievements
private Date examTime;
/** 考试类型（下拉框） */
@Excel(name = "考试类型")
@Excel(name = "考试类型",combo = {"月考","期中","期末","一模","二模","三模","高考","其它"},
readConverterExp = "1=月考,2=期中,3=期末,4=一模,5=二模,6=三模,7=高考,8=其它")
private String examType;
/** 届别(下拉框) */
@Excel(name = "届别(下拉框)")
@Excel(name = "届别", combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
private String year;
/** 年级（下拉框） */
@Excel(name = "年级")
@Excel(name = "年级", combo = {"高一","高二","高三"},readConverterExp = "1=高一,2=高二,3=高三")
private String grade;
/** 用户id */
@Excel(name = "用户id")
private Long userId;
/** 用户姓名 */
@Excel(name = "用户姓名")
@Excel(name = "姓名")
private String userName;
/** 身份证号 */
......@@ -63,7 +63,8 @@ public class SchoolXteachingAchievements
private String idCard;
/** 学科 */
@Excel(name = "学科")
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
private String sub;
/** 班级 */
......@@ -93,7 +94,6 @@ public class SchoolXteachingAchievements
private Date updateTime;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 删除状态 */
......
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 yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
import java.util.List;
/**
......@@ -17,15 +19,15 @@ public interface SchoolXacademicWorksMapper
* @param id 论文著作主键
* @return 论文著作
*/
public SchoolXacademicWorks selectSchoolXacademicWorksById(Long id);
public SchoolXacademicWorksVo selectSchoolXacademicWorksById(Long id);
/**
* 查询论文著作列表
*
* @param schoolXacademicWorks 论文著作
* @param schoolXacademicWorksVo 论文著作
* @return 论文著作集合
*/
public List<SchoolXacademicWorks> selectSchoolXacademicWorksList(SchoolXacademicWorks schoolXacademicWorks);
public List<SchoolXacademicWorksVo> selectSchoolXacademicWorksList(SchoolXacademicWorksVo schoolXacademicWorksVo);
/**
* 新增论文著作
......
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 yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
import java.util.List;
/**
......@@ -17,15 +19,15 @@ public interface SchoolXcomprehensiveHonorsMapper
* @param id 综合荣誉主键
* @return 综合荣誉
*/
public SchoolXcomprehensiveHonors selectSchoolXcomprehensiveHonorsById(Long id);
public SchoolXcomprehensiveHonorsVo selectSchoolXcomprehensiveHonorsById(Long id);
/**
* 查询综合荣誉列表
*
* @param schoolXcomprehensiveHonors 综合荣誉
* @param schoolXcomprehensiveHonorsVo 综合荣誉
* @return 综合荣誉集合
*/
public List<SchoolXcomprehensiveHonors> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
public List<SchoolXcomprehensiveHonorsVo> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo);
/**
* 新增综合荣誉
......
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 yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
import java.util.List;
......@@ -18,15 +19,15 @@ public interface SchoolXlectureAwardsMapper
* @param id 讲课获奖主键
* @return 讲课获奖
*/
public SchoolXlectureAwards selectSchoolXlectureAwardsById(Long id);
public SchoolXlectureAwardsVo selectSchoolXlectureAwardsById(Long id);
/**
* 查询讲课获奖列表
*
* @param schoolXlectureAwards 讲课获奖
* @param schoolXlectureAwardsVo 讲课获奖
* @return 讲课获奖集合
*/
public List<SchoolXlectureAwards> selectSchoolXlectureAwardsList(SchoolXlectureAwards schoolXlectureAwards);
public List<SchoolXlectureAwardsVo> selectSchoolXlectureAwardsList(SchoolXlectureAwardsVo schoolXlectureAwardsVo);
/**
* 新增讲课获奖
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteacherAwardsMapper.java
......@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
import java.util.List;
......@@ -19,15 +20,15 @@ public interface SchoolXteacherAwardsMapper
* @param id 教师获奖主键
* @return 教师获奖
*/
public SchoolXteacherAwards selectSchoolXteacherAwardsById(Long id);
public SchoolXteacherAwardsVo selectSchoolXteacherAwardsById(Long id);
/**
* 查询教师获奖列表
*
* @param schoolXteacherAwards 教师获奖
* @param schoolXteacherAwardsVo 教师获奖
* @return 教师获奖集合
*/
public List<SchoolXteacherAwards> selectSchoolXteacherAwardsList(SchoolXteacherAwards schoolXteacherAwards);
public List<SchoolXteacherAwardsVo> selectSchoolXteacherAwardsList(SchoolXteacherAwardsVo schoolXteacherAwardsVo);
/**
* 新增教师获奖
......
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.java
package yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysUser;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import java.util.List;
import java.util.Map;
/**
* 教学成绩Mapper接口
......@@ -10,7 +14,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-12-06
*/
public interface SchoolXteachingAchievementsMapper
public interface SchoolXteachingAchievementsMapper extends BaseMapper<SchoolXteachingAchievements>
{
/**
* 查询教学成绩
......@@ -18,15 +22,15 @@ public interface SchoolXteachingAchievementsMapper
* @param id 教学成绩主键
* @return 教学成绩
*/
public SchoolXteachingAchievements selectSchoolXteachingAchievementsById(Long id);
public SchoolXteachingAchievementsVo selectSchoolXteachingAchievementsById(Long id);
/**
* 查询教学成绩列表
*
* @param schoolXteachingAchievements 教学成绩
* @param schoolXteachingAchievementsVo 教学成绩
* @return 教学成绩集合
*/
public List<SchoolXteachingAchievements> selectSchoolXteachingAchievementsList(SchoolXteachingAchievements schoolXteachingAchievements);
public List<SchoolXteachingAchievementsVo> selectSchoolXteachingAchievementsList(SchoolXteachingAchievementsVo schoolXteachingAchievementsVo);
/**
* 新增教学成绩
......@@ -59,4 +63,7 @@ public interface SchoolXteachingAchievementsMapper
* @return 结果
*/
public int deleteSchoolXteachingAchievementsByIds(Long[] ids);
List<Map<String, Object>> getUserList(SysUser sysUser);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXacademicWorksServiceImpl.java
......@@ -2,11 +2,14 @@ package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.util.List;
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 org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXacademicWorks;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXacademicWorksMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXacademicWorksService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
/**
* 论文著作Service业务层处理
......@@ -27,7 +30,7 @@ public class SchoolXacademicWorksServiceImpl implements ISchoolXacademicWorksSer
* @return 论文著作
*/
@Override
public SchoolXacademicWorks selectSchoolXacademicWorksById(Long id)
public SchoolXacademicWorksVo selectSchoolXacademicWorksById(Long id)
{
return schoolXacademicWorksMapper.selectSchoolXacademicWorksById(id);
}
......@@ -35,13 +38,13 @@ public class SchoolXacademicWorksServiceImpl implements ISchoolXacademicWorksSer
/**
* 查询论文著作列表
*
* @param schoolXacademicWorks 论文著作
* @param schoolXacademicWorksVo 论文著作
* @return 论文著作
*/
@Override
public List<SchoolXacademicWorks> selectSchoolXacademicWorksList(SchoolXacademicWorks schoolXacademicWorks)
public List<SchoolXacademicWorksVo> selectSchoolXacademicWorksList(SchoolXacademicWorksVo schoolXacademicWorksVo)
{
return schoolXacademicWorksMapper.selectSchoolXacademicWorksList(schoolXacademicWorks);
return schoolXacademicWorksMapper.selectSchoolXacademicWorksList(schoolXacademicWorksVo);
}
/**
......@@ -51,8 +54,10 @@ public class SchoolXacademicWorksServiceImpl implements ISchoolXacademicWorksSer
* @return 结果
*/
@Override
@Transactional
public int insertSchoolXacademicWorks(SchoolXacademicWorks schoolXacademicWorks)
{
schoolXacademicWorks.setCreateBy(SecurityUtils.getUsername());
schoolXacademicWorks.setCreateTime(DateUtils.getNowDate());
return schoolXacademicWorksMapper.insertSchoolXacademicWorks(schoolXacademicWorks);
}
......@@ -64,8 +69,10 @@ public class SchoolXacademicWorksServiceImpl implements ISchoolXacademicWorksSer
* @return 结果
*/
@Override
@Transactional
public int updateSchoolXacademicWorks(SchoolXacademicWorks schoolXacademicWorks)
{
schoolXacademicWorks.setUpdateBy(SecurityUtils.getUsername());
schoolXacademicWorks.setUpdateTime(DateUtils.getNowDate());
return schoolXacademicWorksMapper.updateSchoolXacademicWorks(schoolXacademicWorks);
}
......@@ -93,4 +100,14 @@ public class SchoolXacademicWorksServiceImpl implements ISchoolXacademicWorksSer
{
return schoolXacademicWorksMapper.deleteSchoolXacademicWorksById(id);
}
/**
* 审核
* @param schoolXacademicWorks
* @return
*/
@Override
public int audit(SchoolXacademicWorks schoolXacademicWorks) {
return schoolXacademicWorksMapper.updateSchoolXacademicWorks(schoolXacademicWorks);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsServiceImpl.java
......@@ -2,11 +2,13 @@ package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.util.List;
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.SchoolXcomprehensiveHonors;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXcomprehensiveHonorsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
/**
* 综合荣誉Service业务层处理
......@@ -27,7 +29,7 @@ public class SchoolXcomprehensiveHonorsServiceImpl implements ISchoolXcomprehens
* @return 综合荣誉
*/
@Override
public SchoolXcomprehensiveHonors selectSchoolXcomprehensiveHonorsById(Long id)
public SchoolXcomprehensiveHonorsVo selectSchoolXcomprehensiveHonorsById(Long id)
{
return schoolXcomprehensiveHonorsMapper.selectSchoolXcomprehensiveHonorsById(id);
}
......@@ -35,13 +37,13 @@ public class SchoolXcomprehensiveHonorsServiceImpl implements ISchoolXcomprehens
/**
* 查询综合荣誉列表
*
* @param schoolXcomprehensiveHonors 综合荣誉
* @param schoolXcomprehensiveHonorsVo 综合荣誉
* @return 综合荣誉
*/
@Override
public List<SchoolXcomprehensiveHonors> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
public List<SchoolXcomprehensiveHonorsVo> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo)
{
return schoolXcomprehensiveHonorsMapper.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonors);
return schoolXcomprehensiveHonorsMapper.selectSchoolXcomprehensiveHonorsList(schoolXcomprehensiveHonorsVo);
}
/**
......@@ -53,6 +55,7 @@ public class SchoolXcomprehensiveHonorsServiceImpl implements ISchoolXcomprehens
@Override
public int insertSchoolXcomprehensiveHonors(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
{
schoolXcomprehensiveHonors.setCreateBy(SecurityUtils.getUsername());
schoolXcomprehensiveHonors.setCreateTime(DateUtils.getNowDate());
return schoolXcomprehensiveHonorsMapper.insertSchoolXcomprehensiveHonors(schoolXcomprehensiveHonors);
}
......@@ -66,6 +69,7 @@ public class SchoolXcomprehensiveHonorsServiceImpl implements ISchoolXcomprehens
@Override
public int updateSchoolXcomprehensiveHonors(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors)
{
schoolXcomprehensiveHonors.setUpdateBy(SecurityUtils.getUsername());
schoolXcomprehensiveHonors.setUpdateTime(DateUtils.getNowDate());
return schoolXcomprehensiveHonorsMapper.updateSchoolXcomprehensiveHonors(schoolXcomprehensiveHonors);
}
......@@ -93,4 +97,14 @@ public class SchoolXcomprehensiveHonorsServiceImpl implements ISchoolXcomprehens
{
return schoolXcomprehensiveHonorsMapper.deleteSchoolXcomprehensiveHonorsById(id);
}
/**
* 审核
* @param schoolXcomprehensiveHonors
* @return
*/
@Override
public int audit(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors) {
return schoolXcomprehensiveHonorsMapper.updateSchoolXcomprehensiveHonors(schoolXcomprehensiveHonors);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXlectureAwardsServiceImpl.java
......@@ -2,11 +2,14 @@ package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.util.List;
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 org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXlectureAwards;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXlectureAwardsMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXlectureAwardsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
/**
* 讲课获奖Service业务层处理
......@@ -27,7 +30,7 @@ public class SchoolXlectureAwardsServiceImpl implements ISchoolXlectureAwardsSer
* @return 讲课获奖
*/
@Override
public SchoolXlectureAwards selectSchoolXlectureAwardsById(Long id)
public SchoolXlectureAwardsVo selectSchoolXlectureAwardsById(Long id)
{
return schoolXlectureAwardsMapper.selectSchoolXlectureAwardsById(id);
}
......@@ -35,13 +38,13 @@ public class SchoolXlectureAwardsServiceImpl implements ISchoolXlectureAwardsSer
/**
* 查询讲课获奖列表
*
* @param schoolXlectureAwards 讲课获奖
* @param schoolXlectureAwardsVo 讲课获奖
* @return 讲课获奖
*/
@Override
public List<SchoolXlectureAwards> selectSchoolXlectureAwardsList(SchoolXlectureAwards schoolXlectureAwards)
public List<SchoolXlectureAwardsVo> selectSchoolXlectureAwardsList(SchoolXlectureAwardsVo schoolXlectureAwardsVo)
{
return schoolXlectureAwardsMapper.selectSchoolXlectureAwardsList(schoolXlectureAwards);
return schoolXlectureAwardsMapper.selectSchoolXlectureAwardsList(schoolXlectureAwardsVo);
}
/**
......@@ -51,8 +54,10 @@ public class SchoolXlectureAwardsServiceImpl implements ISchoolXlectureAwardsSer
* @return 结果
*/
@Override
@Transactional
public int insertSchoolXlectureAwards(SchoolXlectureAwards schoolXlectureAwards)
{
schoolXlectureAwards.setCreateBy(SecurityUtils.getUsername());
schoolXlectureAwards.setCreateTime(DateUtils.getNowDate());
return schoolXlectureAwardsMapper.insertSchoolXlectureAwards(schoolXlectureAwards);
}
......@@ -64,8 +69,10 @@ public class SchoolXlectureAwardsServiceImpl implements ISchoolXlectureAwardsSer
* @return 结果
*/
@Override
@Transactional
public int updateSchoolXlectureAwards(SchoolXlectureAwards schoolXlectureAwards)
{
schoolXlectureAwards.setUpdateBy(SecurityUtils.getUsername());
schoolXlectureAwards.setUpdateTime(DateUtils.getNowDate());
return schoolXlectureAwardsMapper.updateSchoolXlectureAwards(schoolXlectureAwards);
}
......@@ -93,4 +100,14 @@ public class SchoolXlectureAwardsServiceImpl implements ISchoolXlectureAwardsSer
{
return schoolXlectureAwardsMapper.deleteSchoolXlectureAwardsById(id);
}
/**
* 审核
* @param schoolXlectureAwards
* @return
*/
@Override
public int audit(SchoolXlectureAwards schoolXlectureAwards) {
return schoolXlectureAwardsMapper.updateSchoolXlectureAwards(schoolXlectureAwards);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteacherAwardsServiceImpl.java
......@@ -2,11 +2,14 @@ package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.util.List;
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 org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteacherAwards;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteacherAwardsMapper;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteacherAwardsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
/**
* 教师获奖Service业务层处理
......@@ -27,7 +30,7 @@ public class SchoolXteacherAwardsServiceImpl implements ISchoolXteacherAwardsSer
* @return 教师获奖
*/
@Override
public SchoolXteacherAwards selectSchoolXteacherAwardsById(Long id)
public SchoolXteacherAwardsVo selectSchoolXteacherAwardsById(Long id)
{
return schoolXteacherAwardsMapper.selectSchoolXteacherAwardsById(id);
}
......@@ -35,13 +38,13 @@ public class SchoolXteacherAwardsServiceImpl implements ISchoolXteacherAwardsSer
/**
* 查询教师获奖列表
*
* @param schoolXteacherAwards 教师获奖
* @param schoolXteacherAwardsVo 教师获奖
* @return 教师获奖
*/
@Override
public List<SchoolXteacherAwards> selectSchoolXteacherAwardsList(SchoolXteacherAwards schoolXteacherAwards)
public List<SchoolXteacherAwardsVo> selectSchoolXteacherAwardsList(SchoolXteacherAwardsVo schoolXteacherAwardsVo)
{
return schoolXteacherAwardsMapper.selectSchoolXteacherAwardsList(schoolXteacherAwards);
return schoolXteacherAwardsMapper.selectSchoolXteacherAwardsList(schoolXteacherAwardsVo);
}
/**
......@@ -51,8 +54,10 @@ public class SchoolXteacherAwardsServiceImpl implements ISchoolXteacherAwardsSer
* @return 结果
*/
@Override
@Transactional
public int insertSchoolXteacherAwards(SchoolXteacherAwards schoolXteacherAwards)
{
schoolXteacherAwards.setCreateBy(SecurityUtils.getUsername());
schoolXteacherAwards.setCreateTime(DateUtils.getNowDate());
return schoolXteacherAwardsMapper.insertSchoolXteacherAwards(schoolXteacherAwards);
}
......@@ -64,8 +69,10 @@ public class SchoolXteacherAwardsServiceImpl implements ISchoolXteacherAwardsSer
* @return 结果
*/
@Override
@Transactional
public int updateSchoolXteacherAwards(SchoolXteacherAwards schoolXteacherAwards)
{
schoolXteacherAwards.setUpdateBy(SecurityUtils.getUsername());
schoolXteacherAwards.setUpdateTime(DateUtils.getNowDate());
return schoolXteacherAwardsMapper.updateSchoolXteacherAwards(schoolXteacherAwards);
}
......@@ -93,4 +100,14 @@ public class SchoolXteacherAwardsServiceImpl implements ISchoolXteacherAwardsSer
{
return schoolXteacherAwardsMapper.deleteSchoolXteacherAwardsById(id);
}
/**
* 审核
* @param schoolXteacherAwards
* @return
*/
@Override
public int audit(SchoolXteacherAwards schoolXteacherAwards) {
return schoolXteacherAwardsMapper.updateSchoolXteacherAwards(schoolXteacherAwards);
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteachingAchievementsServiceImpl.java
package yangtz.cs.liu.campus.service.impl.schoolNewTeacherDzdn;
import java.io.*;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
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 org.springframework.transaction.annotation.Transactional;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteachingAchievementsMapper;
import yangtz.cs.liu.campus.mapper.teacher.SchoolTeacherMapper;
import yangtz.cs.liu.campus.service.impl.schoolAnnualAssessment.SchoolAnnualAssessmentServiceImpl;
import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import javax.servlet.http.HttpServletResponse;
/**
* 教学成绩Service业务层处理
......@@ -15,10 +37,16 @@ import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchieve
* @date 2023-12-06
*/
@Service
public class SchoolXteachingAchievementsServiceImpl implements ISchoolXteachingAchievementsService
public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXteachingAchievementsMapper,SchoolXteachingAchievements> implements ISchoolXteachingAchievementsService
{
@Autowired
private SchoolXteachingAchievementsMapper schoolXteachingAchievementsMapper;
@Autowired
private SysDictDataMapper sysDictDataMapper;
@Autowired
private SchoolTeacherMapper schoolTeacherMapper;
private Logger log = LoggerFactory.getLogger(SchoolXteachingAchievementsServiceImpl.class);
/**
* 查询教学成绩
......@@ -27,7 +55,7 @@ public class SchoolXteachingAchievementsServiceImpl implements ISchoolXteachingA
* @return 教学成绩
*/
@Override
public SchoolXteachingAchievements selectSchoolXteachingAchievementsById(Long id)
public SchoolXteachingAchievementsVo selectSchoolXteachingAchievementsById(Long id)
{
return schoolXteachingAchievementsMapper.selectSchoolXteachingAchievementsById(id);
}
......@@ -35,13 +63,13 @@ public class SchoolXteachingAchievementsServiceImpl implements ISchoolXteachingA
/**
* 查询教学成绩列表
*
* @param schoolXteachingAchievements 教学成绩
* @param schoolXteachingAchievementsVo 教学成绩
* @return 教学成绩
*/
@Override
public List<SchoolXteachingAchievements> selectSchoolXteachingAchievementsList(SchoolXteachingAchievements schoolXteachingAchievements)
public List<SchoolXteachingAchievementsVo> selectSchoolXteachingAchievementsList(SchoolXteachingAchievementsVo schoolXteachingAchievementsVo)
{
return schoolXteachingAchievementsMapper.selectSchoolXteachingAchievementsList(schoolXteachingAchievements);
return schoolXteachingAchievementsMapper.selectSchoolXteachingAchievementsList(schoolXteachingAchievementsVo);
}
/**
......@@ -51,8 +79,32 @@ public class SchoolXteachingAchievementsServiceImpl implements ISchoolXteachingA
* @return 结果
*/
@Override
@Transactional
public int insertSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements)
{
//根据身份证号查询用户，是否存在
SchoolTeacher schoolTeacher = schoolTeacherMapper.selectTeacher(schoolXteachingAchievements.getIdCard());
if (StringUtils.isNull(schoolTeacher)){
throw new ServiceException("用户不存在，请重新输入！");
} else if (!schoolTeacher.getTeacherName().contains(schoolXteachingAchievements.getUserName())){
throw new ServiceException("姓名和身份证姓名不匹配，请重新输入！");
}
schoolXteachingAchievements.setUserId(schoolTeacher.getId());
//判断班级是否正确
String className = schoolXteachingAchievements.getClassName();
//将所有中文逗号替换成英文逗号
String newClassName = className.replaceAll("，", ",");
String[] split = newClassName.split(",");
for (int i = 0; i < split.length; i++) {
if (!split[i].matches("\\d+")){
throw new ServiceException("班级输入错误，请重新输入！");
}
}
//判断考核分是否正确
if (!schoolXteachingAchievements.getAssessmentScore().toString().matches("\\d+(\\.\\d+)?")){
throw new ServiceException("考核分输入错误，请重新输入！");
}
schoolXteachingAchievements.setCreateBy(SecurityUtils.getUsername());
schoolXteachingAchievements.setCreateTime(DateUtils.getNowDate());
return schoolXteachingAchievementsMapper.insertSchoolXteachingAchievements(schoolXteachingAchievements);
}
......@@ -64,8 +116,32 @@ public class SchoolXteachingAchievementsServiceImpl implements ISchoolXteachingA
* @return 结果
*/
@Override
@Transactional
public int updateSchoolXteachingAchievements(SchoolXteachingAchievements schoolXteachingAchievements)
{
//根据身份证号查询用户，是否存在
SchoolTeacher schoolTeacher = schoolTeacherMapper.selectTeacher(schoolXteachingAchievements.getIdCard());
if (StringUtils.isNull(schoolTeacher)){
throw new ServiceException("用户不存在，请重新输入！");
} else if (!schoolTeacher.getTeacherName().contains(schoolXteachingAchievements.getUserName())){
throw new ServiceException("姓名和身份证姓名不匹配，请重新输入！");
}
schoolXteachingAchievements.setUserId(schoolTeacher.getId());
//判断班级是否正确
String className = schoolXteachingAchievements.getClassName();
//将所有中文逗号替换成英文逗号
String newClassName = className.replaceAll("，", ",");
String[] split = newClassName.split(",");
for (int i = 0; i < split.length; i++) {
if (!split[i].matches("\\d+")){
throw new ServiceException("班级输入错误，请重新输入！");
}
}
//判断考核分是否正确
if (!schoolXteachingAchievements.getAssessmentScore().toString().matches("\\d+(\\.\\d+)?")){
throw new ServiceException("考核分输入错误，请重新输入！");
}
schoolXteachingAchievements.setUpdateBy(SecurityUtils.getUsername());
schoolXteachingAchievements.setUpdateTime(DateUtils.getNowDate());
return schoolXteachingAchievementsMapper.updateSchoolXteachingAchievements(schoolXteachingAchievements);
}
......@@ -93,4 +169,236 @@ public class SchoolXteachingAchievementsServiceImpl implements ISchoolXteachingA
{
return schoolXteachingAchievementsMapper.deleteSchoolXteachingAchievementsById(id);
}
/**
* 获取所有用户
* @return
*/
@Override
public List<Map<String, Object>> getUserList(SysUser sysUser) {
return schoolXteachingAchievementsMapper.getUserList(sysUser);
}
/**
* 下载模板
* @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());
}
}
/**
* 校验教学成绩数据
* @param list
*/
@Override
public void checkImport(List<SchoolXteachingAchievements> list) {
//检验是否为空
if (StringUtils.isNull(list) || list.size() == 0) {
throw new ServiceException("导入数据不能为空");
}
//查询学期字典键值
List<SysDictData> semester = sysDictDataMapper.selectDictDataByType("semester_jsdzda");
//查询考试类型字典键值
List<SysDictData> examType = sysDictDataMapper.selectDictDataByType("exam_typeda");
//查询年级字典键值
List<SysDictData> grade = sysDictDataMapper.selectDictDataByType("grade_da");
//查询学科字典键值
List<SysDictData> sub = sysDictDataMapper.selectDictDataByType("sub_dzdn");
//查询班级类型字典键值
List<SysDictData> type = sysDictDataMapper.selectDictDataByType("class_type");
// 准备记录日志数据
int failureNum = 0;
StringBuilder failureMsg = new StringBuilder();
for (SchoolXteachingAchievements schoolXteachingAchievements : list) {
if (StringUtils.isNull(schoolXteachingAchievements.getSchoolYear())) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学年为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getSemester())) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学期为空,请您重新输入! ");
} else if (StringUtils.isNull(schoolXteachingAchievements.getExamTime())) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考试时间为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getExamType())) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考试类型为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getYear())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、届别为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getGrade())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、年级为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getUserName())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、姓名为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getIdCard())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、身份证号为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getSub())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学科为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getClassName())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、班级为空,请您重新输入! ");
} else if (StringUtils.isEmpty(schoolXteachingAchievements.getClassType())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、班级类型为空,请您重新输入! ");
} else if (StringUtils.isNull(schoolXteachingAchievements.getAssessmentScore())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考核分为空,请您重新输入! ");
} else {
//判断学年输入是否正确
String schoolYear = schoolXteachingAchievements.getSchoolYear();
if (!schoolYear.contains("-")){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学年输入格式错误,请您重新输入! ");
}else {
String[] split = schoolYear.split("-");
if (split.length > 2){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学年输入格式错误,请您重新输入! ");
} else if (!(split[0].matches("\\d+") && split[1].matches("\\d+"))){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学年输入格式错误,请您重新输入! ");
}
}
//判断学期是否正确
for (SysDictData sysDictData : semester) {
if (!sysDictData.getDictValue().equals(schoolXteachingAchievements.getSemester())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学期输入错误,请您重新输入! ");
}
}
//判断考试时间是否符合格式
Date examTime = schoolXteachingAchievements.getExamTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
sdf.parse(examTime.toString());
} catch (ParseException e) {
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考试时间输入格式有误,请您重新输入! ");
}
//判断考试类型是否正确
for (SysDictData sysDictData : examType) {
if (!sysDictData.getDictValue().equals(schoolXteachingAchievements.getExamType())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考试类型输入错误,请您重新输入! ");
}
}
//判断届别是否正确
if (!schoolXteachingAchievements.getYear().matches("\\d+")){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、届别输入错误,请您重新输入! ");
}
//判断年级是否正确
for (SysDictData sysDictData : grade) {
if (!sysDictData.getDictValue().equals(schoolXteachingAchievements.getGrade())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、年级输入错误,请您重新输入! ");
}
}
//判断学科是否正确
for (SysDictData sysDictData : sub) {
if (!sysDictData.getDictValue().equals(schoolXteachingAchievements.getSub())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、学科输入错误,请您重新输入! ");
}
}
//判断班级是否正确
String className = schoolXteachingAchievements.getClassName();
//将所有中文逗号替换成英文逗号
String newClassName = className.replaceAll("，", ",");
String[] split = newClassName.split(",");
for (int i = 0; i < split.length; i++) {
if (!split[i].matches("\\d+")){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、班级输入错误,请您重新输入! ");
}
}
//判断班级类型是否正确
String classType = schoolXteachingAchievements.getClassType();
//将所有中文逗号换成英文逗号
String newClassType = classType.replaceAll("，", ",");
String[] split1 = newClassType.split(",");
for (String ctype : split1) {
for (SysDictData sysDictData : type) {
if (!ctype.equals(sysDictData.getDictLabel())){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、班级类型输入错误,请您重新输入! ");
}
}
}
//判断考核分是否正确
if (!schoolXteachingAchievements.getAssessmentScore().toString().matches("\\d+(\\.\\d+)?")){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、考核分输入错误,请您重新输入! ");
}
//根据身份证号查询用户，是否存在
SchoolTeacher schoolTeacher = schoolTeacherMapper.selectTeacher(schoolXteachingAchievements.getIdCard());
if (StringUtils.isNull(schoolTeacher)){
failureNum++;
failureMsg.append("<br/>" + failureNum + "、姓名为" + schoolXteachingAchievements.getUserName() + "的用户不存在,请您重新输入! ");
} else if (!schoolTeacher.getTeacherName().contains(schoolXteachingAchievements.getUserName())){
//判断输入的姓名与身份证查出来的用户名是否匹配
failureNum++;
failureMsg.append("<br/>" + failureNum + "、姓名为" + schoolXteachingAchievements.getUserName() + "的用户不存在,请您重新输入! ");
}
schoolXteachingAchievements.setUserId(schoolTeacher.getId());
}
}
if (failureNum > 0) {
failureMsg.insert(0, "很抱歉，导入失败！共" + failureNum + "条数据格式不正确，错误如下：");
throw new ServiceException(failureMsg.toString());
}
}
/**
* 导入教学成绩数据
* @param list
* @return
*/
@Override
public String importData(List<SchoolXteachingAchievements> list) {
StringBuilder successMsg = new StringBuilder();
//批量导入年度考核数据
boolean b = saveBatch(list);
if (!b){
throw new ServiceException("导入失败");
}
successMsg.insert(0, "恭喜您，数据已导入成功！");
return successMsg.toString();
}
}
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 yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo;
import java.util.List;
/**
......@@ -17,15 +19,15 @@ public interface ISchoolXacademicWorksService
* @param id 论文著作主键
* @return 论文著作
*/
public SchoolXacademicWorks selectSchoolXacademicWorksById(Long id);
public SchoolXacademicWorksVo selectSchoolXacademicWorksById(Long id);
/**
* 查询论文著作列表
*
* @param schoolXacademicWorks 论文著作
* @param schoolXacademicWorksVo 论文著作
* @return 论文著作集合
*/
public List<SchoolXacademicWorks> selectSchoolXacademicWorksList(SchoolXacademicWorks schoolXacademicWorks);
public List<SchoolXacademicWorksVo> selectSchoolXacademicWorksList(SchoolXacademicWorksVo schoolXacademicWorksVo);
/**
* 新增论文著作
......@@ -58,4 +60,12 @@ public interface ISchoolXacademicWorksService
* @return 结果
*/
public int deleteSchoolXacademicWorksById(Long id);
/**
* 审核
* @param schoolXacademicWorks
* @return
*/
int audit(SchoolXacademicWorks schoolXacademicWorks);
}
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 yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo;
import java.util.List;
......@@ -18,15 +19,15 @@ public interface ISchoolXcomprehensiveHonorsService
* @param id 综合荣誉主键
* @return 综合荣誉
*/
public SchoolXcomprehensiveHonors selectSchoolXcomprehensiveHonorsById(Long id);
public SchoolXcomprehensiveHonorsVo selectSchoolXcomprehensiveHonorsById(Long id);
/**
* 查询综合荣誉列表
*
* @param schoolXcomprehensiveHonors 综合荣誉
* @param schoolXcomprehensiveHonorsVo 综合荣誉
* @return 综合荣誉集合
*/
public List<SchoolXcomprehensiveHonors> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
public List<SchoolXcomprehensiveHonorsVo> selectSchoolXcomprehensiveHonorsList(SchoolXcomprehensiveHonorsVo schoolXcomprehensiveHonorsVo);
/**
* 新增综合荣誉
......@@ -59,4 +60,12 @@ public interface ISchoolXcomprehensiveHonorsService
* @return 结果
*/
public int deleteSchoolXcomprehensiveHonorsById(Long id);
/**
* 审核
* @param schoolXcomprehensiveHonors
* @return
*/
int audit(SchoolXcomprehensiveHonors schoolXcomprehensiveHonors);
}
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 yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo;
import java.util.List;
......@@ -18,15 +19,15 @@ public interface ISchoolXlectureAwardsService
* @param id 讲课获奖主键
* @return 讲课获奖
*/
public SchoolXlectureAwards selectSchoolXlectureAwardsById(Long id);
public SchoolXlectureAwardsVo selectSchoolXlectureAwardsById(Long id);
/**
* 查询讲课获奖列表
*
* @param schoolXlectureAwards 讲课获奖
* @param schoolXlectureAwardsVo 讲课获奖
* @return 讲课获奖集合
*/
public List<SchoolXlectureAwards> selectSchoolXlectureAwardsList(SchoolXlectureAwards schoolXlectureAwards);
public List<SchoolXlectureAwardsVo> selectSchoolXlectureAwardsList(SchoolXlectureAwardsVo schoolXlectureAwardsVo);
/**
* 新增讲课获奖
......@@ -59,4 +60,11 @@ public interface ISchoolXlectureAwardsService
* @return 结果
*/
public int deleteSchoolXlectureAwardsById(Long id);
/**
* 审核
* @param schoolXlectureAwards
* @return
*/
int audit(SchoolXlectureAwards schoolXlectureAwards);
}
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 yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo;
import java.util.List;
......@@ -18,15 +19,15 @@ public interface ISchoolXteacherAwardsService
* @param id 教师获奖主键
* @return 教师获奖
*/
public SchoolXteacherAwards selectSchoolXteacherAwardsById(Long id);
public SchoolXteacherAwardsVo selectSchoolXteacherAwardsById(Long id);
/**
* 查询教师获奖列表
*
* @param schoolXteacherAwards 教师获奖
* @param schoolXteacherAwardsVo 教师获奖
* @return 教师获奖集合
*/
public List<SchoolXteacherAwards> selectSchoolXteacherAwardsList(SchoolXteacherAwards schoolXteacherAwards);
public List<SchoolXteacherAwardsVo> selectSchoolXteacherAwardsList(SchoolXteacherAwardsVo schoolXteacherAwardsVo);
/**
* 新增教师获奖
......@@ -59,4 +60,11 @@ public interface ISchoolXteacherAwardsService
* @return 结果
*/
public int deleteSchoolXteacherAwardsById(Long id);
/**
* 审核
* @param schoolXteacherAwards
* @return
*/
int audit(SchoolXteacherAwards schoolXteacherAwards);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteachingAchievementsService.java
package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser;
import yangtz.cs.liu.campus.domain.schoolAnnualAssessment.SchoolAnnualAssessment;
import yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolXteachingAchievements;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 教学成绩Service接口
......@@ -10,7 +16,7 @@ import java.util.List;
* @author ruoyi
* @date 2023-12-06
*/
public interface ISchoolXteachingAchievementsService
public interface ISchoolXteachingAchievementsService extends IService<SchoolXteachingAchievements>
{
/**
* 查询教学成绩
......@@ -18,15 +24,15 @@ public interface ISchoolXteachingAchievementsService
* @param id 教学成绩主键
* @return 教学成绩
*/
public SchoolXteachingAchievements selectSchoolXteachingAchievementsById(Long id);
public SchoolXteachingAchievementsVo selectSchoolXteachingAchievementsById(Long id);
/**
* 查询教学成绩列表
*
* @param schoolXteachingAchievements 教学成绩
* @param schoolXteachingAchievementsVo 教学成绩
* @return 教学成绩集合
*/
public List<SchoolXteachingAchievements> selectSchoolXteachingAchievementsList(SchoolXteachingAchievements schoolXteachingAchievements);
public List<SchoolXteachingAchievementsVo> selectSchoolXteachingAchievementsList(SchoolXteachingAchievementsVo schoolXteachingAchievementsVo);
/**
* 新增教学成绩
......@@ -59,4 +65,29 @@ public interface ISchoolXteachingAchievementsService
* @return 结果
*/
public int deleteSchoolXteachingAchievementsById(Long id);
/**
* 获取所有用户
* @return
*/
List<Map<String,Object>> getUserList(SysUser sysUser);
/**
* 下载模板
* @param response
*/
void importTemplate(HttpServletResponse response);
/**
* 校验导入数据
* @param list
*/
void checkImport(List<SchoolXteachingAchievements> list);
/**
* 导入数据
* @param list
* @return
*/
String importData(List<SchoolXteachingAchievements> list);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolNewTeacherDzdn/SchoolXacademicWorksVo.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 SchoolXacademicWorksVo
{
@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=其他")
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;
/** 开始时间 */
@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/SchoolXcomprehensiveHonorsVo.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 SchoolXcomprehensiveHonorsVo
{
@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 = "获奖类别")
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;
/** 获奖时间（年月日） */
@Excel(name = "获奖时间")
@JsonFormat(pattern = "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;
/** 开始时间 */
@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/SchoolXlectureAwardsVo.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 SchoolXlectureAwardsVo
{
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 序号 */
@Excel(name = "序号")
private Integer xh;
/** 成长类型 */
@Excel(name = "成长类型")
private String growthType;
/** 学科 */
@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=示范课")
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;
/** 开始时间 */
@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 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 SchoolXteacherAwardsVo
{
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 序号 */
@Excel(name = "序号")
private Integer xh;
/** 成长类型 */
@Excel(name = "成长类型")
private String growthType;
/** 学科 */
@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=其他,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 = "成果名称")
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;
/** 开始时间 */
@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/SchoolXteachingAchievementsVo.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.math.BigDecimal;
import java.util.Date;
@Data
public class SchoolXteachingAchievementsVo {
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@Excel(name = "序号")
private Integer xh;
/** 学年(下拉框) */
@Excel(name = "学年",combo = {"2018-2019","2019-2020","2020-2021","2021-2022","2022-2023","2023-2024","2024-2025","2025-2026",
"2026-2027","2027-2028","2028-2029","2029-2030","2030-2031","2031-2032","2032-2033"})
private String schoolYear;
/** 学期（下拉框） */
@Excel(name = "学期",combo = {"第一学期","第二学期"}, readConverterExp = "1=第一学期,2=第二学期")
private String semester;
/** 考试时间（年月日） */
@Excel(name = "考试时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date examTime;
/** 考试类型（下拉框） */
@Excel(name = "考试类型",combo = {"月考","期中","期末","一模","二模","三模","高考","其它"},
readConverterExp = "1=月考,2=期中,3=期末,4=一模,5=二模,6=三模,7=高考,8=其它")
private String examType;
/** 届别(下拉框) */
@Excel(name = "届别", combo = {"2018","2019","2020","2021","2022","2023","2024","2025","2026","2027","2028","2029","2030","2031","2032","2033"})
private String year;
/** 年级（下拉框） */
@Excel(name = "年级", combo = {"高一","高二","高三"})
private String grade;
/** 用户id */
private Long userId;
/** 用户姓名 */
@Excel(name = "姓名")
private String userName;
/** 身份证号 */
private String idCard;
/** 学科 */
@Excel(name = "学科",combo = {"语文","数学","英语","物理","化学","生物","政治","历史","地理","音乐","体育","美术","技术","心理","书法"},
readConverterExp = "1=语文,2=数学,3=英语,4=物理,5=化学,6=生物,7=政治,8=历史,9=地理,10=音乐,11=体育,12=美术,13=技术,14=心理,15=书法")
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;
/** 备注 */
private String remark;
/** 删除状态 */
private String delFlag;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
}
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXacademicWorksMapper.xml
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXacademicWorksMapper">
<resultMap type="SchoolXacademicWorks" id="SchoolXacademicWorksResult">
<resultMap type="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo" id="SchoolXacademicWorksResult">
<result property="id" column="id" />
<result property="sub" column="sub" />
<result property="awardType" column="award_type" />
......@@ -18,6 +18,7 @@
<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" />
......@@ -26,10 +27,11 @@
</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
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_xacademic_works
</sql>
<select id="selectSchoolXacademicWorksList" parameterType="SchoolXacademicWorks" resultMap="SchoolXacademicWorksResult">
<select id="selectSchoolXacademicWorksList" parameterType="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXacademicWorksVo" resultMap="SchoolXacademicWorksResult">
<include refid="selectSchoolXacademicWorksVo"/>
<where>
del_flag = '0'
......@@ -44,8 +46,10 @@
<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 create_time DESC
order by create_time DESC
</select>
<select id="selectSchoolXacademicWorksById" parameterType="Long" resultMap="SchoolXacademicWorksResult">
......@@ -68,6 +72,7 @@
<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="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>
......@@ -87,6 +92,7 @@
<if test="remark != null">#{remark},</if>
<if test="pictureName != null and pictureName != ''">#{pictureName},</if>
<if test="pictureUrl != null and pictureUrl != ''">#{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>
......@@ -110,6 +116,7 @@
<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="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>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsMapper.xml
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsMapper">
<resultMap type="SchoolXcomprehensiveHonors" id="SchoolXcomprehensiveHonorsResult">
<resultMap type="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo" id="SchoolXcomprehensiveHonorsResult">
<result property="id" column="id" />
<result property="sub" column="sub" />
<result property="awardType" column="award_type" />
......@@ -18,6 +18,7 @@
<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" />
......@@ -26,15 +27,16 @@
</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
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_xcomprehensive_honors
</sql>
<select id="selectSchoolXcomprehensiveHonorsList" parameterType="SchoolXcomprehensiveHonors" resultMap="SchoolXcomprehensiveHonorsResult">
<select id="selectSchoolXcomprehensiveHonorsList" parameterType="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXcomprehensiveHonorsVo" 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="awardType != null and awardType != ''"> and award_type like concat('%', #{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>
......@@ -44,6 +46,8 @@
<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>
......@@ -68,6 +72,7 @@
<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="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>
......@@ -87,6 +92,7 @@
<if test="remark != null">#{remark},</if>
<if test="pictureName != null and pictureName != ''">#{pictureName},</if>
<if test="pictureUrl != null and pictureUrl != ''">#{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>
......@@ -110,6 +116,7 @@
<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="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>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXlectureAwardsMapper.xml
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXlectureAwardsMapper">
<resultMap type="SchoolXlectureAwards" id="SchoolXlectureAwardsResult">
<resultMap type="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo" id="SchoolXlectureAwardsResult">
<result property="id" column="id" />
<result property="sub" column="sub" />
<result property="awardType" column="award_type" />
......@@ -18,6 +18,7 @@
<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="upate_by" />
......@@ -26,10 +27,11 @@
</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
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_xlecture_awards
</sql>
<select id="selectSchoolXlectureAwardsList" parameterType="SchoolXlectureAwards" resultMap="SchoolXlectureAwardsResult">
<select id="selectSchoolXlectureAwardsList" parameterType="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXlectureAwardsVo" resultMap="SchoolXlectureAwardsResult">
<include refid="selectSchoolXlectureAwardsVo"/>
<where>
del_flag = '0'
......@@ -44,6 +46,8 @@
<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>
......@@ -68,6 +72,7 @@
<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="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>
......@@ -87,6 +92,7 @@
<if test="remark != null">#{remark},</if>
<if test="pictureName != null and pictureName != ''">#{pictureName},</if>
<if test="pictureUrl != null and pictureUrl != ''">#{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>
......@@ -110,6 +116,7 @@
<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="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>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteacherAwardsMapper.xml
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteacherAwardsMapper">
<resultMap type="SchoolXteacherAwards" id="SchoolXteacherAwardsResult">
<resultMap type="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo" id="SchoolXteacherAwardsResult">
<result property="id" column="id" />
<result property="sub" column="sub" />
<result property="awardType" column="award_type" />
......@@ -18,6 +18,7 @@
<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" />
......@@ -26,10 +27,11 @@
</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
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_xteacher_awards
</sql>
<select id="selectSchoolXteacherAwardsList" parameterType="SchoolXteacherAwards" resultMap="SchoolXteacherAwardsResult">
<select id="selectSchoolXteacherAwardsList" parameterType="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteacherAwardsVo" resultMap="SchoolXteacherAwardsResult">
<include refid="selectSchoolXteacherAwardsVo"/>
<where>
del_flag = '0'
......@@ -44,6 +46,8 @@
<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>
......@@ -68,6 +72,7 @@
<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="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>
......@@ -87,6 +92,7 @@
<if test="remark != null">#{remark},</if>
<if test="pictureName != null and pictureName != ''">#{pictureName},</if>
<if test="pictureUrl != null and pictureUrl != ''">#{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>
......@@ -110,6 +116,7 @@
<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="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>
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml
......@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.schoolNewTeacherDzdn.SchoolXteachingAchievementsMapper">
<resultMap type="SchoolXteachingAchievements" id="SchoolXteachingAchievementsResult">
<resultMap type="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo" id="SchoolXteachingAchievementsResult">
<result property="id" column="id" />
<result property="schoolYear" column="school_year" />
<result property="semester" column="semester" />
......@@ -31,7 +31,7 @@
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">
<select id="selectSchoolXteachingAchievementsList" parameterType="yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo" resultMap="SchoolXteachingAchievementsResult">
<include refid="selectSchoolXteachingAchievementsVo"/>
<where>
del_flag = '0'
......@@ -48,6 +48,7 @@
<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>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' "> and exam_time BETWEEN #{startTime} AND #{endTime}</if>
</where>
order by create_time DESC
</select>
......@@ -139,4 +140,19 @@
#{id}
</foreach>
</update>
<select id="getUserList" resultType="Map" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
SELECT
user_id as userId,
user_name as userName,
phonenumber as phone
FROM
sys_user
WHERE
del_flag = '0'
AND `status` = '0'
<if test="userName != null and userName != ''">
AND user_name like concat('%', #{userName}, '%')
</if>
</select>
</mapper>
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