档案信息

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/TeacherInfo.java

@@ -122,11 +122,13 @@ public class TeacherInfo extends BaseEntity {
     /**
      * 入职时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date onBoardTime;
 
     /**
      * 参加工作时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jobTime;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/TeacherInfoBo.java

@@ -140,13 +140,15 @@ public class TeacherInfoBo extends BaseEntity {
     /**
      * 入职时间
      */
-    @NotNull(message = "入职时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "入职时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date onBoardTime;
 
     /**
      * 参加工作时间
      */
-    @NotNull(message = "参加工作时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "参加工作时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jobTime;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/TeacherInfoVo.java

@@ -150,12 +150,14 @@ public class TeacherInfoVo implements Serializable {
      * 入职时间
      */
     @ExcelProperty(value = "入职时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date onBoardTime;
 
     /**
      * 参加工作时间
      */
     @ExcelProperty(value = "参加工作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jobTime;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/StudentInfoMapper.java

@@ -32,5 +32,7 @@ public interface StudentInfoMapper extends BaseMapperPlus<StudentInfo, StudentIn
 
     @InterceptorIgnore(tenantLine = "1")
     List<StudentInfoVo> selectStudentInfo(@Param(Constants.WRAPPER)QueryWrapper<StudentInfo> lqw);
+    @InterceptorIgnore(tenantLine = "1")
+    StudentInfoVo selectStudentInfoById(Long id);
 }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/CourseChangeServiceImpl.java

@@ -110,7 +110,12 @@ public class CourseChangeServiceImpl implements ICourseChangeService {
     private LambdaQueryWrapper<CourseChange> buildQueryWrapper(CourseChangeBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CourseChange> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getApplyId() != null, CourseChange::getApplyId, bo.getApplyId());
+        if(bo.getApplyId() != null && bo.getApplyId() != 0L) {
+            lqw.and(wrapper -> wrapper.eq( CourseChange::getApplyId, bo.getApplyId())
+                .or()
+                .eq( CourseChange::getBePersonnelId, bo.getBePersonnelId())
+            );
+        }
         lqw.like(StringUtils.isNotBlank(bo.getApplyName()), CourseChange::getApplyName, bo.getApplyName());
         lqw.eq(bo.getApplyTime() != null, CourseChange::getApplyTime, bo.getApplyTime());
         lqw.eq(bo.getSubjectClassId()!= null, CourseChange::getSubjectClassId, bo.getSubjectClassId());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/StudentInfoServiceImpl.java

@@ -52,7 +52,7 @@ public class StudentInfoServiceImpl implements IStudentInfoService {
      */
     @Override
     public StudentInfoVo queryById(Long id){
-        return baseMapper.selectStudentInfoByStudentId(id);
+        return baseMapper.selectStudentInfoById(id);
     }
 
     /**
@@ -91,7 +91,7 @@ public class StudentInfoServiceImpl implements IStudentInfoService {
     private QueryWrapper<StudentInfo> buildQueryWrapper(StudentInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         QueryWrapper<StudentInfo> lqw = Wrappers.query();
-        lqw.eq(bo.getStudentId() != null && bo.getParentsId()!= 0L, "s.student_id", bo.getStudentId());
+        lqw.eq(bo.getStudentId() != null && bo.getStudentId()!= 0L, "s.student_id", bo.getStudentId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), "s.name", bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getSex()), "s.sex", bo.getSex());
         lqw.eq(StringUtils.isNotBlank(bo.getAge()), "s.age", bo.getAge());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/TeacherInfoServiceImpl.java

@@ -64,7 +64,7 @@ public class TeacherInfoServiceImpl implements ITeacherInfoService {
     private QueryWrapper<TeacherInfo> buildQueryWrapper(TeacherInfoBo bo) {
         Map<String, Object> params = bo.getParams();
         QueryWrapper<TeacherInfo> lqw = Wrappers.query();
-        lqw.eq(bo.getTeacherId() != null && bo.getSchoolId() !=0L, "t.teacher_id", bo.getTeacherId());
+        lqw.eq(bo.getTeacherId() != null && bo.getTeacherId() !=0L, "t.teacher_id", bo.getTeacherId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), "t.name", bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getSex()), "t.sex", bo.getSex());
         lqw.eq(StringUtils.isNotBlank(bo.getAge()), "t.age", bo.getAge());
@@ -76,8 +76,8 @@ public class TeacherInfoServiceImpl implements ITeacherInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getBloodType()), "t.blood_type", bo.getBloodType());
         lqw.eq(StringUtils.isNotBlank(bo.getPoliticalStatus()), "t.political_status", bo.getPoliticalStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getAddress()), "t.address", bo.getAddress());
-        lqw.eq(bo.getOnBoardTime() != null && bo.getSchoolId() !=0L, "t.on_board_time", bo.getOnBoardTime());
-        lqw.eq(bo.getJobTime() != null && bo.getSchoolId() !=0L, "t.job_time", bo.getJobTime());
+        lqw.eq(StringUtils.isNotBlank((CharSequence) bo.getOnBoardTime()), "t.on_board_time", bo.getOnBoardTime());
+        lqw.eq(StringUtils.isNotBlank((CharSequence) bo.getJobTime()), "t.job_time", bo.getJobTime());
         lqw.eq(bo.getSchoolId() != null && bo.getSchoolId() !=0L, "f.school_id", bo.getJobTime());
         return lqw;
     }

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/StudentInfoMapper.xml

@@ -87,6 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join formal_parents_student f on s.student_id = f.id
         ${ew.getCustomSqlSegment}
     </select>
+    <select id="selectStudentInfoById" resultMap="StudentInfoResult">
+        <include refid="selectStudentInfoVo"/>
+        where id = #{id}
+    </select>
 
 
 </mapper>