Skip to content

D
dd_school
Commit 0279671d by baochunxin
Options

#G：优化提示，优化导出

parent b9afd099
Showing with 95 additions and 100 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
......@@ -166,72 +166,16 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
* @return
*/
@PostMapping("/export")
public void export(HttpServletResponse response, SchoolTeacherBasiclnExport export ) throws Exception{
List<SchoolTeacherBasicInformation> list = new ArrayList<>();
List<SchoolTeacherBasiclnExport> exportList = new ArrayList<>();
ExcelUtil<SchoolTeacherBasiclnExport> util = new ExcelUtil<>(SchoolTeacherBasiclnExport.class);
if (null != export.getIds()){
//1.当前为选中导出
for (int i = 0 ; i < export.getIds().length;i++){
SchoolTeacherBasicInformation byId = basichlnformationService.getById(export.getIds()[i]);
list.add(byId);
}
//复制一份
list.stream().forEach(date->{
SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
BeanUtils.copyProperties(date,schoolTeacherBasiclnExport);
exportList.add(schoolTeacherBasiclnExport);
});
util.exportExcel(response, exportList, "教师基本信息");
}else if (null != export.getId()){
//单条导出
SchoolTeacherBasicInformation byId = basichlnformationService.getById(export.getId());
SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
BeanUtils.copyProperties(byId,schoolTeacherBasiclnExport);
exportList.add(schoolTeacherBasiclnExport);
util.exportExcel(response, exportList, "教师基本信息");
}else {
//全部导出，条件导出
LambdaQueryWrapper<SchoolTeacherBasicInformation> wrapper = Wrappers.lambdaQuery();
//学科
wrapper.eq(StringUtils.isNotEmpty(export.getTeachingSubject()),SchoolTeacherBasicInformation::getTeachingSubject,export.getTeachingSubject());
//姓名
wrapper.like(StringUtils.isNotEmpty(export.getName()),SchoolTeacherBasicInformation::getName,export.getName());
//性别
wrapper.eq(StringUtils.isNotEmpty(export.getSex()),SchoolTeacherBasicInformation::getSex,export.getSex());
//政治面貌
wrapper.eq(StringUtils.isNotEmpty(export.getPoliticalLandscape()),SchoolTeacherBasicInformation::getPoliticalLandscape,export.getPoliticalLandscape());
//现职称
wrapper.like(StringUtils.isNotEmpty(export.getCurrentProfessionalTitle()),SchoolTeacherBasicInformation::getCurrentProfessionalTitle,export.getCurrentProfessionalTitle());
//在岗情况
wrapper.eq(StringUtils.isNotEmpty(export.getOnDutySituation()),SchoolTeacherBasicInformation::getOnDutySituation,export.getOnDutySituation());
//毕业院校
if (StringUtils.isNotEmpty(export.getGraduationInstitution1())){
wrapper.and(w->w.like(SchoolTeacherBasicInformation::getGraduationInstitution1,export.getGraduationInstitution1())
.or()
.like(SchoolTeacherBasicInformation::getGraduationInstitution2,export.getGraduationInstitution1())
.or()
.like(SchoolTeacherBasicInformation::getGraduationInstitution3,export.getGraduationInstitution1())
);
}
//学历
if (StringUtils.isNotEmpty(export.getFirstDegree())) {
wrapper.and(w->w.like(SchoolTeacherBasicInformation::getFirstDegree,export.getFirstDegree())
.or()
.like(SchoolTeacherBasicInformation::getLastDegree,export.getFirstDegree()));
}
wrapper.eq(SchoolTeacherBasicInformation::getDelFlag,"0");
//查询出来结果复制
List<SchoolTeacherBasicInformation> list1 = basichlnformationService.list(wrapper);
list1.forEach(date->{
SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
BeanUtils.copyProperties(date,schoolTeacherBasiclnExport);
exportList.add(schoolTeacherBasiclnExport);
});
util.exportExcel(response, exportList, "教师基本信息");
}
public void export(HttpServletResponse response, SchoolTeacherBasicInformationVo export ) throws Exception{
ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
// //查询出来结果复制
List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
// list1.forEach(date->{
// SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
// BeanUtils.copyProperties(date,schoolTeacherBasiclnExport);
// exportList.add(schoolTeacherBasiclnExport);
// });
util.exportExcel(response, list1, "教师基本信息");
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformationVo.java
......@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
......@@ -16,141 +17,167 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
// @Excel(name = "年级",combo = {"一年级","二年级","三年级"},readConverterExp = "1=一年级,2=二年级,3=三年级")
@TableId(value = "id", type = IdType.AUTO)
@Excel(name = "编号")
private Long id;
/**
* 姓名
*/
@Excel(name = "姓名")
private String name;
/**
* 身份证号
*/
@Excel(name = "身份证号")
private String idCard;
/**
* 年龄 。动态查询
*/
@Excel(name = "年龄")
private Integer age;
/**
* 性别
*/
@Excel(name = "性别", readConverterExp = "0=男,1=女,2=未知")
private String sex;
/**
* 档案出生日期 (年月)
*/
@JsonFormat(pattern = "yyyy-MM")
@Excel(name = "档案出生日期" ,dateFormat="yyyy-MM-dd")
private Date fileBirthDate;
/**
* 档案年龄
*/
@Excel(name = "档案年龄")
private Integer fileAge;
/**
* 出生年月
*/
@Excel(name = "出生年月")
private String birthDate;
/**
* 籍贯
*/
@Excel(name = "籍贯")
private String hometown;
/**
* 民族
*/
@Excel(name = "民族")
private String nation;
/**
* 政治面貌(1中共党员、2共青团员、3群众、4民主党派成员、5无党派人士)
*/
@Excel(name = "政治面貌" ,dictType="politics_tatusls")
private String politicalLandscape;
/**
* 入党时间（年月）
*/
@JsonFormat(pattern = "yyyy-MM")
@Excel(name = "入党时间" ,dateFormat="yyyy-MM-dd")
private Date partyMembershipTime;
/**
* 任教学科(1语文、2数学、3英语、4物理、5化学、6生物、7政治、8历史、9地理、10音乐、11体育、12美术、13技术、14心理、15书法)
*/
@Excel(name = "任教学科" ,dictType= "teaching_subjects")
private String teachingSubject;
/**
* 现职称(1无、2初级、3中级、4副高、5正高)
*/
@Excel(name = "现职称" ,dictType= "current_professional")
private String currentProfessionalTitle;
/**
* 现职称取得资格时间
*/
@Excel(name = "现职称取得时间" ,dateFormat="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date currentProfessionalTitleTime;
/**
* 现聘职称(1无、2初级、3中级、4副高、5正高)
*/
@Excel(name = "现聘职称",dictType= "current_professional")
private String currentHiringProfessionalTitle;
/**
* 现职称聘任时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "现聘职称取得时间" ,dateFormat="yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime;
/**
* 现聘岗位(1专业技术岗、2管理岗、3工勤岗)
*/
@Excel(name = "现聘岗位" ,dictType= "current_position")
private String currentPosition;
/**
* 现岗位等级(见习（三个现聘岗位都有见习这个等级 下拉框联动）、专业技术三级-专业技术十三级、
* 管理五级-管理九级、技术工二级-技术工五级)
*/
@Excel(name = "现岗位等级" ,dictType= "current_joblevel")
private String currentJobLevel;
/**
* 现岗位等级聘任时间
*/
@Excel(name = "现聘岗位取得时间" ,dateFormat="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date currentJobLevelAppointmentTime;
/**
* 职务
*/
@Excel(name = "职务")
private String duties;
/**
* 教师资格种类
*/
@Excel(name = "教师资格种类")
private String teacherQualificationType;
/**
* 教师资格证号码
*/
@Excel(name = "教师资格证号码")
private String teacherQualificationCertificateNum;
/**
* 参加工作时间
*/
@Excel(name = "参加工作时间")
private String workingHours;
/**
* 到二中工作时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "到二中工作时间" ,dateFormat="yyyy-MM-dd")
private Date toSecondMiddleSchoolTime;
/**
* 二中工作年龄
*/
@Excel(name = "到二中工作年限")
private Integer toSecondAge;
/**
......@@ -173,6 +200,7 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
/**
* 在岗情况(1教学岗位、2教辅岗、3后勤岗、4管理岗、5其他岗、6退休、7行政、8内退岗、9待退岗)
*/
@Excel(name = "在岗情况" ,dictType= "duty_situation")
private String onDutySituation;
/**
......@@ -183,69 +211,82 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
/**
* 毕业院校1
*/
@Excel(name = "毕业院校1")
private String graduationInstitution1;
/**
* 专业1
*/
@Excel(name = "专业1")
private String major1;
/**
* 毕业时间1 年月
*/
@Excel(name = "毕业时间1",dateFormat="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime1;
/**
* 毕业院校2
*/
@Excel(name = "毕业院校2")
private String graduationInstitution2;
/**
* 专业2
*/
@Excel(name = "专业2")
private String major2;
/**
* 毕业时间2年月
*/
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime2;
@Excel(name = "毕业时间2",dateFormat="yyyy-MM-dd")
private Date graduationTime2;
/**
* 毕业院校3
*/
@Excel(name = "毕业院校3")
private String graduationInstitution3;
/**
* 专业3
*/
@Excel(name = "专业3")
private String major3;
/**
* 毕业时间3 年月
*/
@Excel(name = "毕业时间3",dateFormat="yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM")
private Date graduationTime3;
/**
* 第一学历
*/
@Excel(name = "第一学历")
private String firstDegree;
/**
* 最后学历
*/
@Excel(name = "最后学历")
private String lastDegree;
/**
* 学位
*/
@Excel(name = "学位")
private String degree;
/**
* 工作经历
*/
@Excel(name = "工作经历")
private String workExperience;
/**
......@@ -262,7 +303,11 @@ public class SchoolTeacherBasicInformationVo extends BaseEntity {
* 钉钉手机号
*/
private String ddPhone;
/**\
* 备注
*/
@Excel(name = "备注")
private String remark;
/**
* 出生日期临时查询参数
*/
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentServiceImpl.java
......@@ -59,72 +59,73 @@ public class SchoolAclassTeacherAssessmentServiceImpl extends ServiceImpl<School
public String dataCheck(List<SchoolAclassTeacherAssessment> list){
StringBuffer sb = new StringBuffer();
SchoolCheckVo schoolCheckVo = null;
Integer index =1;
for (SchoolAclassTeacherAssessment date :list) {
index++;
//非空验证
//学年
if (StringUtils.isEmpty(date.getSchoolYear())) {
sb.append("学年 字段不能为空");
sb.append(index+"、学年 字段不能为空");
sb.append("<br/>");
}
//学期
if (StringUtils.isEmpty(date.getSemester())) {
sb.append("学期字段不能为空");
sb.append(index+"、学期字段不能为空");
sb.append("<br/>");
}
//届别
if (StringUtils.isEmpty(date.getYear())) {
sb.append("届别字段不能为空");
sb.append(index+"、届别字段不能为空");
sb.append("<br/>");
}
//年纪
if (StringUtils.isEmpty(date.getGrade())) {
sb.append("年纪字段不能为空");
sb.append(index+"、年纪字段不能为空");
sb.append("<br/>");
}
//教师姓名
if (StringUtils.isEmpty(date.getTeacherName())) {
sb.append("教师姓名字段不能为空");
sb.append(index+"、教师姓名字段不能为空");
sb.append("<br/>");
}
//班级
if (StringUtils.isEmpty(date.getClassName())) {
sb.append("班级字段不能为空");
sb.append(index+"、班级字段不能为空");
sb.append("<br/>");
}
//身份证号
if (StringUtils.isEmpty(date.getIdCard())) {
sb.append("身份证号字段不能为空");
sb.append(index+"、身份证号字段不能为空");
sb.append("<br/>");
}
//德育考核成绩
if (date.getMoralEduCheckAchievement() == null) {
sb.append("德育考核成绩字段不能为空");
sb.append(index+"、德育考核成绩字段不能为空");
sb.append("<br/>");
}
//智育考核成绩
if (date.getIntellEduCheckAchievement() == null) {
sb.append("智育考核成绩字段不能为空");
sb.append(index+"、智育考核成绩字段不能为空");
sb.append("<br/>");
}
//总考核成绩
if (date.getTotalCheckAchievement() == null) {
sb.append("总考核成绩字段不能为空");
sb.append(index+"、总考核成绩字段不能为空");
sb.append("<br/>");
}
//班级类型
if (StringUtils.isEmpty(date.getClassType())) {
sb.append("班级类型字段不能为空");
sb.append(index+"、班级类型字段不能为空");
sb.append("<br/>");
}
//学科
if (StringUtils.isEmpty(date.getSub())) {
sb.append("班学科字段不能为空");
sb.append(index+"、班学科字段不能为空");
sb.append("<br/>");
}
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolAworkloadServiceImpl.java
......@@ -65,82 +65,84 @@ public class SchoolAworkloadServiceImpl extends ServiceImpl<SchoolAworkloadMapp
public String dataCheck(List<SchoolAworkload> list){
StringBuffer sb = new StringBuffer();
Integer index = 1;
SchoolCheckVo schoolCheckVo = null;
for (SchoolAworkload date: list) {
index++;
//非空验证
//学年
if (StringUtils.isEmpty(date.getSchoolYear())) {
sb.append("学年字段不能为空");
sb.append(index+ "、学年字段不能为空");
sb.append("<br/>");
}
//学期
if (StringUtils.isEmpty(date.getSemester())) {
sb.append("学期字段不能为空");
sb.append(index+ "、学期字段不能为空");
sb.append("<br/>");
}
//届别
if (StringUtils.isEmpty(date.getYear())) {
sb.append("届别字段不能为空");
sb.append(index+ "、届别字段不能为空");
sb.append("<br/>");
}
//年纪
if (StringUtils.isEmpty(date.getGrade())) {
sb.append("年纪字段不能为空");
sb.append(index+ "、年纪字段不能为空");
sb.append("<br/>");
}
//姓名
if (StringUtils.isEmpty(date.getName())) {
sb.append("姓名字段不能为空");
sb.append(index+ "、姓名字段不能为空");
sb.append("<br/>");
}
//学科
if (StringUtils.isEmpty(date.getSub())) {
sb.append("学科字段不能为空");
sb.append(index+ "、学科字段不能为空");
sb.append("<br/>");
}
//身份证号
if (StringUtils.isEmpty(date.getIdCard())) {
sb.append("身份证号不能为空");
sb.append(index+ "、身份证号不能为空");
sb.append("<br/>");
}
//聘任岗位
if (StringUtils.isEmpty(date.getAppointmentPost())) {
sb.append("聘任岗位不能为空");
sb.append(index+ "、聘任岗位不能为空");
sb.append("<br/>");
}
//班级
if (StringUtils.isEmpty(date.getClassName())) {
sb.append("班级不能为空");
sb.append(index+ "、班级不能为空");
sb.append("<br/>");
}
//班级类型
if (StringUtils.isEmpty(date.getClassType())) {
sb.append("班级类型不能为空");
sb.append(index+ "、班级类型不能为空");
sb.append("<br/>");
}
//早读
if (date.getEarlyReading() == null) {
sb.append("早读不能为空");
sb.append(index+ "、早读不能为空");
sb.append("<br/>");
}
//正科
if (date.getRequiredCourses() == null) {
sb.append("正科不能为空");
sb.append(index+ "、正科不能为空");
sb.append("<br/>");
}
//晚自习
if (date.getEveningSelfStudy() == null) {
sb.append("晚自习不能为空");
sb.append(index+ "、晚自习不能为空");
sb.append("<br/>");
}
//证明人
if (date.getEveningSelfStudy() == null) {
sb.append("证明人不能为空");
sb.append(index+ "、证明人不能为空");
sb.append("<br/>");
}
}
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
......@@ -160,32 +160,35 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
public String dataCheck(List<SchoolTeacherBasicInformation> schoolTeacherBasicInformations){
StringBuilder sb = new StringBuilder();
SchoolCheckVo schoolCheckVo = null;
Integer index = 1;
for (SchoolTeacherBasicInformation date: schoolTeacherBasicInformations) {
index ++;
//非空验证
if (StringUtils.isEmpty(date.getName())) {
sb.append("用户姓名不可为空");
sb.append(index+ "、用户姓名不可为空");
sb.append("<br/>");
}
//身份证号
if (StringUtils.isEmpty(date.getIdCard())) {
sb.append("用户身份证号不可为空");
sb.append(index+ "、用户身份证号不可为空");
sb.append("<br/>");
}
//任教科目
if (StringUtils.isEmpty(date.getTeachingSubject())) {
sb.append("用户教学科不可为空");
sb.append(index+ "、用户教学科不可为空");
sb.append("<br/>");
}
//手机号
if (StringUtils.isEmpty(date.getTeachingSubject())) {
sb.append("用户手机号不可为空");
sb.append(index+ "、用户手机号不可为空");
sb.append("<br/>");
}
//到二中工作日期
if (null == date.getToSecondMiddleSchoolTime()) {
sb.append("二中工作日期不可为空 || 数据填写不规范");
sb.append(index+ "、二中工作日期不可为空 || 数据填写不规范");
sb.append("<br/>");
}
}
......
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