把工具条横过来,占满一行,数据导入也放到工具条中,不要单独放

This commit is contained in:
2026-09-22 11:56:08 +08:00
parent 69a32e31d0
commit 3fcec5d756
8 changed files with 74 additions and 88 deletions
@@ -330,6 +330,15 @@ public class JYSController {
return Result.success(pageResult);
}
/**
* 去重职称列表(职称检索下拉数据源,职称无字典表)
*/
@PreAuthorize("@ss.hasPermi('teach:teacher:list')")
@GetMapping("/teacher/zc-options")
public Result<java.util.List<String>> teacherZcOptions() {
return Result.success(facultyService.listDistinctZc());
}
/**
* 教员数据文件导入(.xls/.xlsx
* <p>表头顺序:教员编号, 教员姓名, 教研室代号, 职称, 专业技术职务等级, 教员类别,
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.roomroot.jwgl.entity.JYB;
import com.roomroot.jwgl.vo.faculty.TeacherListVO;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -29,6 +30,10 @@ public interface JYBMapper extends BaseMapper<JYB> {
/** 教员列表双表联查分页 */
Page<TeacherListVO> selectTeacherPageList(Page<TeacherListVO> page, @Param("jyb") JYB cond);
/** 去重职称列表(教员类别/职称检索下拉数据源,职称无字典表) */
@Select("SELECT DISTINCT \"职称\" FROM \"教员表\" WHERE \"职称\" IS NOT NULL AND \"职称\" <> '' ORDER BY \"职称\"")
List<String> selectDistinctZc();
@Select("SELECT TRIM(b.\"教员编号\") FROM \"教员登录表\" b "
+ "JOIN \"登录信息表\" a ON TRIM(a.\"编号\") = TRIM(b.\"登录信息编号\") "
+ "WHERE LOWER(TRIM(a.\"账号\")) = LOWER(TRIM(#{username})) "
@@ -84,6 +84,11 @@ public interface FacultyService {
*/
void enableJYB(String jYBH);
/**
* 去重职称列表(职称检索下拉数据源)
*/
java.util.List<String> listDistinctZc();
/**
* 更新教员基本信息
*/
@@ -316,6 +316,11 @@ public class FacultyServiceImpl implements FacultyService {
}
}
@Override
public java.util.List<String> listDistinctZc() {
return jybMapper.selectDistinctZc();
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateJYB(JYB entity) {