Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/job/BaseNewStudentTask.java

@@ -153,8 +153,10 @@ public class BaseNewStudentTask {
                 existsNewStudent.setSecondAmbitionId(majorSetNameMap.get(feeobjupdate.getZytjspec()));
                 existsNewStudent.setGender(GenderDictionaryEnum.getCode(feeobjupdate.getSex()));
                 existsNewStudent.setModifyDate(new Date());
+                if(!planId.equals(existsNewStudent.getEnrollmentPlanId())){
+                    existsNewStudent.setStatus(0);
+                }
                 existsNewStudent.setEnrollmentPlanId(planId);
-                existsNewStudent.setStatus(0);
                 updateList.add(existsNewStudent);
                 continue;
             }

src/main/java/com/xjrsoft/module/student/dto/BaseStudentSimpleInfoDto.java

@@ -20,4 +20,7 @@ public class BaseStudentSimpleInfoDto {
     private String name;
 
     private String idNumber;
+
+    @ApiModelProperty("学籍状态")
+    private String archivesStatus;
 }

src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentSchoolRollServiceImpl.java

@@ -274,6 +274,7 @@ public class BaseStudentSchoolRollServiceImpl extends MPJBaseServiceImpl<BaseStu
 
     @Override
     public List<BaseStudentSompleInfoVo> getInfosByParam(BaseStudentSimpleInfoDto dto) {
+        dto.setArchivesStatus(ArchivesStatusEnum.FB2901.getCode());
         List<BaseStudentSompleInfoVo> userList = userMapper.getInfosByParam(dto);
         if(userList.isEmpty()){
             userList = newStudentMapper.getInfosByParam(dto);

src/main/java/com/xjrsoft/module/xycxedu/controller/ExamPlanController.java

@@ -73,7 +73,7 @@ public class ExamPlanController {
                 continue;
             }
             String[] split = record.getMilexamids().split(",");
-            List<Long> milexamids = Arrays.asList(split).stream()
+            List<Long> milexamids = Arrays.asList(split).stream().filter(StrUtil::isNotEmpty)
                     .map(Long::parseLong)
                     .collect(Collectors.toList());
             List<XycxeduExamList> list = examListService.list(new QueryWrapper<XycxeduExamList>().lambda().in(XycxeduExamList::getMilexamid, milexamids));

src/main/resources/mapper/organization/UserMapper.xml

@@ -47,6 +47,9 @@
         <if test="dto.userId != null">
             AND t1.id = #{dto.userId}
         </if>
+        <if test="dto.archivesStatus != null and dto.archivesStatus != ''">
+            AND t3.archives_status = ${dto.archivesStatus}
+        </if>
     </select>
     <select id="personPage" parameterType="com.xjrsoft.module.organization.dto.PersonPageDto" resultType="com.xjrsoft.module.organization.vo.PersonPageVo">
         SELECT t1.id,t1.name,t1.user_name,t1.mobile,t3.name AS gender_cn,t2.employ_type,t2.employ_way FROM xjr_user t1