Skip to content

D
dd_school
Commit b9afd099 by baochunxin
Options

#G：导入1提示变更

parent d6855395
Showing with 14 additions and 21 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
...@@ -9,7 +9,6 @@ import com.itextpdf.text.pdf.PdfPTable; ...@@ -9,7 +9,6 @@ import com.itextpdf.text.pdf.PdfPTable;
import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.config.RuoYiConfig;
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;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.pdf.PDFUtil; import com.ruoyi.common.utils.pdf.PDFUtil;
...@@ -29,17 +28,11 @@ import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnfo ...@@ -29,17 +28,11 @@ import yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnfo
import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo; import yangtz.cs.liu.campus.vo.fudao.FudaoStudentVo;
import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo; import yangtz.cs.liu.campus.vo.fudao.FudaoTeacherVo;
import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo; import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXteachingAchievementsVo;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.*; import java.io.*;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@RestController @RestController
@RequestMapping("/teacher/basiclnformation") @RequestMapping("/teacher/basiclnformation")
......
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolNewTeacherDzdn/SchoolTeacherBasicInformation.java
...@@ -48,7 +48,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -48,7 +48,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 档案出生日期 (年月) * 档案出生日期 (年月)
*/ */
@Excel(name = "档案出生日期") @Excel(name = "档案出生日期")
@JsonFormat(pattern = "yyyy-MM") // @JsonFormat(pattern = "yyyy-MM")
private Date fileBirthDate; private Date fileBirthDate;
...@@ -85,7 +85,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -85,7 +85,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 入党时间（年月） * 入党时间（年月）
*/ */
@Excel(name = "入党时间") @Excel(name = "入党时间")
@JsonFormat(pattern = "yyyy-MM") // @JsonFormat(pattern = "yyyy-MM")
private Date partyMembershipTime; private Date partyMembershipTime;
/** /**
...@@ -104,7 +104,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -104,7 +104,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 现职称取得资格时间 * 现职称取得资格时间
*/ */
@Excel(name = "现职称取得资格时间") @Excel(name = "现职称取得资格时间")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date currentProfessionalTitleTime; private Date currentProfessionalTitleTime;
/** /**
...@@ -117,7 +117,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -117,7 +117,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 现职称聘任时间 * 现职称聘任时间
*/ */
@Excel(name = "现职称聘任时间") @Excel(name = "现职称聘任时间")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date currentHiringProfessionalTitleTime; private Date currentHiringProfessionalTitleTime;
/** /**
...@@ -137,7 +137,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -137,7 +137,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 现岗位等级聘任时间 * 现岗位等级聘任时间
*/ */
@Excel(name = "现岗位等级聘任时间") @Excel(name = "现岗位等级聘任时间")
@JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
private Date currentJobLevelAppointmentTime; private Date currentJobLevelAppointmentTime;
/** /**
...@@ -221,7 +221,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -221,7 +221,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 毕业时间1 年月 * 毕业时间1 年月
*/ */
@Excel(name = "毕业时间1") @Excel(name = "毕业时间1")
@JsonFormat(pattern = "yyyy-MM") // @JsonFormat(pattern = "yyyy-MM")
private Date graduationTime1; private Date graduationTime1;
/** /**
...@@ -240,7 +240,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -240,7 +240,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 毕业时间2年月 * 毕业时间2年月
*/ */
@Excel(name = "毕业时间2") @Excel(name = "毕业时间2")
@JsonFormat(pattern = "yyyy-MM") // @JsonFormat(pattern = "yyyy-MM")
private Date graduationTime2; private Date graduationTime2;
/** /**
...@@ -259,7 +259,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity { ...@@ -259,7 +259,7 @@ public class SchoolTeacherBasicInformation extends BaseEntity {
* 毕业时间3 年月 * 毕业时间3 年月
*/ */
@Excel(name = "毕业时间3") @Excel(name = "毕业时间3")
@JsonFormat(pattern = "yyyy-MM") // @JsonFormat(pattern = "yyyy-MM")
private Date graduationTime3; private Date graduationTime3;
/** /**
......
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
...@@ -174,18 +174,18 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo ...@@ -174,18 +174,18 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
} }
//任教科目 //任教科目
if (StringUtils.isEmpty(date.getTeachingSubject())) { if (StringUtils.isEmpty(date.getTeachingSubject())) {
sb.append("用户任教学科不可为空"); sb.append("用户教学科不可为空");
sb.append("<br/>"); sb.append("<br/>");
} }
//手机号 //手机号
if (StringUtils.isEmpty(date.getTeachingSubject())) { if (StringUtils.isEmpty(date.getTeachingSubject())) {
sb.append("用户任手机号不可为空"); sb.append("用户手机号不可为空");
sb.append("<br/>"); sb.append("<br/>");
} }
//到二中工作日期 //到二中工作日期
if (null == date.getToSecondMiddleSchoolTime()) { if (null == date.getToSecondMiddleSchoolTime()) {
sb.append("用户任到二中工作日期不可为空"); sb.append("二中工作日期不可为空 || 数据填写不规范");
sb.append("<br/>"); sb.append("<br/>");
} }
} }
......
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml
...@@ -21,13 +21,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -21,13 +21,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="birthDategtd != null and birthDate != ''"> and birth_date &gt;= #{birthDategtd}</if> <if test="birthDategtd != null and birthDate != ''"> and birth_date &gt;= #{birthDategtd}</if>
<if test="birthDatelt != null and birthDate != ''"> and birth_date &lt; #{birthDatelt}</if> <if test="birthDatelt != null and birthDate != ''"> and birth_date &lt; #{birthDatelt}</if>
<if test="birthDateltd != null and birthDate != ''"> and birth_date &lt;= #{birthDateltd}</if> <if test="birthDateltd != null and birthDate != ''"> and birth_date &lt;= #{birthDateltd}</if>
<if test="birthDate != null and birthDate != ''"> and birth_date = #{birthDate}</if> <if test="birthDate != null and birthDate != ''"> and birth_date like concat('%', #{birthDate}, '%') </if>
<if test="politicalLandscape != null "> and political_landscape = #{politicalLandscape}</if> <if test="politicalLandscape != null "> and political_landscape #{politicalLandscape} </if>
<if test="workingHoursgt != null "> and working_hours &gt; #{workingHoursgt}</if> <if test="workingHoursgt != null "> and working_hours &gt; #{workingHoursgt}</if>
<if test="workingHoursgtd != null "> and working_hours &gt;= #{workingHoursgtd}</if> <if test="workingHoursgtd != null "> and working_hours &gt;= #{workingHoursgtd}</if>
<if test="workingHourslt != null "> and working_hours &lt; #{workingHourslt}</if> <if test="workingHourslt != null "> and working_hours &lt; #{workingHourslt}</if>
<if test="workingHoursltd != null "> and working_hours &lt;= #{workingHoursltd}</if> <if test="workingHoursltd != null "> and working_hours &lt;= #{workingHoursltd}</if>
<if test="workingHours != null "> and working_hours = #{workingHours}</if> <if test="workingHours != null "> and working_hours like concat('%', #{workingHours}, '%')</if>
<if test="currentProfessionalTitle != null "> <if test="currentProfessionalTitle != null ">
and current_professional_title like concat('%', #{currentProfessionalTitle}, '%') and current_professional_title like concat('%', #{currentProfessionalTitle}, '%')
</if> </if>
......
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