教师档案管理

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

@@ -112,7 +112,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers( "/ws/webSocket/**").anonymous()
                 .antMatchers( "/webSocket/**").anonymous()
                 .antMatchers("/login", "/register", "/captchaImage").anonymous()
-                .antMatchers("/wx/user/login","/wx/user/getRoleType/**").permitAll()
+                .antMatchers("/wx/user/login","/wx/user/getRoleType/**","/teacherFiles/**").permitAll()
                 .antMatchers("/dd/user/login").permitAll()
                 .antMatchers( "/common/**").permitAll()
                 .antMatchers( "/dd/school/**").permitAll()

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

 package yangtz.cs.liu.campus.controller.teacherFiles;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -14,7 +15,9 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
 import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 教师档案Controller
@@ -62,10 +65,11 @@ public class TeacherFilesController extends BaseController
     /**
      * 老师查看自己的档案任务
      */
-    @GetMapping("getTeachList/{userId}")
-    public TableDataInfo teachList(@PathVariable("userId") Long userId){
+    @GetMapping("/getTeachList")
+    public TableDataInfo teachList(TeacherFiles teacherFiles){
         startPage();
-        List<TeacherFilesNotice> teacherFilesNotices = teacherFilesService.selctTeacherByUserId(userId);
+        Map map = new HashMap();
+        List<TeacherFilesNotice> teacherFilesNotices = teacherFilesService.selctTeacherByUserId(teacherFiles);
         return getDataTable(teacherFilesNotices);
     }
 

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

@@ -11,8 +11,11 @@ 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.impl.teacherFiles.TeacherFilesExcelUtil;
 import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService;
 
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -29,6 +32,9 @@ public class TeacherFilesNoticeController extends BaseController
     @Autowired
     private ITeacherFilesNoticeService teacherFilesNoticeService;
 
+    @Autowired
+    private TeacherFilesExcelUtil teacherFilesExcelUtil;
+
     /**
      * 查询教师档案通知列表
      */
@@ -45,14 +51,11 @@ public class TeacherFilesNoticeController extends BaseController
     /**
      * 导出教师档案通知列表
      */
-    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:export')")
-    @Log(title = "教室档案通知", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
+    @GetMapping("/export")
+    @PermitAll
     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, "教室档案通知数据");
+        teacherFilesExcelUtil.getExcel(teacherFilesNotice.getId(),response);
     }
 
     /**

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

@@ -104,6 +104,26 @@ public class TeacherFiles extends BaseEntity
 
     private Long gradeTeacherId;
 
+    private String userId;
+
+    private String noticeName;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getNoticeName() {
+        return noticeName;
+    }
+
+    public void setNoticeName(String noticeName) {
+        this.noticeName = noticeName;
+    }
+
     public Long getGradeTeacherId() {
         return gradeTeacherId;
     }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/teacherFiles/TeacherFilesNoticeMapper.java

@@ -2,12 +2,14 @@ package yangtz.cs.liu.campus.mapper.teacherFiles;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+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.vo.teacherFiles.SchoolClassByGradeVo;
 import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 教师档案通知Mapper接口
@@ -42,8 +44,7 @@ public interface TeacherFilesNoticeMapper
     public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
 
 
-    @Select("SELECT fn.*,tf.state,tf.id as fId  from teacher_files tf LEFT JOIN teacher_files_notice fn on fn.id= tf.notice_id WHERE tf.teacher_id = #{userId} and fn.notice_state = 2")
-    public List<TeacherFilesNotice> selctTeacherByUserId(Long userId);
+    public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles);
 
     /**
      * 修改教师档案通知

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

@@ -76,8 +76,8 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
 
 
     @Override
-    public List<TeacherFilesNotice> selctTeacherByUserId(Long userId) {
-        return teacherFilesNoticeMapper.selctTeacherByUserId(userId);
+    public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles) {
+        return teacherFilesNoticeMapper.selctTeacherByUserId(teacherFiles);
     }
 
     /**

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

@@ -5,6 +5,7 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
 import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 教师档案Service接口
@@ -29,7 +30,7 @@ public interface ITeacherFilesService
      * @return 教师档案集合
      */
     public List<TeacherFiles> selectTeacherFilesList(TeacherFiles teacherFiles);
-    public List<TeacherFilesNotice> selctTeacherByUserId(Long userId);
+    public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles);
 
     /**
      * 新增教师档案

smart-campus/src/main/resources/mapper/teacherFiles/TeacherFilesNoticeMapper.xml

@@ -64,6 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
 
+    <select id="selctTeacherByUserId" parameterType="TeacherFiles" resultType="TeacherFilesNotice">
+        SELECT fn.*,tf.state,tf.id as fId  from teacher_files tf LEFT JOIN teacher_files_notice fn on fn.id= tf.notice_id WHERE tf.teacher_id = #{userId} and fn.notice_name LIKE concat('%', #{noticeName}, '%')  and fn.notice_state = 2
+    </select>
+
+        
     <insert id="insertTeacherFilesNotice" parameterType="TeacherFilesNotice">
         insert into teacher_files_notice
         <trim prefix="(" suffix=")" suffixOverrides=",">