Commit 9d2af5d4 by zhaopanyu

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents 0409a5c2 5dab7abc
......@@ -10,7 +10,7 @@ spring:
# username: root
# password: password
master:
url: jdbc:mysql://1.116.38.25:3986/school_platform?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
url: jdbc:mysql://1.116.38.25:3986/dd_smart_school?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: root
password: qianhe2022
# master:
......
......@@ -12,7 +12,7 @@ ruoyi:
profile: D:/ruoyi/uploadPath
# profile: /home/ruoyi/uploadPath
#指定上传文件到哪个服务器,读取文件(本地选localhost,测试选47.105.176.202,试运行选10.20.100.201)
serverAddress: http://192.168.1.109:8848
serverAddress: http://47.105.176.202:5112
# serverAddress: http://47.105.176.202:8137
# serverAddress: http://10.20.100.201:57321
# 获取ip地址开关
......@@ -24,6 +24,7 @@ ruoyi:
server:
# 服务器的HTTP端口,默认为8080
# port: 8137
# port: 8849
port: 8848
#学校内网PC端口
# port: 57321
......@@ -89,19 +90,22 @@ spring:
redis:
# 地址
# host: localhost
host: 43.143.63.140
host: 1.116.38.25
# host: 43.143.63.140
# host: 47.105.176.202
# host: 127.0.0.1
# 端口,默认为6379
# port: 8134
# port: 6379
port: 16379
port: 7789
# port: 16379
# port: 9121
# 数据库索引
database: 11
database: 10
# 密码
# password:
password: lbt18062367596
password: qianheRedis2021
# password: lbt18062367596
# 连接超时时间
timeout: 10s
lettuce:
......@@ -196,6 +200,27 @@ wx:
redirect-uri: www.dyzmxx.com
# redirect-uri: y32025c600.goho.co:10087
dd:
appKey: dingclpf8qoxvinhksyh
appSecret: CrlRmzkaFMH00cbipSf3g0nc_xpFGCitTAPA_cphUXg1e-DSX1hFcyVpqgos29r9
# 钉钉接口 获取钉钉access_token 的uri
access-token-uri: https://oapi.dingtalk.com/gettoken?appkey=${dd.appKey}&appsecret=${dd.appSecret}
#企业id
corpId: dingaa3937ff8b7dd267f2c783f7214b6d69
#应用id
agentId: 2730043705
#重定向地址
redirect-uri: www.dyzmxx.com
dd_template:
# 职工请假消息模板
leaveTemplateCode: PROC-D907CDA3-F8C7-4E4F-8A8B-6A9E71287295
# 礼堂预约模板
auditoriumCode: PROC-DB0E3FEC-562B-4023-AA4A-CC33963D3537
template:
# 请假消息模板
leaveTemplateId: IHPndMRdTsO5zd4yC4K0yjtSw73QMrDiEqzsmbgJP2U
......
......@@ -355,6 +355,32 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
return term;
}
public static TermRange getTermRange(String year, String noticeSemester){
TermRange termRange = new TermRange();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
switch (noticeSemester){
case "上学期":
case "上":
Calendar startDay = Calendar.getInstance();
startDay.set(Integer.parseInt(year), 7, 1);
termRange.setStartDay(sdf.format(startDay.getTime()));
Calendar endDay = Calendar.getInstance();
endDay.set(Integer.parseInt(year)+1, 0, 31);
termRange.setEndDay(sdf.format(endDay.getTime()));
break;
case "下学期":
case "下":
Calendar xstartDay = Calendar.getInstance();
xstartDay.set(Integer.parseInt(year), 1, 1);
termRange.setStartDay(sdf.format(xstartDay.getTime()));
Calendar xendDay = Calendar.getInstance();
xendDay.set(Integer.parseInt(year), 6, 31);
termRange.setEndDay(sdf.format(xendDay.getTime()));
break;
}
return termRange;
}
public static void main(String[] args) {
System.out.println(getSchoolYear(getNowDate()));;
System.out.println(getTerm(getNowDate()));;
......
package com.ruoyi.common.utils;
import lombok.Data;
@Data
public class TermRange {
private String startDay;
private String endDay;
}
package yangtz.cs.liu.campus.controller.teacherFiles;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 教师档案Controller
*
* @author ruoyi
* @date 2023-09-06
*/
@RestController
@RequestMapping("/teacherFiles/files")
public class TeacherFilesController extends BaseController
{
@Autowired
private ITeacherFilesService teacherFilesService;
/**
* 查询教师档案列表
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:files:list')")
@GetMapping("/list")
public TableDataInfo list(TeacherFiles teacherFiles)
{
startPage();
List<TeacherFiles> list = teacherFilesService.selectTeacherFilesList(teacherFiles);
return getDataTable(list);
}
/**
* 导出教师档案列表
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:files:export')")
@Log(title = "教师档案", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TeacherFiles teacherFiles)
{
List<TeacherFiles> list = teacherFilesService.selectTeacherFilesList(teacherFiles);
ExcelUtil<TeacherFiles> util = new ExcelUtil<TeacherFiles>(TeacherFiles.class);
util.exportExcel(response, list, "教师档案数据");
}
/**
* 获取教师档案详细信息
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:files:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return AjaxResult.success(teacherFilesService.selectTeacherFilesById(id));
}
/**
* 新增教师档案
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:files:add')")
@Log(title = "教师档案", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TeacherFiles teacherFiles)
{
return toAjax(teacherFilesService.insertTeacherFiles(teacherFiles));
}
/**
* 修改教师档案
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:files:edit')")
@Log(title = "教师档案", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TeacherFiles teacherFiles)
{
return toAjax(teacherFilesService.updateTeacherFiles(teacherFiles));
}
/**
* 删除教师档案
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:files:remove')")
@Log(title = "教师档案", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(teacherFilesService.deleteTeacherFilesByIds(ids));
}
/**
* 教师档案同步
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:files:edit')")
@Log(title = "教师档案同步", businessType = BusinessType.UPDATE)
@PutMapping("/synchronous/{id}")
public AjaxResult synchronous(@PathVariable("id") Long id)
{
return toAjax(teacherFilesService.synchronous(id));
}
}
package yangtz.cs.liu.campus.controller.teacherFiles;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 教师档案通知Controller
*
* @author ruoyi
* @date 2023-09-06
*/
@RestController
@RequestMapping("/teacherFiles/notice")
public class TeacherFilesNoticeController extends BaseController
{
@Autowired
private ITeacherFilesNoticeService teacherFilesNoticeService;
/**
* 查询教师档案通知列表
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:list')")
@GetMapping("/list")
public TableDataInfo list(TeacherFilesNotice teacherFilesNotice)
{
startPage();
List<TeacherFilesNoticeTotal> list = teacherFilesNoticeService.selectTeacherFilesNoticeList(teacherFilesNotice);
return getDataTable(list);
}
/**
* 导出教师档案通知列表
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:export')")
@Log(title = "教室档案通知", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TeacherFilesNotice teacherFilesNotice)
{
List<TeacherFilesNoticeTotal> list = teacherFilesNoticeService.selectTeacherFilesNoticeList(teacherFilesNotice);
ExcelUtil<TeacherFilesNoticeTotal> util = new ExcelUtil<TeacherFilesNoticeTotal>(TeacherFilesNoticeTotal.class);
util.exportExcel(response, list, "教室档案通知数据");
}
/**
* 获取教师档案通知详细信息
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return AjaxResult.success(teacherFilesNoticeService.selectTeacherFilesNoticeById(id));
}
/**
* 新增教师档案通知
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:add')")
@Log(title = "教师档案通知", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TeacherFilesNotice teacherFilesNotice)
{
return toAjax(teacherFilesNoticeService.insertTeacherFilesNotice(teacherFilesNotice));
}
/**
* 修改教师档案通知
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案通知", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TeacherFilesNotice teacherFilesNotice)
{
return toAjax(teacherFilesNoticeService.updateTeacherFilesNotice(teacherFilesNotice));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案通知发布", businessType = BusinessType.UPDATE)
@PutMapping("/release/{id}")
public AjaxResult release(@PathVariable("id") String id)
{
return toAjax(teacherFilesNoticeService.release(id));
}
/**
* 删除教师档案通知
*/
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:remove')")
@Log(title = "教师档案通知", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeByIds(ids));
}
}
package yangtz.cs.liu.campus.domain.teacherFiles;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
* 教师档案对象 teacher_files
*
* @author ruoyi
* @date 2023-09-05
*/
public class TeacherFiles extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private Long id;
/** 通知id */
@Excel(name = "通知id")
private String noticeId;
/** 档案学年学期 */
@Excel(name = "档案学年学期")
private String filesSemester;
/** 老师id */
@Excel(name = "老师id")
private Long teacherId;
/** 老师名称 */
@Excel(name = "老师名称")
private String teacherName;
/** 级部id */
@Excel(name = "级部id")
private Long gradeId;
/** 级部名称 */
@Excel(name = "级部名称")
private String gradeName;
/** 身份证号 */
@Excel(name = "身份证号")
private String idCard;
/** 0男1女 */
@Excel(name = "0男1女")
private String sex;
/** 年龄 */
@Excel(name = "年龄")
private Integer age;
/** 职称 */
@Excel(name = "职称")
private String title;
/** 学历 */
@Excel(name = "学历")
private String education;
/** 政治面貌 */
@Excel(name = "政治面貌")
private String appearance;
/** 任教学课 */
@Excel(name = "任教学课")
private String courseName;
/** 任教班级 */
@Excel(name = "任教班级")
private String className;
/** 任正班主任班级 */
@Excel(name = "任正班主任班级")
private String bzrClassName;
/** 任副班主任班级 */
@Excel(name = "任副班主任班级")
private String fbzrClassName;
/** 是否教学组长 */
@Excel(name = "是否教学组长")
private String isTeachingGroupLeader;
/** 是否教研组长 */
@Excel(name = "是否教研组长")
private String isResearchGroupLeader;
/** 设计课时 */
@Excel(name = "设计课时")
private Integer classHour;
/** 班主任情况 */
@Excel(name = "班主任情况")
private String classTeacherDetails;
/** 状态 */
@Excel(name = "状态 (1未发布 2已发布 3已填写 4已提交 5已确认 9驳回)" )
private String state;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setNoticeId(String noticeId)
{
this.noticeId = noticeId;
}
public String getNoticeId()
{
return noticeId;
}
public void setFilesSemester(String filesSemester)
{
this.filesSemester = filesSemester;
}
public String getFilesSemester()
{
return filesSemester;
}
public void setTeacherId(Long teacherId)
{
this.teacherId = teacherId;
}
public Long getTeacherId()
{
return teacherId;
}
public void setTeacherName(String teacherName)
{
this.teacherName = teacherName;
}
public String getTeacherName()
{
return teacherName;
}
public void setGradeId(Long gradeId)
{
this.gradeId = gradeId;
}
public Long getGradeId()
{
return gradeId;
}
public void setGradeName(String gradeName)
{
this.gradeName = gradeName;
}
public String getGradeName()
{
return gradeName;
}
public void setIdCard(String idCard)
{
this.idCard = idCard;
}
public String getIdCard()
{
return idCard;
}
public void setSex(String sex)
{
this.sex = sex;
}
public String getSex()
{
return sex;
}
public void setAge(Integer age)
{
this.age = age;
}
public Integer getAge()
{
return age;
}
public void setTitle(String title)
{
this.title = title;
}
public String getTitle()
{
return title;
}
public void setEducation(String education)
{
this.education = education;
}
public String getEducation()
{
return education;
}
public void setAppearance(String appearance)
{
this.appearance = appearance;
}
public String getAppearance()
{
return appearance;
}
public void setCourseName(String courseName)
{
this.courseName = courseName;
}
public String getCourseName()
{
return courseName;
}
public void setClassName(String className)
{
this.className = className;
}
public String getClassName()
{
return className;
}
public void setBzrClassName(String bzrClassName)
{
this.bzrClassName = bzrClassName;
}
public String getBzrClassName()
{
return bzrClassName;
}
public void setFbzrClassName(String fbzrClassName)
{
this.fbzrClassName = fbzrClassName;
}
public String getFbzrClassName()
{
return fbzrClassName;
}
public void setIsTeachingGroupLeader(String isTeachingGroupLeader)
{
this.isTeachingGroupLeader = isTeachingGroupLeader;
}
public String getIsTeachingGroupLeader()
{
return isTeachingGroupLeader;
}
public void setIsResearchGroupLeader(String isResearchGroupLeader)
{
this.isResearchGroupLeader = isResearchGroupLeader;
}
public String getIsResearchGroupLeader()
{
return isResearchGroupLeader;
}
public void setClassHour(Integer classHour)
{
this.classHour = classHour;
}
public Integer getClassHour()
{
return classHour;
}
public void setClassTeacherDetails(String classTeacherDetails)
{
this.classTeacherDetails = classTeacherDetails;
}
public String getClassTeacherDetails()
{
return classTeacherDetails;
}
public void setState(String state)
{
this.state = state;
}
public String getState()
{
return state;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("noticeId", getNoticeId())
.append("filesSemester", getFilesSemester())
.append("teacherId", getTeacherId())
.append("teacherName", getTeacherName())
.append("gradeId", getGradeId())
.append("gradeName", getGradeName())
.append("idCard", getIdCard())
.append("sex", getSex())
.append("age", getAge())
.append("title", getTitle())
.append("education", getEducation())
.append("appearance", getAppearance())
.append("courseName", getCourseName())
.append("className", getClassName())
.append("bzrClassName", getBzrClassName())
.append("fbzrClassName", getFbzrClassName())
.append("isTeachingGroupLeader", getIsTeachingGroupLeader())
.append("isResearchGroupLeader", getIsResearchGroupLeader())
.append("classHour", getClassHour())
.append("classTeacherDetails", getClassTeacherDetails())
.append("state", getState())
.toString();
}
}
package yangtz.cs.liu.campus.domain.teacherFiles;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 教师档案获奖情况对象 teacher_files_award
*
* @author ruoyi
* @date 2023-09-08
*/
public class TeacherFilesAward extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
private Long id;
/** 原id */
@Excel(name = "原id")
private Long tId;
/** 教师id */
@Excel(name = "教师id")
private Long filesId;
/** 获奖名称 */
@Excel(name = "获奖名称")
private String awardName;
/** 获奖时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "获奖时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date awardTime;
/** 获奖等级(1一等奖,2二等奖,3三等奖) */
@Excel(name = "获奖等级", readConverterExp = "1=一等奖,2二等奖,3三等奖")
private String gradeOfAward;
/** 发证机关 */
@Excel(name = "发证机关")
private String licenseIssuingAuthority;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void settId(Long tId)
{
this.tId = tId;
}
public Long gettId()
{
return tId;
}
public void setFilesId(Long filesId)
{
this.filesId = filesId;
}
public Long getFilesId()
{
return filesId;
}
public void setAwardName(String awardName)
{
this.awardName = awardName;
}
public String getAwardName()
{
return awardName;
}
public void setAwardTime(Date awardTime)
{
this.awardTime = awardTime;
}
public Date getAwardTime()
{
return awardTime;
}
public void setGradeOfAward(String gradeOfAward)
{
this.gradeOfAward = gradeOfAward;
}
public String getGradeOfAward()
{
return gradeOfAward;
}
public void setLicenseIssuingAuthority(String licenseIssuingAuthority)
{
this.licenseIssuingAuthority = licenseIssuingAuthority;
}
public String getLicenseIssuingAuthority()
{
return licenseIssuingAuthority;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("tId", gettId())
.append("filesId", getFilesId())
.append("awardName", getAwardName())
.append("awardTime", getAwardTime())
.append("gradeOfAward", getGradeOfAward())
.append("licenseIssuingAuthority", getLicenseIssuingAuthority())
.toString();
}
}
package yangtz.cs.liu.campus.domain.teacherFiles;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 教师档案课题编写情况对象 teacher_files_material
*
* @author ruoyi
* @date 2023-09-08
*/
public class TeacherFilesMaterial extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
private Long id;
/** 原id */
@Excel(name = "原id")
private Long tId;
/** 档案id */
@Excel(name = "档案id")
private Long filesId;
/** 名称 */
@Excel(name = "名称")
private String name;
/** 发表时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date publishTime;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void settId(Long tId)
{
this.tId = tId;
}
public Long gettId()
{
return tId;
}
public void setFilesId(Long filesId)
{
this.filesId = filesId;
}
public Long getFilesId()
{
return filesId;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setPublishTime(Date publishTime)
{
this.publishTime = publishTime;
}
public Date getPublishTime()
{
return publishTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("tId", gettId())
.append("filesId", getFilesId())
.append("name", getName())
.append("publishTime", getPublishTime())
.toString();
}
}
package yangtz.cs.liu.campus.domain.teacherFiles;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* 教室档案通知对象 teacher_files_notice
*
* @author ruoyi
* @date 2023-09-05
*/
@Data
public class TeacherFilesNotice extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private String id;
/** 范围 */
@Excel(name = "范围")
private String noticeRange;
/** 学年 */
@Excel(name = "学年")
private String noticeYear;
/** 学期 */
@Excel(name = "学期")
private String noticeSemester;
/** 通知名称 */
@Excel(name = "通知名称")
private String noticeName;
/** 状态 */
@Excel(name = "状态")
private String noticeState;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
}
package yangtz.cs.liu.campus.domain.teacherFiles;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* 教室档案通知对象 teacher_files_notice
*
* @author ruoyi
* @date 2023-09-05
*/
@Data
public class TeacherFilesNoticeTotal extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** id */
private String id;
/** 范围 */
@Excel(name = "范围")
private String noticeRange;
/** 学年 */
private String noticeYear;
/** 学期 */
private String noticeSemester;
/** 通知名称 */
@Excel(name = "通知名称")
private String noticeName;
/** 状态 */
@Excel(name = "状态(1未发布 2已发布 3已结束)")
private String noticeState;
/** 开始时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date startTime;
/** 结束时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endTime;
@Excel(name = "教师人数")
private Integer total;
@Excel(name = "填写人数")
private Integer txtotal;
@Excel(name = "级部确认")
private Integer tgtotal;
}
package yangtz.cs.liu.campus.domain.teacherFiles;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 教师档案论文情况对象 teacher_files_thesis
*
* @author ruoyi
* @date 2023-09-08
*/
public class TeacherFilesThesis extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
private Long id;
/** 原id */
@Excel(name = "原id")
private Long tId;
/** 档案id */
@Excel(name = "档案id")
private Long filesId;
/** 论文名称 */
@Excel(name = "论文名称")
private String thesisName;
/** 级别(1国家级,2省级,3市级) */
@Excel(name = "级别", readConverterExp = "1=国家级,2省级,3市级")
private String level;
/** 等级(1一等奖,2二等奖,3三等奖) */
@Excel(name = "等级", readConverterExp = "1=一等奖,2二等奖,3三等奖")
private String grade;
/** 发表时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date publishTime;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void settId(Long tId)
{
this.tId = tId;
}
public Long gettId()
{
return tId;
}
public void setFilesId(Long filesId)
{
this.filesId = filesId;
}
public Long getFilesId()
{
return filesId;
}
public void setThesisName(String thesisName)
{
this.thesisName = thesisName;
}
public String getThesisName()
{
return thesisName;
}
public void setLevel(String level)
{
this.level = level;
}
public String getLevel()
{
return level;
}
public void setGrade(String grade)
{
this.grade = grade;
}
public String getGrade()
{
return grade;
}
public void setPublishTime(Date publishTime)
{
this.publishTime = publishTime;
}
public Date getPublishTime()
{
return publishTime;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("tId", gettId())
.append("filesId", getFilesId())
.append("thesisName", getThesisName())
.append("level", getLevel())
.append("grade", getGrade())
.append("publishTime", getPublishTime())
.toString();
}
}
package yangtz.cs.liu.campus.domain.teacherFiles;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/**
* 教师档案培训情况对象 teacher_files_training
*
* @author ruoyi
* @date 2023-09-08
*/
public class TeacherFilesTraining extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键id */
private Long id;
/** 教师id */
@Excel(name = "原id")
private Long tId;
/** 档案id */
@Excel(name = "档案id")
private Long filesId;
/** 培训时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "培训时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date trainingTime;
/** 培训名称 */
@Excel(name = "培训名称")
private String trainingName;
/** 是否合格(1合格,0不合格) */
@Excel(name = "是否合格", readConverterExp = "1=合格,0不合格")
private String isQualified;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void settId(Long tId)
{
this.tId = tId;
}
public Long gettId()
{
return tId;
}
public void setFilesId(Long filesId)
{
this.filesId = filesId;
}
public Long getFilesId()
{
return filesId;
}
public void setTrainingTime(Date trainingTime)
{
this.trainingTime = trainingTime;
}
public Date getTrainingTime()
{
return trainingTime;
}
public void setTrainingName(String trainingName)
{
this.trainingName = trainingName;
}
public String getTrainingName()
{
return trainingName;
}
public void setIsQualified(String isQualified)
{
this.isQualified = isQualified;
}
public String getIsQualified()
{
return isQualified;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("tId", gettId())
.append("filesId", getFilesId())
.append("trainingTime", getTrainingTime())
.append("trainingName", getTrainingName())
.append("isQualified", getIsQualified())
.toString();
}
}
package yangtz.cs.liu.campus.domain.teacherFiles;
import lombok.Data;
import java.util.List;
/**
* 教师档案对象 teacher_files
*
* @author ruoyi
* @date 2023-09-05
*/
@Data
public class TeacherFilesVO
{
/** id */
private Long id;
/** 通知id */
private String noticeId;
/** 档案学年学期 */
private String filesSemester;
/** 老师id */
private Long teacherId;
/** 老师名称 */
private String teacherName;
/** 级部id */
private Long gradeId;
/** 级部名称 */
private String gradeName;
/** 身份证号 */
private String idCard;
/** 0男1女 */
private String sex;
/** 年龄 */
private Integer age;
/** 职称 */
private String title;
/** 学历 */
private String education;
/** 政治面貌 */
private String appearance;
/** 任教学课 */
private String courseName;
/** 任教班级 */
private String className;
/** 任正班主任班级 */
private String bzrClassName;
/** 任副班主任班级 */
private String fbzrClassName;
/** 是否教学组长 */
private String isTeachingGroupLeader;
/** 是否教研组长 */
private String isResearchGroupLeader;
/** 设计课时 */
private Integer classHour;
/** 班主任情况 */
private String classTeacherDetails;
/** 状态 */
private String state;
private List<TeacherFilesAward> awardList;
private List<TeacherFilesThesis> thesisList;
private List<TeacherFilesTraining> trainingList;
private List<TeacherFilesMaterial> materialList;
}
......@@ -30,5 +30,5 @@ public interface SchoolGradeMapper extends BaseMapper<SchoolGrade> {
public List<String> getYearList();
List<SchoolGrade> selectNowSchoolGrade();
}
package yangtz.cs.liu.campus.mapper.teacherFiles;
import yangtz.cs.liu.campus.domain.award.Award;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesAward;
import java.util.List;
import java.util.Map;
/**
* 教师档案获奖情况Mapper接口
*
* @author ruoyi
* @date 2023-09-08
*/
public interface TeacherFilesAwardMapper
{
/**
* 查询教师档案获奖情况
*
* @param id 教师档案获奖情况主键
* @return 教师档案获奖情况
*/
public TeacherFilesAward selectTeacherFilesAwardById(Long id);
/**
* 查询教师档案获奖情况列表
*
* @param teacherFilesAward 教师档案获奖情况
* @return 教师档案获奖情况集合
*/
public List<TeacherFilesAward> selectTeacherFilesAwardList(TeacherFilesAward teacherFilesAward);
public List<TeacherFilesAward> selectTeacherFilesAwardListByFilesId(Long filesId);
/**
* 新增教师档案获奖情况
*
* @param teacherFilesAward 教师档案获奖情况
* @return 结果
*/
public int insertTeacherFilesAward(TeacherFilesAward teacherFilesAward);
/**
* 修改教师档案获奖情况
*
* @param teacherFilesAward 教师档案获奖情况
* @return 结果
*/
public int updateTeacherFilesAward(TeacherFilesAward teacherFilesAward);
/**
* 删除教师档案获奖情况
*
* @param id 教师档案获奖情况主键
* @return 结果
*/
public int deleteTeacherFilesAwardById(Long id);
public int deleteTeacherFilesAwardByFilesId(Long filesId);
/**
* 批量删除教师档案获奖情况
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTeacherFilesAwardByIds(Long[] ids);
public List<Award> selectAwardList(Map map);
}
package yangtz.cs.liu.campus.mapper.teacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
import java.util.List;
/**
* 教师档案Mapper接口
*
* @author ruoyi
* @date 2023-09-06
*/
public interface TeacherFilesMapper
{
/**
* 查询教师档案
*
* @param id 教师档案主键
* @return 教师档案
*/
public TeacherFilesVO selectTeacherFilesById(Long id);
/**
* 查询教师档案列表
*
* @param teacherFiles 教师档案
* @return 教师档案集合
*/
public List<TeacherFiles> selectTeacherFilesList(TeacherFiles teacherFiles);
/**
* 新增教师档案
*
* @param teacherFiles 教师档案
* @return 结果
*/
public int insertTeacherFiles(TeacherFiles teacherFiles);
/**
* 修改教师档案
*
* @param teacherFiles 教师档案
* @return 结果
*/
public int updateTeacherFiles(TeacherFiles teacherFiles);
public int updateTeacherFilesState(String noticeId);
/**
* 删除教师档案
*
* @param id 教师档案主键
* @return 结果
*/
public int deleteTeacherFilesById(Long id);
/**
* 批量删除教师档案
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTeacherFilesByIds(Long[] ids);
}
package yangtz.cs.liu.campus.mapper.teacherFiles;
import yangtz.cs.liu.campus.domain.material.Material;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesMaterial;
import java.util.List;
import java.util.Map;
/**
* 教师档案课题编写情况Mapper接口
*
* @author ruoyi
* @date 2023-09-08
*/
public interface TeacherFilesMaterialMapper
{
/**
* 查询教师档案课题编写情况
*
* @param id 教师档案课题编写情况主键
* @return 教师档案课题编写情况
*/
public TeacherFilesMaterial selectTeacherFilesMaterialById(Long id);
/**
* 查询教师档案课题编写情况列表
*
* @param teacherFilesMaterial 教师档案课题编写情况
* @return 教师档案课题编写情况集合
*/
public List<TeacherFilesMaterial> selectTeacherFilesMaterialList(TeacherFilesMaterial teacherFilesMaterial);
public List<TeacherFilesMaterial> selectTeacherFilesMaterialListByFilesId(Long filesId);
/**
* 新增教师档案课题编写情况
*
* @param teacherFilesMaterial 教师档案课题编写情况
* @return 结果
*/
public int insertTeacherFilesMaterial(TeacherFilesMaterial teacherFilesMaterial);
/**
* 修改教师档案课题编写情况
*
* @param teacherFilesMaterial 教师档案课题编写情况
* @return 结果
*/
public int updateTeacherFilesMaterial(TeacherFilesMaterial teacherFilesMaterial);
/**
* 删除教师档案课题编写情况
*
* @param id 教师档案课题编写情况主键
* @return 结果
*/
public int deleteTeacherFilesMaterialById(Long id);
public int deleteTeacherFilesMaterialByFilesId(Long filesId);
/**
* 批量删除教师档案课题编写情况
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTeacherFilesMaterialByIds(Long[] ids);
public List<Material> selectMaterialList(Map map);
}
package yangtz.cs.liu.campus.mapper.teacherFiles;
import org.apache.ibatis.annotations.Param;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal;
import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo;
import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo;
import java.util.List;
/**
* 教师档案通知Mapper接口
*
* @author ruoyi
* @date 2023-09-06
*/
public interface TeacherFilesNoticeMapper
{
/**
* 查询教师档案通知
*
* @param id 教师档案通知主键
* @return 教师档案通知
*/
public TeacherFilesNotice selectTeacherFilesNoticeById(String id);
/**
* 查询教室档案通知列表
*
* @param teacherFilesNotice 教师档案通知
* @return 教师档案通知集合
*/
public List<TeacherFilesNoticeTotal> selectTeacherFilesNoticeList(TeacherFilesNotice teacherFilesNotice);
/**
* 新增教师档案通知
*
* @param teacherFilesNotice 教师档案通知
* @return 结果
*/
public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
/**
* 修改教师档案通知
*
* @param teacherFilesNotice 教师档案通知
* @return 结果
*/
public int updateTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
/**
* 删除教师档案通知
*
* @param id 教师档案通知主键
* @return 结果
*/
public int deleteTeacherFilesNoticeById(String id);
/**
* 批量删除教师档案通知
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTeacherFilesNoticeByIds(String[] ids);
public List<SchoolClassByGradeVo> getSchoolClassByGrade (Long gradeId);
List<SchoolGradeByClassVo> selectTeacherByClass(@Param("classId") Long classId);
}
package yangtz.cs.liu.campus.mapper.teacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesThesis;
import yangtz.cs.liu.campus.domain.thesis.Thesis;
import java.util.List;
import java.util.Map;
/**
* 教师档案论文情况Mapper接口
*
* @author ruoyi
* @date 2023-09-08
*/
public interface TeacherFilesThesisMapper
{
/**
* 查询教师档案论文情况
*
* @param id 教师档案论文情况主键
* @return 教师档案论文情况
*/
public TeacherFilesThesis selectTeacherFilesThesisById(Long id);
/**
* 查询教师档案论文情况列表
*
* @param teacherFilesThesis 教师档案论文情况
* @return 教师档案论文情况集合
*/
public List<TeacherFilesThesis> selectTeacherFilesThesisList(TeacherFilesThesis teacherFilesThesis);
public List<TeacherFilesThesis> selectTeacherFilesThesisListByFilesId(Long filesId);
/**
* 新增教师档案论文情况
*
* @param teacherFilesThesis 教师档案论文情况
* @return 结果
*/
public int insertTeacherFilesThesis(TeacherFilesThesis teacherFilesThesis);
/**
* 修改教师档案论文情况
*
* @param teacherFilesThesis 教师档案论文情况
* @return 结果
*/
public int updateTeacherFilesThesis(TeacherFilesThesis teacherFilesThesis);
/**
* 删除教师档案论文情况
*
* @param id 教师档案论文情况主键
* @return 结果
*/
public int deleteTeacherFilesThesisById(Long id);
public int deleteTeacherFilesThesisByFilesId(Long filesId);
/**
* 批量删除教师档案论文情况
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTeacherFilesThesisByIds(Long[] ids);
public List<Thesis> selectThesisList(Map map);
}
package yangtz.cs.liu.campus.mapper.teacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesTraining;
import yangtz.cs.liu.campus.domain.training.Training;
import java.util.List;
import java.util.Map;
/**
* 教师档案培训情况Mapper接口
*
* @author ruoyi
* @date 2023-09-08
*/
public interface TeacherFilesTrainingMapper
{
/**
* 查询教师档案培训情况
*
* @param id 教师档案培训情况主键
* @return 教师档案培训情况
*/
public TeacherFilesTraining selectTeacherFilesTrainingById(Long id);
/**
* 查询教师档案培训情况列表
*
* @param teacherFilesTraining 教师档案培训情况
* @return 教师档案培训情况集合
*/
public List<TeacherFilesTraining> selectTeacherFilesTrainingList(TeacherFilesTraining teacherFilesTraining);
public List<TeacherFilesTraining> selectTeacherFilesTrainingListByFilesId(Long filesId);
/**
* 新增教师档案培训情况
*
* @param teacherFilesTraining 教师档案培训情况
* @return 结果
*/
public int insertTeacherFilesTraining(TeacherFilesTraining teacherFilesTraining);
/**
* 修改教师档案培训情况
*
* @param teacherFilesTraining 教师档案培训情况
* @return 结果
*/
public int updateTeacherFilesTraining(TeacherFilesTraining teacherFilesTraining);
/**
* 删除教师档案培训情况
*
* @param id 教师档案培训情况主键
* @return 结果
*/
public int deleteTeacherFilesTrainingById(Long id);
public int deleteTeacherFilesTrainingByFilesId(Long filesId);
/**
* 批量删除教师档案培训情况
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTeacherFilesTrainingByIds(Long[] ids);
public List<Training> selectTrainingList(Map map);
}
package yangtz.cs.liu.campus.service.impl.teacherFiles;
import com.ruoyi.common.core.domain.entity.SchoolTeacher;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal;
import yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMapper;
import yangtz.cs.liu.campus.mapper.teacher.SchoolTeacherMapper;
import yangtz.cs.liu.campus.mapper.teacherFiles.TeacherFilesMapper;
import yangtz.cs.liu.campus.mapper.teacherFiles.TeacherFilesNoticeMapper;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService;
import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo;
import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* 教师档案通知Service业务层处理
*
* @author ruoyi
* @date 2023-09-06
*/
@Service
public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
{
@Autowired
private TeacherFilesNoticeMapper teacherFilesNoticeMapper;
@Autowired
private TeacherFilesMapper teacherFilesMapper;
@Autowired
private SchoolGradeMapper schoolGradeMapper;
@Autowired
private SchoolTeacherMapper schoolTeacherMapper;
/**
* 教师教室档案通知
*
* @param id 教师档案通知主键
* @return 教师档案通知
*/
@Override
public TeacherFilesNotice selectTeacherFilesNoticeById(String id)
{
return teacherFilesNoticeMapper.selectTeacherFilesNoticeById(id);
}
/**
* 查询教师档案通知列表
*
* @param teacherFilesNotice 教师档案通知
* @return 教师档案通知
*/
@Override
public List<TeacherFilesNoticeTotal> selectTeacherFilesNoticeList(TeacherFilesNotice teacherFilesNotice)
{
return teacherFilesNoticeMapper.selectTeacherFilesNoticeList(teacherFilesNotice);
}
/**
* 新增教师档案通知
*
* @param teacherFilesNotice 教师档案通知
* @return 结果
*/
@Override
public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice)
{
String noticeId = UUID.randomUUID().toString().replaceAll("-","");
//补充通知字段
teacherFilesNotice.setNoticeRange("全体教师");
teacherFilesNotice.setId(noticeId);
teacherFilesNotice.setNoticeName(teacherFilesNotice.getNoticeYear()+"学年"+teacherFilesNotice.getNoticeSemester()+"教师档案填写");
teacherFilesNotice.setNoticeState("1");
teacherFilesNotice.setCreateTime(DateUtils.getNowDate());
int i = teacherFilesNoticeMapper.insertTeacherFilesNotice(teacherFilesNotice);
//获取级部
List<SchoolGrade> schoolGrades = schoolGradeMapper.selectNowSchoolGrade();
for(SchoolGrade schoolGrade:schoolGrades){
Map<Long,TeacherFiles> teacherFilesMap = new HashMap();
Long gradeId = schoolGrade.getId();
String gradeName = schoolGrade.getGradeName();
//获取班级
List<SchoolClassByGradeVo> schoolClassByGrade = teacherFilesNoticeMapper.getSchoolClassByGrade(gradeId);
for(SchoolClassByGradeVo schoolClass:schoolClassByGrade){
Long classId=schoolClass.getId();
String classAlias=schoolClass.getClassAlias();
System.out.println(classAlias);
if(schoolClass.getTeacherId()!=null){
if(teacherFilesMap.get(schoolClass.getTeacherId())==null){
TeacherFiles teacherFiles = new TeacherFiles();
teacherFiles.setTeacherId(schoolClass.getTeacherId());
teacherFiles = teacherFilesAddXx(teacherFiles);
teacherFiles.setNoticeId(noticeId);
teacherFiles.setFilesSemester(teacherFilesNotice.getNoticeYear()+"学年"+teacherFilesNotice.getNoticeSemester());
teacherFiles.setGradeId(gradeId);
teacherFiles.setGradeName(gradeName);
teacherFiles.setBzrClassName(classAlias);
teacherFiles.setState("1");
teacherFilesMap.put(schoolClass.getTeacherId(),teacherFiles);
}else{
TeacherFiles teacherFiles = teacherFilesMap.get(schoolClass.getTeacherId());
String bzrClassName = teacherFiles.getBzrClassName();
if(bzrClassName==null){
teacherFiles.setBzrClassName(classAlias);
}else{
teacherFiles.setBzrClassName(teacherFiles.getBzrClassName()+"、"+classAlias);
}
teacherFilesMap.put(schoolClass.getTeacherId(),teacherFiles);
}
}
//获取班级老师
List<SchoolGradeByClassVo> schoolGradeByClassVos = teacherFilesNoticeMapper.selectTeacherByClass(classId);
for(SchoolGradeByClassVo grade:schoolGradeByClassVos){
if(teacherFilesMap.get(grade.getTeacherId())==null){
//没有记录
TeacherFiles teacherFiles = new TeacherFiles();
teacherFiles.setTeacherId(grade.getTeacherId());
teacherFiles = teacherFilesAddXx(teacherFiles);
teacherFiles.setNoticeId(noticeId);
teacherFiles.setFilesSemester(teacherFilesNotice.getNoticeYear()+"学年"+teacherFilesNotice.getNoticeSemester());
teacherFiles.setGradeId(gradeId);
teacherFiles.setGradeName(gradeName);
teacherFiles.setCourseName(grade.getCourseName());
teacherFiles.setClassName(classAlias);
teacherFiles.setState("1");
teacherFilesMap.put(grade.getTeacherId(),teacherFiles);
}else{
//有记录
TeacherFiles teacherFiles = teacherFilesMap.get(schoolClass.getTeacherId());
if(teacherFiles.getClassName()==null){
teacherFiles.setClassName(classAlias);
}else{
if(!teacherFiles.getClassName().contains(classAlias)){
teacherFiles.setClassName(teacherFiles.getClassName()+"、"+classAlias);
}
}
if(teacherFiles.getCourseName()==null){
teacherFiles.setCourseName(grade.getCourseName());
}else{
if(!teacherFiles.getCourseName().contains(grade.getCourseName())){
teacherFiles.setCourseName(teacherFiles.getCourseName()+"、"+grade.getCourseName());
}
}
teacherFilesMap.put(schoolClass.getTeacherId(),teacherFiles);
}
}
}
teacherFilesMap.forEach((teacherId,teacherFiles)->{
teacherFilesMapper.insertTeacherFiles(teacherFiles);
});
}
return i;
}
TeacherFiles teacherFilesAddXx(TeacherFiles teacherFiles){
SchoolTeacher schoolTeacher = schoolTeacherMapper.selectSchoolTeacherById(teacherFiles.getTeacherId());
teacherFiles.setTeacherName(schoolTeacher.getTeacherName());
teacherFiles.setIdCard(schoolTeacher.getIdCard());
teacherFiles.setSex(schoolTeacher.getSex());
teacherFiles.setEducation(schoolTeacher.getEducation());
teacherFiles.setAge(1);
teacherFiles.setTitle("");
teacherFiles.setAppearance("");
return teacherFiles;
}
/**
* 修改教师档案通知
*
* @param teacherFilesNotice 教室档案通知
* @return 结果
*/
@Override
public int updateTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice)
{
teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
return teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
}
@Override
public int release(String id) {
TeacherFilesNotice teacherFilesNotice =new TeacherFilesNotice();
teacherFilesNotice.setId(id);
teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
int i = teacherFilesMapper.updateTeacherFilesState(id);
teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
return i;
}
/**
* 批量删除教师档案通知
*
* @param ids 需要删除的教室档案通知主键
* @return 结果
*/
@Override
public int deleteTeacherFilesNoticeByIds(String[] ids)
{
return teacherFilesNoticeMapper.deleteTeacherFilesNoticeByIds(ids);
}
/**
* 删除教师档案通知信息
*
* @param id 教室档案通知主键
* @return 结果
*/
@Override
public int deleteTeacherFilesNoticeById(String id)
{
return teacherFilesNoticeMapper.deleteTeacherFilesNoticeById(id);
}
}
package yangtz.cs.liu.campus.service.impl.teacherFiles;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.TermRange;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import yangtz.cs.liu.campus.domain.award.Award;
import yangtz.cs.liu.campus.domain.material.Material;
import yangtz.cs.liu.campus.domain.teacherFiles.*;
import yangtz.cs.liu.campus.domain.thesis.Thesis;
import yangtz.cs.liu.campus.domain.training.Training;
import yangtz.cs.liu.campus.mapper.teacherFiles.*;
import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 教师档案Service业务层处理
*
* @author ruoyi
* @date 2023-09-06
*/
@Service
public class TeacherFilesServiceImpl implements ITeacherFilesService
{
@Autowired
private TeacherFilesMapper teacherFilesMapper;
@Autowired
private TeacherFilesMaterialMapper FmaterialMapper;
@Autowired
private TeacherFilesThesisMapper FthesisMapper;
@Autowired
private TeacherFilesAwardMapper FawardMapper;
@Autowired
private TeacherFilesTrainingMapper FtrainingMapper;
@Autowired
private TeacherFilesNoticeMapper teacherFilesNoticeMapper;
/**
* 查询教师档案
*
* @param id 教师档案主键
* @return 教师档案
*/
@Override
public TeacherFilesVO selectTeacherFilesById(Long id)
{
TeacherFilesVO teacherFiles = teacherFilesMapper.selectTeacherFilesById(id);
teacherFiles.setMaterialList(FmaterialMapper.selectTeacherFilesMaterialListByFilesId(id));
teacherFiles.setThesisList(FthesisMapper.selectTeacherFilesThesisListByFilesId(id));
teacherFiles.setTrainingList(FtrainingMapper.selectTeacherFilesTrainingListByFilesId(id));
teacherFiles.setAwardList(FawardMapper.selectTeacherFilesAwardListByFilesId(id));
return teacherFiles;
}
/**
* 查询教师档案列表
*
* @param teacherFiles 教师档案
* @return 教师档案
*/
@Override
public List<TeacherFiles> selectTeacherFilesList(TeacherFiles teacherFiles)
{
return teacherFilesMapper.selectTeacherFilesList(teacherFiles);
}
/**
* 新增教师档案
*
* @param teacherFiles 教师档案
* @return 结果
*/
@Override
public int insertTeacherFiles(TeacherFiles teacherFiles)
{
return teacherFilesMapper.insertTeacherFiles(teacherFiles);
}
/**
* 修改教师档案
*
* @param teacherFiles 教师档案
* @return 结果
*/
@Override
public int updateTeacherFiles(TeacherFiles teacherFiles)
{
return teacherFilesMapper.updateTeacherFiles(teacherFiles);
}
/**
* 批量删除教师档案
*
* @param ids 需要删除的教师档案主键
* @return 结果
*/
@Override
public int deleteTeacherFilesByIds(Long[] ids)
{
return teacherFilesMapper.deleteTeacherFilesByIds(ids);
}
/**
* 删除教师档案信息
*
* @param id 教师档案主键
* @return 结果
*/
@Override
public int deleteTeacherFilesById(Long id)
{
return teacherFilesMapper.deleteTeacherFilesById(id);
}
@Override
public int synchronous(Long id) {
TeacherFilesVO teacherFiles = teacherFilesMapper.selectTeacherFilesById(id);
TeacherFilesNotice teacherFilesNotice = teacherFilesNoticeMapper.selectTeacherFilesNoticeById(teacherFiles.getNoticeId());
Map map = new HashMap<>();
map.put("teacherId",teacherFiles.getTeacherId());
TermRange termRange = DateUtils.getTermRange(teacherFilesNotice.getNoticeYear(), teacherFilesNotice.getNoticeSemester());
map.put("startDay",termRange.getStartDay());
map.put("endDay",termRange.getEndDay());
FthesisMapper.deleteTeacherFilesThesisByFilesId(id);
for (Thesis thesis:FthesisMapper.selectThesisList(map)){
TeacherFilesThesis teacherFilesThesis = new TeacherFilesThesis();
teacherFilesThesis.setFilesId(id);
teacherFilesThesis.settId(thesis.getId());
teacherFilesThesis.setThesisName(thesis.getThesisName());
teacherFilesThesis.setLevel(thesis.getLevel());
teacherFilesThesis.setGrade(thesis.getGrade());
teacherFilesThesis.setPublishTime(thesis.getPublishTime());
FthesisMapper.insertTeacherFilesThesis(teacherFilesThesis);
}
FmaterialMapper.deleteTeacherFilesMaterialByFilesId(id);
for (Material material:FmaterialMapper.selectMaterialList(map)){
TeacherFilesMaterial teacherFilesMaterial = new TeacherFilesMaterial();
teacherFilesMaterial.setFilesId(id);
teacherFilesMaterial.settId(material.getId());
teacherFilesMaterial.setName(material.getName());
teacherFilesMaterial.setPublishTime(material.getPublishTime());
FmaterialMapper.insertTeacherFilesMaterial(teacherFilesMaterial);
}
FawardMapper.deleteTeacherFilesAwardByFilesId(id);
for(Award award : FawardMapper.selectAwardList(map)){
TeacherFilesAward teacherFilesAward =new TeacherFilesAward();
teacherFilesAward.setFilesId(id);
teacherFilesAward.settId(award.getId());
teacherFilesAward.setAwardName(award.getAwardName());
teacherFilesAward.setAwardTime(award.getAwardTime());
teacherFilesAward.setGradeOfAward(award.getGradeOfAward());
teacherFilesAward.setLicenseIssuingAuthority(award.getLicenseIssuingAuthority());
FawardMapper.insertTeacherFilesAward(teacherFilesAward);
}
FtrainingMapper.deleteTeacherFilesTrainingByFilesId(id);
for (Training training : FtrainingMapper.selectTrainingList(map)){
TeacherFilesTraining teacherFilesTraining = new TeacherFilesTraining();
teacherFilesTraining.setFilesId(id);
teacherFilesTraining.settId(training.getId());
teacherFilesTraining.setTrainingName(training.getTrainingName());
teacherFilesTraining.setTrainingTime(training.getTrainingTime());
teacherFilesTraining.setIsQualified(training.getIsQualified());
FtrainingMapper.insertTeacherFilesTraining(teacherFilesTraining);
}
return 1;
}
}
package yangtz.cs.liu.campus.service.teacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal;
import java.util.List;
/**
* 教师档案通知Service接口
*
* @author ruoyi
* @date 2023-09-06
*/
public interface ITeacherFilesNoticeService
{
/**
* 查询教室档案通知
*
* @param id 教师档案通知主键
* @return 教师档案通知
*/
public TeacherFilesNotice selectTeacherFilesNoticeById(String id);
/**
* 查询教室档案通知列表
*
* @param teacherFilesNotice 教师档案通知
* @return 教室档案通知集合
*/
public List<TeacherFilesNoticeTotal> selectTeacherFilesNoticeList(TeacherFilesNotice teacherFilesNotice);
/**
* 新增教室档案通知
*
* @param teacherFilesNotice 教师档案通知
* @return 结果
*/
public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
/**
* 修改教室档案通知
*
* @param teacherFilesNotice 教师档案通知
* @return 结果
*/
public int updateTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
public int release(String id);
/**
* 批量删除教师档案通知
*
* @param ids 需要删除的教室档案通知主键集合
* @return 结果
*/
public int deleteTeacherFilesNoticeByIds(String[] ids);
/**
* 删除教室教师通知信息
*
* @param id 教室档案通知主键
* @return 结果
*/
public int deleteTeacherFilesNoticeById(String id);
}
package yangtz.cs.liu.campus.service.teacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFiles;
import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
import java.util.List;
/**
* 教师档案Service接口
*
* @author ruoyi
* @date 2023-09-06
*/
public interface ITeacherFilesService
{
/**
* 查询教师档案
*
* @param id 教师档案主键
* @return 教师档案
*/
public TeacherFilesVO selectTeacherFilesById(Long id);
/**
* 查询教师档案列表
*
* @param teacherFiles 教师档案
* @return 教师档案集合
*/
public List<TeacherFiles> selectTeacherFilesList(TeacherFiles teacherFiles);
/**
* 新增教师档案
*
* @param teacherFiles 教师档案
* @return 结果
*/
public int insertTeacherFiles(TeacherFiles teacherFiles);
/**
* 修改教师档案
*
* @param teacherFiles 教师档案
* @return 结果
*/
public int updateTeacherFiles(TeacherFiles teacherFiles);
/**
* 批量删除教师档案
*
* @param ids 需要删除的教师档案主键集合
* @return 结果
*/
public int deleteTeacherFilesByIds(Long[] ids);
/**
* 删除教师档案信息
*
* @param id 教师档案主键
* @return 结果
*/
public int deleteTeacherFilesById(Long id);
public int synchronous(Long id);
}
package yangtz.cs.liu.campus.vo.teacherFiles;
import com.core.domain.OurBaseEntity;
import lombok.Data;
@Data
public class SchoolClassByGradeVo extends OurBaseEntity {
private static final long serialVersionUID = 1L;
private Long id;
private String classAlias;
private Long teacherId;
}
package yangtz.cs.liu.campus.vo.teacherFiles;
import com.core.domain.OurBaseEntity;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
@Data
public class SchoolGradeByClassVo extends OurBaseEntity {
private static final long serialVersionUID = 1L;
/** 老师主键 */
private Long teacherId;
/** 课程名称*/
@Excel(name = "任课名称")
private String courseName;
}
......@@ -50,4 +50,9 @@
select max(school_year) nowYear from school_grade where del_flag = '0'
</select>
<select id="selectNowSchoolGrade" resultType="yangtz.cs.liu.campus.domain.schoolgrade.SchoolGrade">
<include refid="selectSchoolGradeVo"/>
where school_year = (select max(school_year) from school_grade )
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.teacherFiles.TeacherFilesAwardMapper">
<resultMap type="TeacherFilesAward" id="TeacherFilesAwardResult">
<result property="id" column="id" />
<result property="tId" column="t_id" />
<result property="filesId" column="files_id" />
<result property="awardName" column="award_name" />
<result property="awardTime" column="award_time" />
<result property="gradeOfAward" column="grade_of_award" />
<result property="licenseIssuingAuthority" column="license_issuing_authority" />
</resultMap>
<sql id="selectTeacherFilesAwardVo">
select id, t_id, files_id, award_name, award_time, grade_of_award, license_issuing_authority from teacher_files_award
</sql>
<select id="selectTeacherFilesAwardList" parameterType="TeacherFilesAward" resultMap="TeacherFilesAwardResult">
<include refid="selectTeacherFilesAwardVo"/>
<where>
<if test="tId != null "> and t_id = #{tId}</if>
<if test="filesId != null "> and files_id = #{filesId}</if>
<if test="awardName != null and awardName != ''"> and award_name like concat('%', #{awardName}, '%')</if>
<if test="awardTime != null "> and award_time = #{awardTime}</if>
<if test="gradeOfAward != null and gradeOfAward != ''"> and grade_of_award = #{gradeOfAward}</if>
<if test="licenseIssuingAuthority != null and licenseIssuingAuthority != ''"> and license_issuing_authority = #{licenseIssuingAuthority}</if>
</where>
</select>
<select id="selectTeacherFilesAwardListByFilesId" parameterType="Long" resultMap="TeacherFilesAwardResult">
<include refid="selectTeacherFilesAwardVo"/> where files_id = #{filesId}
</select>
<select id="selectTeacherFilesAwardById" parameterType="Long" resultMap="TeacherFilesAwardResult">
<include refid="selectTeacherFilesAwardVo"/>
where id = #{id}
</select>
<insert id="insertTeacherFilesAward" parameterType="TeacherFilesAward" useGeneratedKeys="true" keyProperty="id">
insert into teacher_files_award
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tId != null">t_id,</if>
<if test="filesId != null">files_id,</if>
<if test="awardName != null">award_name,</if>
<if test="awardTime != null">award_time,</if>
<if test="gradeOfAward != null">grade_of_award,</if>
<if test="licenseIssuingAuthority != null">license_issuing_authority,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tId != null">#{tId},</if>
<if test="filesId != null">#{filesId},</if>
<if test="awardName != null">#{awardName},</if>
<if test="awardTime != null">#{awardTime},</if>
<if test="gradeOfAward != null">#{gradeOfAward},</if>
<if test="licenseIssuingAuthority != null">#{licenseIssuingAuthority},</if>
</trim>
</insert>
<update id="updateTeacherFilesAward" parameterType="TeacherFilesAward">
update teacher_files_award
<trim prefix="SET" suffixOverrides=",">
<if test="tId != null">t_id = #{tId},</if>
<if test="filesId != null">files_id = #{filesId},</if>
<if test="awardName != null">award_name = #{awardName},</if>
<if test="awardTime != null">award_time = #{awardTime},</if>
<if test="gradeOfAward != null">grade_of_award = #{gradeOfAward},</if>
<if test="licenseIssuingAuthority != null">license_issuing_authority = #{licenseIssuingAuthority},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTeacherFilesAwardById" parameterType="Long">
delete from teacher_files_award where id = #{id}
</delete>
<delete id="deleteTeacherFilesAwardByFilesId" parameterType="Long">
delete from teacher_files_award where files_id = #{filesId}
</delete>
<delete id="deleteTeacherFilesAwardByIds" parameterType="String">
delete from teacher_files_award where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectAwardList" parameterType="Map" resultType="Award">
select id, teacher_id, teacher_name, award_name, award_time, grade_of_award, license_issuing_authority from award where teacher_id = #{teacherId} and award_time &gt;= #{startDay} and award_time &lt;= #{endDay}
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.teacherFiles.TeacherFilesMaterialMapper">
<resultMap type="TeacherFilesMaterial" id="TeacherFilesMaterialResult">
<result property="id" column="id" />
<result property="tId" column="t_id" />
<result property="filesId" column="files_id" />
<result property="name" column="name" />
<result property="publishTime" column="publish_time" />
</resultMap>
<sql id="selectTeacherFilesMaterialVo">
select id, t_id, files_id, name, publish_time from teacher_files_material
</sql>
<select id="selectTeacherFilesMaterialList" parameterType="TeacherFilesMaterial" resultMap="TeacherFilesMaterialResult">
<include refid="selectTeacherFilesMaterialVo"/>
<where>
<if test="tId != null "> and t_id = #{tId}</if>
<if test="filesId != null "> and files_id = #{filesId}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="publishTime != null "> and publish_time = #{publishTime}</if>
</where>
</select>
<select id="selectTeacherFilesMaterialListByFilesId" parameterType="Long" resultMap="TeacherFilesMaterialResult">
<include refid="selectTeacherFilesMaterialVo"/> where files_id = #{filesId}
</select>
<select id="selectTeacherFilesMaterialById" parameterType="Long" resultMap="TeacherFilesMaterialResult">
<include refid="selectTeacherFilesMaterialVo"/>
where id = #{id}
</select>
<insert id="insertTeacherFilesMaterial" parameterType="TeacherFilesMaterial" useGeneratedKeys="true" keyProperty="id">
insert into teacher_files_material
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tId != null">t_id,</if>
<if test="filesId != null">files_id,</if>
<if test="name != null">name,</if>
<if test="publishTime != null">publish_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tId != null">#{tId},</if>
<if test="filesId != null">#{filesId},</if>
<if test="name != null">#{name},</if>
<if test="publishTime != null">#{publishTime},</if>
</trim>
</insert>
<update id="updateTeacherFilesMaterial" parameterType="TeacherFilesMaterial">
update teacher_files_material
<trim prefix="SET" suffixOverrides=",">
<if test="tId != null">t_id = #{tId},</if>
<if test="filesId != null">files_id = #{filesId},</if>
<if test="name != null">name = #{name},</if>
<if test="publishTime != null">publish_time = #{publishTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTeacherFilesMaterialById" parameterType="Long">
delete from teacher_files_material where id = #{id}
</delete>
<delete id="deleteTeacherFilesMaterialByFilesId" parameterType="Long">
delete from teacher_files_material where files_id = #{filesId}
</delete>
<delete id="deleteTeacherFilesMaterialByIds" parameterType="String">
delete from teacher_files_material where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectMaterialList" parameterType="Map" resultType="Material">
select id, teacher_id, teacher_name, name, publish_time, create_by, create_time, update_by, update_time from material where teacher_id = #{teacherId} and publish_time &gt;= #{startDay} and publish_time &lt;= #{endDay}
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.teacherFiles.TeacherFilesNoticeMapper">
<resultMap type="TeacherFilesNotice" id="TeacherFilesNoticeResult">
<result property="id" column="id" />
<result property="noticeRange" column="notice_range" />
<result property="noticeYear" column="notice_year" />
<result property="noticeSemester" column="notice_semester" />
<result property="noticeName" column="notice_name" />
<result property="noticeState" column="notice_state" />
<result property="startTime" column="start_time" />
<result property="endTime" column="end_time" />
<result property="remark" column="remark" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectTeacherFilesNoticeVo">
select id, notice_range, notice_year, notice_semester, notice_name, notice_state, start_time, end_time, remark, create_by, create_time, update_by, update_time from teacher_files_notice
</sql>
<sql id="selectTeacherFilesNoticeTotalVo">
select id, notice_range, notice_year, notice_semester, notice_name, notice_state, start_time, end_time, remark, create_by, create_time, update_by, update_time,total,txtotal,tgtotal from teacher_files_notice
left join (select notice_id,count(*) total from teacher_files GROUP BY notice_id) a on teacher_files_notice.id = a.notice_id
left join (select notice_id,count(*) txtotal from teacher_files where state = 3 GROUP BY notice_id) b on teacher_files_notice.id = b.notice_id
left join (select notice_id,count(*) tgtotal from teacher_files where state = 5 GROUP BY notice_id) c on teacher_files_notice.id = c.notice_id
</sql>
<select id="selectTeacherFilesNoticeList" parameterType="TeacherFilesNotice" resultType="TeacherFilesNoticeTotal">
<include refid="selectTeacherFilesNoticeTotalVo"/>
<where>
<if test="noticeRange != null and noticeRange != ''"> and notice_range = #{noticeRange}</if>
<if test="noticeYear != null and noticeYear != ''"> and notice_year = #{noticeYear}</if>
<if test="noticeSemester != null and noticeSemester != ''"> and notice_semester = #{noticeSemester}</if>
<if test="noticeName != null and noticeName != ''"> and notice_name like concat('%', #{noticeName}, '%')</if>
<if test="noticeState != null and noticeState != ''"> and notice_state = #{noticeState}</if>
<if test="startTime != null "> and start_time = #{startTime}</if>
<if test="endTime != null "> and end_time = #{endTime}</if>
</where>
</select>
<select id="selectTeacherFilesNoticeById" parameterType="String" resultMap="TeacherFilesNoticeResult">
<include refid="selectTeacherFilesNoticeVo"/>
where id = #{id}
</select>
<insert id="insertTeacherFilesNotice" parameterType="TeacherFilesNotice">
insert into teacher_files_notice
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="noticeRange != null">notice_range,</if>
<if test="noticeYear != null">notice_year,</if>
<if test="noticeSemester != null">notice_semester,</if>
<if test="noticeName != null">notice_name,</if>
<if test="noticeState != null">notice_state,</if>
<if test="startTime != null">start_time,</if>
<if test="endTime != null">end_time,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="noticeRange != null">#{noticeRange},</if>
<if test="noticeYear != null">#{noticeYear},</if>
<if test="noticeSemester != null">#{noticeSemester},</if>
<if test="noticeName != null">#{noticeName},</if>
<if test="noticeState != null">#{noticeState},</if>
<if test="startTime != null">#{startTime},</if>
<if test="endTime != null">#{endTime},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateTeacherFilesNotice" parameterType="TeacherFilesNotice">
update teacher_files_notice
<trim prefix="SET" suffixOverrides=",">
<if test="noticeRange != null">notice_range = #{noticeRange},</if>
<if test="noticeYear != null">notice_year = #{noticeYear},</if>
<if test="noticeSemester != null">notice_semester = #{noticeSemester},</if>
<if test="noticeName != null">notice_name = #{noticeName},</if>
<if test="noticeState != null">notice_state = #{noticeState},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="endTime != null">end_time = #{endTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTeacherFilesNoticeById" parameterType="String">
delete from teacher_files_notice where id = #{id}
</delete>
<delete id="deleteTeacherFilesNoticeByIds" parameterType="String">
delete from teacher_files_notice where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="getSchoolClassByGrade" parameterType="Long" resultType="SchoolClassByGradeVo">
select id,class_alias,teacher_id from school_class where grade_id= #{gradeId}
</select>
<select id="selectTeacherByClass" parameterType="Long" resultType="SchoolGradeByClassVo">
select teacher_id,course_name from school_class_mentor where class_id = #{classId} and del_flag = '0'
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.teacherFiles.TeacherFilesThesisMapper">
<resultMap type="TeacherFilesThesis" id="TeacherFilesThesisResult">
<result property="id" column="id" />
<result property="tId" column="t_id" />
<result property="filesId" column="files_id" />
<result property="thesisName" column="thesis_name" />
<result property="level" column="level" />
<result property="grade" column="grade" />
<result property="publishTime" column="publish_time" />
</resultMap>
<sql id="selectTeacherFilesThesisVo">
select id, t_id, files_id, thesis_name, level, grade, publish_time from teacher_files_thesis
</sql>
<select id="selectTeacherFilesThesisList" parameterType="TeacherFilesThesis" resultMap="TeacherFilesThesisResult">
<include refid="selectTeacherFilesThesisVo"/>
<where>
<if test="tId != null "> and t_id = #{tId}</if>
<if test="filesId != null "> and files_id = #{filesId}</if>
<if test="thesisName != null and thesisName != ''"> and thesis_name like concat('%', #{thesisName}, '%')</if>
<if test="level != null and level != ''"> and level = #{level}</if>
<if test="grade != null and grade != ''"> and grade = #{grade}</if>
<if test="publishTime != null "> and publish_time = #{publishTime}</if>
</where>
</select>
<select id="selectTeacherFilesThesisListByFilesId" parameterType="Long" resultMap="TeacherFilesThesisResult">
<include refid="selectTeacherFilesThesisVo"/> where files_id = #{filesId}
</select>
<select id="selectTeacherFilesThesisById" parameterType="Long" resultMap="TeacherFilesThesisResult">
<include refid="selectTeacherFilesThesisVo"/>
where id = #{id}
</select>
<insert id="insertTeacherFilesThesis" parameterType="TeacherFilesThesis" useGeneratedKeys="true" keyProperty="id">
insert into teacher_files_thesis
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tId != null">t_id,</if>
<if test="filesId != null">files_id,</if>
<if test="thesisName != null">thesis_name,</if>
<if test="level != null">level,</if>
<if test="grade != null">grade,</if>
<if test="publishTime != null">publish_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tId != null">#{tId},</if>
<if test="filesId != null">#{filesId},</if>
<if test="thesisName != null">#{thesisName},</if>
<if test="level != null">#{level},</if>
<if test="grade != null">#{grade},</if>
<if test="publishTime != null">#{publishTime},</if>
</trim>
</insert>
<update id="updateTeacherFilesThesis" parameterType="TeacherFilesThesis">
update teacher_files_thesis
<trim prefix="SET" suffixOverrides=",">
<if test="tId != null">t_id = #{tId},</if>
<if test="filesId != null">files_id = #{filesId},</if>
<if test="thesisName != null">thesis_name = #{thesisName},</if>
<if test="level != null">level = #{level},</if>
<if test="grade != null">grade = #{grade},</if>
<if test="publishTime != null">publish_time = #{publishTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTeacherFilesThesisById" parameterType="Long">
delete from teacher_files_thesis where id = #{id}
</delete>
<delete id="deleteTeacherFilesThesisByFilesId" parameterType="Long">
delete from teacher_files_thesis where files_id = #{filesId}
</delete>
<delete id="deleteTeacherFilesThesisByIds" parameterType="String">
delete from teacher_files_thesis where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectThesisList" parameterType="Map" resultType="Thesis">
select id, teacher_id, teacher_name, thesis_name, level, grade, publish_time, create_by, create_time, update_by, update_time from thesis
where teacher_id = #{teacherId} and publish_time &gt;= #{startDay} and publish_time &lt;= #{endDay}
</select>
</mapper>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="yangtz.cs.liu.campus.mapper.teacherFiles.TeacherFilesTrainingMapper">
<resultMap type="TeacherFilesTraining" id="TeacherFilesTrainingResult">
<result property="id" column="id" />
<result property="tId" column="t_id" />
<result property="filesId" column="files_id" />
<result property="trainingTime" column="training_time" />
<result property="trainingName" column="training_name" />
<result property="isQualified" column="is_qualified" />
</resultMap>
<sql id="selectTeacherFilesTrainingVo">
select id, t_id, files_id, training_time, training_name, is_qualified from teacher_files_training
</sql>
<select id="selectTeacherFilesTrainingList" parameterType="TeacherFilesTraining" resultMap="TeacherFilesTrainingResult">
<include refid="selectTeacherFilesTrainingVo"/>
<where>
<if test="tId != null "> and t_id = #{tId}</if>
<if test="filesId != null "> and files_id = #{filesId}</if>
<if test="trainingTime != null "> and training_time = #{trainingTime}</if>
<if test="trainingName != null and trainingName != ''"> and training_name like concat('%', #{trainingName}, '%')</if>
<if test="isQualified != null and isQualified != ''"> and is_qualified = #{isQualified}</if>
</where>
</select>
<select id="selectTeacherFilesTrainingListByFilesId" parameterType="Long" resultMap="TeacherFilesTrainingResult">
<include refid="selectTeacherFilesTrainingVo"/> where files_id = #{filesId}
</select>
<select id="selectTeacherFilesTrainingById" parameterType="Long" resultMap="TeacherFilesTrainingResult">
<include refid="selectTeacherFilesTrainingVo"/>
where id = #{id}
</select>
<insert id="insertTeacherFilesTraining" parameterType="TeacherFilesTraining" useGeneratedKeys="true" keyProperty="id">
insert into teacher_files_training
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tId != null">t_id,</if>
<if test="filesId != null">files_id,</if>
<if test="trainingTime != null">training_time,</if>
<if test="trainingName != null">training_name,</if>
<if test="isQualified != null">is_qualified,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="tId != null">#{tId},</if>
<if test="filesId != null">#{filesId},</if>
<if test="trainingTime != null">#{trainingTime},</if>
<if test="trainingName != null">#{trainingName},</if>
<if test="isQualified != null">#{isQualified},</if>
</trim>
</insert>
<update id="updateTeacherFilesTraining" parameterType="TeacherFilesTraining">
update teacher_files_training
<trim prefix="SET" suffixOverrides=",">
<if test="tId != null">t_id = #{tId},</if>
<if test="filesId != null">files_id = #{filesId},</if>
<if test="trainingTime != null">training_time = #{trainingTime},</if>
<if test="trainingName != null">training_name = #{trainingName},</if>
<if test="isQualified != null">is_qualified = #{isQualified},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTeacherFilesTrainingById" parameterType="Long">
delete from teacher_files_training where id = #{id}
</delete>
<delete id="deleteTeacherFilesTrainingByFilesId" parameterType="Long">
delete from teacher_files_training where files_id = #{filesId}
</delete>
<delete id="deleteTeacherFilesTrainingByIds" parameterType="String">
delete from teacher_files_training where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectTrainingList" parameterType="Map" resultType="Training">
select id, teacher_id, teacher_name, training_time, training_name, is_qualified from training where teacher_id = #{teacherId} and training_time &gt;= #{startDay} and training_time &lt;= #{endDay}
</select>
</mapper>
\ No newline at end of file
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