Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

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

@@ -113,14 +113,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers( "/webSocket/**").anonymous()
                 .antMatchers( "/webSocket/**").anonymous()
                 .antMatchers("/login", "/register", "/captchaImage").anonymous()
                 .antMatchers("/login", "/register", "/captchaImage").anonymous()
                 .antMatchers("/wx/user/login","/wx/user/getRoleType/**").permitAll()
                 .antMatchers("/wx/user/login","/wx/user/getRoleType/**").permitAll()
-
-                .antMatchers("/wx/teacherLeave/**").permitAll()
-                .antMatchers("/teacherFiles/notice/**").permitAll()
-                .antMatchers("/wx/level/expriment/**").permitAll()
-
-
-
-
                 .antMatchers("/dd/user/login").permitAll()
                 .antMatchers("/dd/user/login").permitAll()
                 .antMatchers( "/common/**").permitAll()
                 .antMatchers( "/common/**").permitAll()
                 .antMatchers( "/dd/school/**").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;
 package yangtz.cs.liu.campus.controller.teacherFiles;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -15,7 +16,9 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
 import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
 import yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesService;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 教师档案Controller
  * 教师档案Controller
@@ -91,14 +94,15 @@ public class TeacherFilesController extends BaseController
 
 
     /**
     /**
      *
      *
-     * @param userId
+     * @param
      * @param
      * @param
      * @return
      * @return
      */
      */
-    @GetMapping("getTeachList/{userId}")
-    public TableDataInfo teachList(@PathVariable("userId") Long userId,TeacherFilesNotice teacherFilesNotice){
+    @GetMapping("/getTeachList")
+    public TableDataInfo teachList(TeacherFiles teacherFiles){
         startPage();
         startPage();
-        List<TeacherFilesNotice> teacherFilesNotices = teacherFilesService.selctTeacherByUserId(userId,teacherFilesNotice);
+        Map map = new HashMap();
+        List<TeacherFilesNotice> teacherFilesNotices = teacherFilesService.selctTeacherByUserId(teacherFiles);
         return getDataTable(teacherFilesNotices);
         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 org.springframework.web.bind.annotation.*;
 import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
 import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
 import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNoticeTotal;
 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 yangtz.cs.liu.campus.service.teacherFiles.ITeacherFilesNoticeService;
 
 
+import javax.annotation.security.DenyAll;
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.List;
 
 
@@ -29,10 +32,13 @@ public class TeacherFilesNoticeController extends BaseController
     @Autowired
     @Autowired
     private ITeacherFilesNoticeService teacherFilesNoticeService;
     private ITeacherFilesNoticeService teacherFilesNoticeService;
 
 
+    @Autowired
+    private TeacherFilesExcelUtil teacherFilesExcelUtil;
+
     /**
     /**
      * 查询教师档案通知列表
      * 查询教师档案通知列表
      */
      */
-    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:list')")
+//    @PreAuthorize("@ss.hasPermi('teacherFiles:notice:list')")
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo list(TeacherFilesNotice teacherFilesNotice)
     public TableDataInfo list(TeacherFilesNotice teacherFilesNotice)
     {
     {
@@ -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)
     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

@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.domain.teacherFiles;
 
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 
@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @author ruoyi
  * @date 2023-09-05
  * @date 2023-09-05
  */
  */
+@Data
 public class TeacherFiles extends BaseEntity
 public class TeacherFiles extends BaseEntity
 {
 {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
@@ -104,238 +106,9 @@ public class TeacherFiles extends BaseEntity
 
 
     private Long gradeTeacherId;
     private Long gradeTeacherId;
 
 
-    public Long getGradeTeacherId() {
-        return gradeTeacherId;
-    }
+    private String userId;
 
 
-    public void setGradeTeacherId(Long gradeTeacherId) {
-        this.gradeTeacherId = gradeTeacherId;
-    }
+    private String noticeName;
 
 
-    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();
-    }
 }
 }

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

@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * 教师档案获奖情况对象 teacher_files_award
  * 教师档案获奖情况对象 teacher_files_award
@@ -46,7 +48,17 @@ public class TeacherFilesAward extends BaseEntity
     @Excel(name = "发证机关")
     @Excel(name = "发证机关")
     private String licenseIssuingAuthority;
     private String licenseIssuingAuthority;
 
 
-    public void setId(Long id) 
+    private List<SchoolAccessory> accessories;
+
+    public List<SchoolAccessory> getAccessories() {
+        return accessories;
+    }
+
+    public void setAccessories(List<SchoolAccessory> accessories) {
+        this.accessories = accessories;
+    }
+
+    public void setId(Long id)
     {
     {
         this.id = id;
         this.id = id;
     }
     }

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

@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * 教师档案课题编写情况对象 teacher_files_material
  * 教师档案课题编写情况对象 teacher_files_material
@@ -38,7 +40,17 @@ public class TeacherFilesMaterial extends BaseEntity
     @Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd")
     @Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date publishTime;
     private Date publishTime;
 
 
-    public void setId(Long id) 
+    private List<SchoolAccessory> accessories;
+
+    public List<SchoolAccessory> getAccessories() {
+        return accessories;
+    }
+
+    public void setAccessories(List<SchoolAccessory> accessories) {
+        this.accessories = accessories;
+    }
+
+    public void setId(Long id)
     {
     {
         this.id = id;
         this.id = id;
     }
     }

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

@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * 教师档案论文情况对象 teacher_files_thesis
  * 教师档案论文情况对象 teacher_files_thesis
@@ -46,7 +48,17 @@ public class TeacherFilesThesis extends BaseEntity
     @Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd")
     @Excel(name = "发表时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date publishTime;
     private Date publishTime;
 
 
-    public void setId(Long id) 
+    private List<SchoolAccessory> schoolAccessoryList ;
+
+    public List<SchoolAccessory> getSchoolAccessoryList() {
+        return schoolAccessoryList;
+    }
+
+    public void setSchoolAccessoryList(List<SchoolAccessory> schoolAccessoryList) {
+        this.schoolAccessoryList = schoolAccessoryList;
+    }
+
+    public void setId(Long id)
     {
     {
         this.id = id;
         this.id = id;
     }
     }

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

@@ -5,8 +5,10 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
 
 
 import java.util.Date;
 import java.util.Date;
+import java.util.List;
 
 
 /**
 /**
  * 教师档案培训情况对象 teacher_files_training
  * 教师档案培训情况对象 teacher_files_training
@@ -42,7 +44,17 @@ public class TeacherFilesTraining extends BaseEntity
     @Excel(name = "是否合格", readConverterExp = "1=合格，0不合格")
     @Excel(name = "是否合格", readConverterExp = "1=合格，0不合格")
     private String isQualified;
     private String isQualified;
 
 
-    public void setId(Long id) 
+    private  List<SchoolAccessory> accessories;
+
+    public List<SchoolAccessory> getAccessories() {
+        return accessories;
+    }
+
+    public void setAccessories(List<SchoolAccessory> accessories) {
+        this.accessories = accessories;
+    }
+
+    public void setId(Long id)
     {
     {
         this.id = id;
         this.id = id;
     }
     }

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

@@ -9,6 +9,7 @@ import yangtz.cs.liu.campus.vo.teacherFiles.SchoolClassByGradeVo;
 import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo;
 import yangtz.cs.liu.campus.vo.teacherFiles.SchoolGradeByClassVo;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 教师档案通知Mapper接口
  * 教师档案通知Mapper接口
@@ -43,7 +44,7 @@ public interface TeacherFilesNoticeMapper
     public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
     public int insertTeacherFilesNotice(TeacherFilesNotice teacherFilesNotice);
 
 
 
 
-    public List<TeacherFilesNotice> selctTeacherByUserId(@Param("userId") Long userId, @Param("teacherFiles") TeacherFilesNotice teacherFiles);
+    public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles);
 
 
     /**
     /**
      * 修改教师档案通知
      * 修改教师档案通知

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

 package yangtz.cs.liu.campus.service.impl.teacherFiles;
 package yangtz.cs.liu.campus.service.impl.teacherFiles;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.entity.SchoolTeacher;
 import com.ruoyi.common.core.domain.entity.SchoolTeacher;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.TermRange;
 import com.ruoyi.common.utils.TermRange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.accessory.SchoolAccessory;
 import yangtz.cs.liu.campus.domain.award.Award;
 import yangtz.cs.liu.campus.domain.award.Award;
 import yangtz.cs.liu.campus.domain.material.Material;
 import yangtz.cs.liu.campus.domain.material.Material;
 import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
 import yangtz.cs.liu.campus.domain.schoolClass.SchoolClass;
@@ -13,6 +15,7 @@ import yangtz.cs.liu.campus.domain.schoolClass.SchoolClassMentor;
 import yangtz.cs.liu.campus.domain.teacherFiles.*;
 import yangtz.cs.liu.campus.domain.teacherFiles.*;
 import yangtz.cs.liu.campus.domain.thesis.Thesis;
 import yangtz.cs.liu.campus.domain.thesis.Thesis;
 import yangtz.cs.liu.campus.domain.training.Training;
 import yangtz.cs.liu.campus.domain.training.Training;
+import yangtz.cs.liu.campus.mapper.accessory.AccessoryMapper;
 import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMapper;
 import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMapper;
 import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMentorMapper;
 import yangtz.cs.liu.campus.mapper.schoolClass.SchoolClassMentorMapper;
 import yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMapper;
 import yangtz.cs.liu.campus.mapper.schoolgrade.SchoolGradeMapper;
@@ -64,6 +67,10 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
 
 
     @Autowired
     @Autowired
     private SchoolClassMentorMapper classMentorMapper;
     private SchoolClassMentorMapper classMentorMapper;
+
+    @Autowired
+    private AccessoryMapper accessoryMapper;
+
     /**
     /**
      * 查询教师档案
      * 查询教师档案
      *
      *
@@ -73,11 +80,49 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
     @Override
     @Override
     public TeacherFilesVO selectTeacherFilesById(Long id)
     public TeacherFilesVO selectTeacherFilesById(Long id)
     {
     {
+
+
         TeacherFilesVO teacherFiles = teacherFilesMapper.selectTeacherFilesById(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));
+        //教师档案课题编写情况
+        List<TeacherFilesMaterial> teacherFilesMaterials = FmaterialMapper.selectTeacherFilesMaterialListByFilesId(id);
+        for (TeacherFilesMaterial date :teacherFilesMaterials){
+            LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SchoolAccessory::getBusinessId,date.gettId())
+                    .eq(SchoolAccessory::getAccessoryType,"材料编写附件");
+            List<SchoolAccessory> accessories = accessoryMapper.selectList(wrapper);
+            date.setAccessories(accessories);
+        }
+        teacherFiles.setMaterialList(teacherFilesMaterials);
+        //论文
+        List<TeacherFilesThesis> teacherFilesTheses = FthesisMapper.selectTeacherFilesThesisListByFilesId(id);
+        for (TeacherFilesThesis date : teacherFilesTheses){
+            LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SchoolAccessory::getBusinessId,date.gettId())
+                    .eq(SchoolAccessory::getAccessoryType,"论文情况附件");
+            List<SchoolAccessory> accessories = accessoryMapper.selectList(wrapper);
+            date.setSchoolAccessoryList(accessories);
+        }
+        teacherFiles.setThesisList(teacherFilesTheses);
+        //教师档案培训情况
+        List<TeacherFilesTraining> teacherFilesTrainings = FtrainingMapper.selectTeacherFilesTrainingListByFilesId(id);
+        for (TeacherFilesTraining date :teacherFilesTrainings){
+            LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SchoolAccessory::getBusinessId,date.gettId())
+                    .eq(SchoolAccessory::getAccessoryType,"培训情况附件");
+            List<SchoolAccessory> accessories = accessoryMapper.selectList(wrapper);
+            date.setAccessories(accessories);
+        }
+        teacherFiles.setTrainingList(teacherFilesTrainings);
+        //教师档案获奖情况
+        List<TeacherFilesAward> teacherFilesAwards = FawardMapper.selectTeacherFilesAwardListByFilesId(id);
+            for (TeacherFilesAward date :teacherFilesAwards){
+                LambdaQueryWrapper<SchoolAccessory> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(SchoolAccessory::getBusinessId,date.gettId())
+                        .eq(SchoolAccessory::getAccessoryType,"获奖情况附件");
+                List<SchoolAccessory> accessories = accessoryMapper.selectList(wrapper);
+                date.setAccessories(accessories);
+            }
+        teacherFiles.setAwardList(teacherFilesAwards);
         return teacherFiles;
         return teacherFiles;
     }
     }
 
 
@@ -114,9 +159,8 @@ public class TeacherFilesServiceImpl implements ITeacherFilesService
     }
     }
 
 
 
 
-    @Override
-    public List<TeacherFilesNotice> selctTeacherByUserId(Long userId,TeacherFilesNotice teacherFiles) {
-        return teacherFilesNoticeMapper.selctTeacherByUserId(userId,teacherFiles);
+    public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles) {
+        return teacherFilesNoticeMapper.selctTeacherByUserId(teacherFiles);
     }
     }
 
 
     /**
     /**

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

@@ -6,6 +6,7 @@ import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesNotice;
 import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
 import yangtz.cs.liu.campus.domain.teacherFiles.TeacherFilesVO;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * 教师档案Service接口
  * 教师档案Service接口
@@ -45,7 +46,6 @@ public interface ITeacherFilesService
      * @return 教师档案集合
      * @return 教师档案集合
      */
      */
     public int countYqr(TeacherFiles teacherFiles);
     public int countYqr(TeacherFiles teacherFiles);
-    public List<TeacherFilesNotice> selctTeacherByUserId(Long userId,TeacherFilesNotice teacherFiles);
     public List<TeacherFilesDeletRecord> getTeacherRocer(String tId);
     public List<TeacherFilesDeletRecord> getTeacherRocer(String tId);
 
 
     /**
     /**
@@ -54,6 +54,7 @@ public interface ITeacherFilesService
      * @return
      * @return
      */
      */
     public Integer teacherAdd(Long[] ids);
     public Integer teacherAdd(Long[] ids);
+    public List<TeacherFilesNotice> selctTeacherByUserId(TeacherFiles teacherFiles);
 
 
     /**
     /**
      * 新增教师档案
      * 新增教师档案

smart-campus/src/main/resources/mapper/schoolDcwj/SchoolDcwjMapper.xml

@@ -80,6 +80,7 @@
             </if>
             </if>
             and r.student_id = #{studentId} and d.dcwj_zt = '2' and d.del_flag = '0' and r.del_flag = '0'
             and r.student_id = #{studentId} and d.dcwj_zt = '2' and d.del_flag = '0' and r.del_flag = '0'
         </where>
         </where>
+        order by d.create_time desc
     </select>
     </select>
 
 
     <select id="teacherGetDcwjList" resultType="yangtz.cs.liu.wechat.vo.schoolDcwj.Vo_SchoolDcwj">
     <select id="teacherGetDcwjList" resultType="yangtz.cs.liu.wechat.vo.schoolDcwj.Vo_SchoolDcwj">
@@ -95,6 +96,7 @@
             </if>
             </if>
             and r.teacher_id = #{teacherId} and d.dcwj_zt = '2' and d.del_flag = '0' and r.del_flag = '0'
             and r.teacher_id = #{teacherId} and d.dcwj_zt = '2' and d.del_flag = '0' and r.del_flag = '0'
         </where>
         </where>
+        order by d.create_time desc
     </select>
     </select>
 
 
     <select id="queryList" resultType="yangtz.cs.liu.campus.vo.schoolDcwj.DawjVo">
     <select id="queryList" resultType="yangtz.cs.liu.campus.vo.schoolDcwj.DawjVo">

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

@@ -45,19 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     </select>
 
 
 
 
-
-    <select id="selctTeacherByUserId"  resultType="yangtz.cs.liu.campus.domain.teacherFiles.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_state = 2
-        <if test="teacherFiles.noticeRange != null  and teacherFiles.noticeRange != ''"> and fn.notice_range = #{teacherFiles.noticeRange}</if>
-        <if test="teacherFiles.noticeYear != null  and teacherFiles.noticeYear != ''"> and fn.notice_year = #{teacherFiles.noticeYear}</if>
-        <if test="teacherFiles.noticeSemester != null  and teacherFiles.noticeSemester != ''"> and fn.notice_semester = #{teacherFiles.noticeSemester}</if>
-        <if test="teacherFiles.noticeName != null  and teacherFiles.noticeName != ''"> and fn.notice_name like concat('%', #{teacherFiles.noticeName}, '%')</if>
-        <if test="teacherFiles.noticeState != null  and teacherFiles.noticeState != ''"> and fn.notice_state = #{teacherFiles.noticeState}</if>
-        <if test="teacherFiles.startTime != null "> and start_time = #{teacherFiles.startTime}</if>
-        <if test="teacherFiles.endTime != null "> and end_time = #{teacherFiles.endTime}</if>
-    </select>
-
     <select id="selectTeacherFilesNoticeListByUser" parameterType="TeacherFilesNotice" resultType="TeacherFilesNoticeTotal">
     <select id="selectTeacherFilesNoticeListByUser" parameterType="TeacherFilesNotice" resultType="TeacherFilesNoticeTotal">
         <include refid="selectTeacherFilesNoticeTotalVo"/>
         <include refid="selectTeacherFilesNoticeTotalVo"/>
         <where>
         <where>
@@ -78,6 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
         where id = #{id}
     </select>
     </select>
 
 
+    <select id="selctTeacherByUserId" parameterType="TeacherFiles" resultType="yangtz.cs.liu.campus.domain.teacherFiles.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_state = 2
+        <if test="noticeName != null "> and fn.notice_name LIKE concat('%', #{noticeName}, '%') </if>
+    </select>
+
+
+
     <insert id="insertTeacherFilesNotice" parameterType="TeacherFilesNotice">
     <insert id="insertTeacherFilesNotice" parameterType="TeacherFilesNotice">
         insert into teacher_files_notice
         insert into teacher_files_notice
         <trim prefix="(" suffix=")" suffixOverrides=",">
         <trim prefix="(" suffix=")" suffixOverrides=",">