Skip to content

D
dd_school
Commit 81280c6c by 朱莹
Options

教师档案管理

parent c27602e4
Showing with 62 additions and 10 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesController.java
...@@ -90,10 +90,10 @@ public class TeacherFilesController extends BaseController ...@@ -90,10 +90,10 @@ public class TeacherFilesController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('teacherFiles:files:remove')") @PreAuthorize("@ss.hasPermi('teacherFiles:files:remove')")
@Log(title = "教师档案", businessType = BusinessType.DELETE) @Log(title = "教师档案", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable Long[] ids) public AjaxResult remove(@PathVariable Long id)
{ {
return toAjax(teacherFilesService.deleteTeacherFilesByIds(ids)); return toAjax(teacherFilesService.deleteTeacherFilesById(id));
} }
......
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/teacherFiles/TeacherFilesNoticeController.java
...@@ -87,6 +87,40 @@ public class TeacherFilesNoticeController extends BaseController ...@@ -87,6 +87,40 @@ public class TeacherFilesNoticeController extends BaseController
} }
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')") @PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案审核通过", businessType = BusinessType.UPDATE)
@PutMapping("/passThrough/{id}")
public AjaxResult passThrough(@PathVariable("id") String id)
{
TeacherFilesNotice teacherFilesNotice = new TeacherFilesNotice();
teacherFilesNotice.setId(id);
teacherFilesNotice.setNoticeState("5");
return toAjax(teacherFilesNoticeService.updateTeacherFilesNotice(teacherFilesNotice));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案审核驳回", businessType = BusinessType.UPDATE)
@PutMapping("/reject/{id}")
public AjaxResult reject(@PathVariable("id") String id)
{
TeacherFilesNotice teacherFilesNotice = new TeacherFilesNotice();
teacherFilesNotice.setId(id);
teacherFilesNotice.setNoticeState("9");
return toAjax(teacherFilesNoticeService.updateTeacherFilesNotice(teacherFilesNotice));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案提交", businessType = BusinessType.UPDATE)
@PutMapping("/submitTo/{id}")
public AjaxResult submitTo(@PathVariable("id") String id)
{
TeacherFilesNotice teacherFilesNotice = new TeacherFilesNotice();
teacherFilesNotice.setId(id);
teacherFilesNotice.setNoticeState("4");
return toAjax(teacherFilesNoticeService.updateTeacherFilesNotice(teacherFilesNotice));
}
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:edit')")
@Log(title = "教师档案通知发布", businessType = BusinessType.UPDATE) @Log(title = "教师档案通知发布", businessType = BusinessType.UPDATE)
@PutMapping("/release/{id}") @PutMapping("/release/{id}")
public AjaxResult release(@PathVariable("id") String id) public AjaxResult release(@PathVariable("id") String id)
...@@ -99,9 +133,10 @@ public class TeacherFilesNoticeController extends BaseController ...@@ -99,9 +133,10 @@ public class TeacherFilesNoticeController extends BaseController
*/ */
@PreAuthorize("@ss.hasPermi('teacherFiles:notice:remove')") @PreAuthorize("@ss.hasPermi('teacherFiles:notice:remove')")
@Log(title = "教师档案通知", businessType = BusinessType.DELETE) @Log(title = "教师档案通知", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable String[] ids) public AjaxResult remove(@PathVariable("id") String id)
{ {
return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeByIds(ids)); return toAjax(teacherFilesNoticeService.deleteTeacherFilesNoticeById(id));
} }
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/teacherFiles/TeacherFilesAward.java
...@@ -39,7 +39,7 @@ public class TeacherFilesAward extends BaseEntity ...@@ -39,7 +39,7 @@ public class TeacherFilesAward extends BaseEntity
private Date awardTime; private Date awardTime;
/** 获奖等级（1一等奖，2二等奖，3三等奖） */ /** 获奖等级（1一等奖，2二等奖，3三等奖） */
@Excel(name = "获奖等级", readConverterExp = "1=一等奖，2二等奖，3三等奖") @Excel(name = "获奖等级", readConverterExp = "1=一等奖，2=二等奖，3=三等奖")
private String gradeOfAward; private String gradeOfAward;
/** 发证机关 */ /** 发证机关 */
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/teacherFiles/TeacherFilesNoticeServiceImpl.java
...@@ -176,7 +176,6 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService ...@@ -176,7 +176,6 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
teacherFiles.setIdCard(schoolTeacher.getIdCard()); teacherFiles.setIdCard(schoolTeacher.getIdCard());
teacherFiles.setSex(schoolTeacher.getSex()); teacherFiles.setSex(schoolTeacher.getSex());
teacherFiles.setEducation(schoolTeacher.getEducation()); teacherFiles.setEducation(schoolTeacher.getEducation());
System.out.println(schoolTeacher.getTeacherName()+"---------"+schoolTeacher.getBirthday());
Date birthday = schoolTeacher.getBirthday(); Date birthday = schoolTeacher.getBirthday();
if(birthday!=null){ if(birthday!=null){
SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy"); SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy");
...@@ -200,7 +199,10 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService ...@@ -200,7 +199,10 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
public int updateTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice) public int updateTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice)
{ {
teacherFilesNotice.setUpdateTime(DateUtils.getNowDate()); teacherFilesNotice.setUpdateTime(DateUtils.getNowDate());
return teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice); teacherFilesNotice.setNoticeName(teacherFilesNotice.getNoticeYear()+"学年"+teacherFilesNotice.getNoticeSemester()+"教师档案填写");
int i = teacherFilesNoticeMapper.updateTeacherFilesNotice(teacherFilesNotice);
return i;
} }
@Override @Override
...@@ -234,6 +236,8 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService ...@@ -234,6 +236,8 @@ public class TeacherFilesNoticeServiceImpl implements ITeacherFilesNoticeService
@Override @Override
public int deleteTeacherFilesNoticeById(String id) public int deleteTeacherFilesNoticeById(String id)
{ {
return teacherFilesNoticeMapper.deleteTeacherFilesNoticeById(id); int i = teacherFilesNoticeMapper.deleteTeacherFilesNoticeById(id);
return i;
} }
} }
smart-campus/src/main/resources/mapper/teacherFiles/TeacherFilesMapper.xml
...@@ -143,14 +143,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -143,14 +143,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id} where id = #{id}
</update> </update>
<update id="updateTeacherFilesName" parameterType="Map">
update teacher_files set files_semester = #{filesSemester} where notice_id = #{noticeId}
</update>
<update id="updateTeacherFilesState" parameterType="String"> <update id="updateTeacherFilesState" parameterType="String">
update teacher_files set state = 2 where notice_id = #{noticeId} update teacher_files set state = 2 where notice_id = #{noticeId}
</update> </update>
<update id="updateTeacherFilesState1" parameterType="String">
update teacher_files set state = 1 where notice_id = #{noticeId}
</update>
<delete id="deleteTeacherFilesById" parameterType="Long"> <delete id="deleteTeacherFilesById" parameterType="Long">
delete from teacher_files where id = #{id} delete from teacher_files where id = #{id}
</delete> </delete>
<delete id="deleteTeacherFilesByNoticeId" parameterType="String">
delete from teacher_files where notice_id = #{noticeId}
</delete>
<delete id="deleteTeacherFilesByIds" parameterType="String"> <delete id="deleteTeacherFilesByIds" parameterType="String">
delete from teacher_files where id in delete from teacher_files where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
......
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