分班bug修复

src/main/java/com/xjrsoft/module/banding/controller/BandingTaskController.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.banding.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -73,6 +74,7 @@ public class BandingTaskController {
                         .select(BandingTask.class, x -> VoToColumnUtil.fieldsToColumns(BandingTaskPageVo.class).contains(x.getProperty()))
                         .selectAs(DictionaryDetail::getName, BandingTaskPageVo::getEnrollTypeCn)
                         .selectAs(BaseGrade::getName, BandingTaskPageVo::getGradeName)
+                        .eq(StrUtil.isNotEmpty(dto.getEnrollType()), BandingTask::getEnrollType, dto.getEnrollType())
                         .leftJoin(BaseGrade.class, BaseGrade::getId, BandingTask::getGradeId)
                         .leftJoin(DictionaryDetail.class, DictionaryDetail::getCode, BandingTask::getEnrollType)
         );

src/main/java/com/xjrsoft/module/banding/dto/BandingTaskPageDto.java

@@ -1,6 +1,7 @@
 package com.xjrsoft.module.banding.dto;
 
 import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,5 +16,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = false)
 public class BandingTaskPageDto extends PageInput {
 
-
+    @ApiModelProperty("招生类型")
+    private String enrollType;
 }

src/main/java/com/xjrsoft/module/personnel/controller/StundentFaceProcessController.java

@@ -141,6 +141,23 @@ public class StundentFaceProcessController {
         return RT.ok(BeanUtil.toBean(stundentFaceProcess, StundentFaceProcessVo.class));
     }
 
+    @GetMapping(value = "/info-userId")
+    @ApiOperation(value="根据用户id查询学生人脸信息审核信息")
+    @SaCheckPermission("stundentfaceprocess:detail")
+    public RT<StundentFaceProcessVo> infoUserId(@RequestParam Long userId){
+        List<StundentFaceProcess> stundentFaceProcess = stundentFaceProcessService.list(
+                new QueryWrapper<StundentFaceProcess>().lambda()
+                        .eq(StundentFaceProcess::getUserId, userId)
+                        .eq(StundentFaceProcess::getStatus, 1)
+                        .orderByDesc(StundentFaceProcess::getCreateDate)
+
+        );
+        if (stundentFaceProcess == null || stundentFaceProcess.isEmpty()) {
+            return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(stundentFaceProcess.get(0), StundentFaceProcessVo.class));
+    }
+
 
     @PostMapping
     @ApiOperation(value = "新增学生人脸信息审核")

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

@@ -114,6 +114,8 @@ public class BaseNewStudentController {
     @SaCheckPermission("basenewstudent:add")
     public RT<Boolean> add(@Valid @RequestBody AddBaseNewStudentDto dto){
         BaseNewStudent baseNewStudent = BeanUtil.toBean(dto, BaseNewStudent.class);
+        baseNewStudent.setFirstAmbitionId(Long.parseLong(dto.getFirstAmbition()));
+        baseNewStudent.setSecondAmbitionId(Long.parseLong(dto.getSecondAmbition()));
         boolean isSuccess = baseNewStudentService.save(baseNewStudent);
         return RT.ok(isSuccess);
     }

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

@@ -99,6 +99,12 @@ public class BaseNewStudentPageVo {
     @ExcelProperty("学生来源")
     @ApiModelProperty("学生来源")
     private String source;
+
+    @ContentStyle(dataFormat = 49)
+    @ExcelProperty("学生来源中文")
+    @ApiModelProperty("学生来源中文")
+    private String sourceCn;
+
     /**
     * 住宿类型
     */

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

@@ -5,10 +5,11 @@
 <mapper namespace="com.xjrsoft.module.student.mapper.BaseNewStudentMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseNewStudentPageDto" resultType="com.xjrsoft.module.student.vo.BaseNewStudentPageVo">
         SELECT t1.id,t1.graduate_school,t1.name,t1.gender,t2.name AS gender_cn,t1.credential_number,t1.height,t1.weight,
-        t1.score,t1.graduate_class,t1.source,t1.stduy_status,t3.name AS stduy_status_cn,t1.mobile,t1.first_ambition,
+        t1.score,t1.graduate_class,t1.source,t5.name as source_cn,t1.stduy_status,t3.name AS stduy_status_cn,t1.mobile,t1.first_ambition,
         t1.second_ambition,t1.is_adjust,t1.status FROM base_new_student t1
         LEFT JOIN xjr_dictionary_detail t2 ON t1.gender = t2.code AND t2.item_id = 2023000000000000004
         LEFT JOIN xjr_dictionary_detail t3 ON t1.stduy_status = t3.code AND t3.item_id = 2023000000000000030
+        LEFT JOIN xjr_dictionary_detail t5 ON t1.source = t5.code AND t5.item_id = 2023000000000000028
         LEFT JOIN enrollment_plan t4 ON t1.enrollment_plan_id = t4.id
         WHERE t1.delete_mark = 0
         <if test="dto.name != null and dto.name != ''">