pc端学生基本信息增加学习形式和学籍照片

src/main/java/com/xjrsoft/module/student/controller/StudentManagerController.java

@@ -24,6 +24,8 @@ import com.xjrsoft.module.base.service.IBaseGradeService;
 import com.xjrsoft.module.concat.service.IXjrUserService;
 import com.xjrsoft.module.organization.entity.UserDeptRelation;
 import com.xjrsoft.module.organization.service.IUserDeptRelationService;
+import com.xjrsoft.module.personnel.entity.FaceManagement;
+import com.xjrsoft.module.personnel.service.IFaceManagementService;
 import com.xjrsoft.module.room.service.IRoomBedService;
 import com.xjrsoft.module.student.dto.AddBaseStudentUserDto;
 import com.xjrsoft.module.student.dto.BaseStudentUserPageDto;
@@ -70,6 +72,7 @@ public class StudentManagerController {
     private final IXjrUserService xjrUserService;
     private final IRoomBedService roomBedService;
     private final IUserDeptRelationService userDeptRelationService;
+    private final IFaceManagementService faceManagementService;
     @GetMapping(value = "/page")
     @ApiOperation(value = "学生列表(分页)")
     @SaCheckPermission("studentmanager:detail")
@@ -169,6 +172,12 @@ public class StudentManagerController {
         userVo.setDepartmentIds(allDeptIdStr);
 
         userVo.setGenderCn(GenderDictionaryEnum.getValue(userVo.getGender()));
+
+        //查询头像照片
+        FaceManagement faceManagement = faceManagementService.getOne(
+            new QueryWrapper<FaceManagement>().lambda()
+            .eq(FaceManagement::getUserId, userVo.getId())
+        );
         return R.ok(userVo);
     }
 

src/main/java/com/xjrsoft/module/student/vo/BaseStudentSchoolRollVo.java

@@ -151,4 +151,7 @@ public class BaseStudentSchoolRollVo {
     @ApiModelProperty("寝室号")
     private String roomName;
 
+
+
+
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentUserPageVo.java

@@ -35,4 +35,10 @@ public class BaseStudentUserPageVo {
 
     @ApiModelProperty("学生类别")
     private String studentTypeCn;
+
+    @ApiModelProperty("头像照片")
+    private String avatar;
+
+    @ApiModelProperty("学习形式")
+    private String learnStatusCn;
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentUserVo.java

@@ -128,4 +128,5 @@ public class BaseStudentUserVo {
 
     @ApiModelProperty("部门id")
     private String departmentIds;
+
 }

src/main/resources/mapper/student/BaseStudentMapper.xml

@@ -52,7 +52,7 @@
     </select>
     <select id="getStudentPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentUserPageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentUserPageVo">
         SELECT t1.id,t4.name AS class_name,t5.name AS teacher_name,t1.name,t6.name AS gender_cn,t1.credential_number,
-        t1.mobile,t7.name AS archives_status_cn ,t8.name AS stduy_status_cn,t9.name AS student_type_cn FROM xjr_user t1
+        t1.mobile,t7.name AS archives_status_cn ,t8.name AS stduy_status_cn,t9.name AS student_type_cn,t1.avatar,t10.name as learn_status_cn FROM xjr_user t1
         INNER JOIN base_student t2 ON t1.id = t2.user_id
         LEFT JOIN base_student_school_roll t3 ON t1.id = t3.user_id
         LEFT JOIN base_class t4 ON t4.id = t3.class_id
@@ -61,6 +61,7 @@
         LEFT JOIN xjr_dictionary_detail t7 ON t3.archives_status = t7.code AND t7.item_id = 2023000000000000029
         LEFT JOIN xjr_dictionary_detail t8 ON t3.stduy_status = t8.code AND t8.item_id = 2023000000000000030
         LEFT JOIN xjr_dictionary_detail t9 ON t3.student_type = t9.code AND t9.item_id = 2023000000000000028
+        LEFT JOIN xjr_dictionary_detail t10 ON t3.learn_status = t10.code AND t9.item_id = 1762024751192084482
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         <if test="dto.name != null and dto.name != ''">
             and t1.name like concat('%', #{dto.name},'%')