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

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

@@ -84,11 +84,11 @@ public class StudentHonorsController {
     @ApiOperation(value="根据id查询学生荣誉信息")
     @SaCheckPermission("studenthonors:detail")
     public RT<StudentHonorsVo> info(@RequestParam Long id){
-        StudentHonors studentHonors = studentHonorsService.getById(id);
+        StudentHonorsVo studentHonors = studentHonorsService.getInfo(id);
         if (studentHonors == null) {
            return RT.error("找不到此数据！");
         }
-        return RT.ok(BeanUtil.toBean(studentHonors, StudentHonorsVo.class));
+        return RT.ok(studentHonors);
     }
 
 
@@ -97,8 +97,12 @@ public class StudentHonorsController {
     @SaCheckPermission("studenthonors:add")
     public RT<Boolean> add(@Valid @RequestBody AddStudentHonorsDto dto){
         StudentHonors studentHonors = BeanUtil.toBean(dto, StudentHonors.class);
+        Integer sortCode = studentHonorsService.getSortCode();
+        studentHonors.setSortCode(sortCode);
+        studentHonors.setDataEntryMethod(2);
+        studentHonors.setStatus(1);
         boolean isSuccess = studentHonorsService.save(studentHonors);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping

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

@@ -35,11 +35,6 @@ public class AddStudentHonorsDto implements Serializable {
     @ApiModelProperty("申请人")
     private Long applicantUserId;
     /**
-    * 数据录入方式 1=推荐 2=登记
-    */
-    @ApiModelProperty("数据录入方式 1=推荐 2=登记")
-    private Integer dataEntryMethod;
-    /**
     * 学期ID(base_semester)
     */
     @ApiModelProperty("学期ID(base_semester)")
@@ -94,10 +89,5 @@ public class AddStudentHonorsDto implements Serializable {
     */
     @ApiModelProperty("附件文件id")
     private Long fileId;
-    /**
-    * 状态（1:结束 0:未结束）
-    */
-    @ApiModelProperty("状态（1:结束 0:未结束）")
-    private Integer status;
 
 }

src/main/java/com/xjrsoft/module/student/mapper/StudentHonorsMapper.java

@@ -1,13 +1,12 @@
 package com.xjrsoft.module.student.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
 import com.xjrsoft.module.student.dto.StudentHonorsPageDto;
 import com.xjrsoft.module.student.entity.StudentHonors;
 import com.xjrsoft.module.student.vo.StudentHonorsListVo;
 import com.xjrsoft.module.student.vo.StudentHonorsPageVo;
-import com.xjrsoft.module.student.vo.StudentHonorsTreeVo;
+import com.xjrsoft.module.student.vo.StudentHonorsVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -25,4 +24,8 @@ public interface StudentHonorsMapper extends MPJBaseMapper<StudentHonors> {
     List<StudentHonorsListVo> getClassInfo();
 
     List<StudentHonorsListVo> getSemesterInfo();
+
+    StudentHonorsVo getInfo(Long id);
+
+    Integer getSortCode();
 }

src/main/java/com/xjrsoft/module/student/service/IStudentHonorsService.java

@@ -6,7 +6,7 @@ import com.xjrsoft.module.student.dto.StudentHonorsPageDto;
 import com.xjrsoft.module.student.entity.StudentHonors;
 import com.xjrsoft.module.student.vo.StudentHonorsListVo;
 import com.xjrsoft.module.student.vo.StudentHonorsPageVo;
-import com.xjrsoft.module.student.vo.StudentHonorsTreeVo;
+import com.xjrsoft.module.student.vo.StudentHonorsVo;
 
 import java.util.List;
 
@@ -19,9 +19,29 @@ import java.util.List;
 
 public interface IStudentHonorsService extends MPJBaseService<StudentHonors> {
 
+
+    /**
+     * 分页查询
+     */
     Page<StudentHonorsPageVo> getPage(Page<StudentHonorsPageDto> page, StudentHonorsPageDto dto);
 
+    /**
+     * 查询班级信息
+     */
     List<StudentHonorsListVo> getClassInfo();
 
+    /**
+     * 查询学期信息
+     */
     List<StudentHonorsListVo> getSemesterInfo();
+
+    /**
+     * 根据id查询详情信息
+     */
+    StudentHonorsVo getInfo(Long id);
+
+    /**
+     * 查询最大的序号
+     */
+    Integer getSortCode();
 }

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

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.student.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.xjrsoft.module.student.dto.StudentHonorsPageDto;
@@ -8,7 +9,8 @@ import com.xjrsoft.module.student.mapper.StudentHonorsMapper;
 import com.xjrsoft.module.student.service.IStudentHonorsService;
 import com.xjrsoft.module.student.vo.StudentHonorsListVo;
 import com.xjrsoft.module.student.vo.StudentHonorsPageVo;
-import com.xjrsoft.module.student.vo.StudentHonorsTreeVo;
+import com.xjrsoft.module.student.vo.StudentHonorsVo;
+import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -28,8 +30,7 @@ public class StudentHonorsServiceImpl extends MPJBaseServiceImpl<StudentHonorsMa
     private final IFileService fileService;
     @Override
     public Page<StudentHonorsPageVo> getPage(Page<StudentHonorsPageDto> page, StudentHonorsPageDto dto) {
-        Page<StudentHonorsPageVo> result = studentHonorsMapper.getPage(page, dto);
-        return result;
+        return studentHonorsMapper.getPage(page, dto);
     }
 
     @Override
@@ -41,4 +42,16 @@ public class StudentHonorsServiceImpl extends MPJBaseServiceImpl<StudentHonorsMa
     public List<StudentHonorsListVo> getSemesterInfo() {
         return studentHonorsMapper.getSemesterInfo();
     }
+
+    @Override
+    public StudentHonorsVo getInfo(Long id) {
+        StudentHonorsVo result = studentHonorsMapper.getInfo(id);
+        result.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, result.getFileId())));
+        return result;
+    }
+
+    @Override
+    public Integer getSortCode() {
+        return studentHonorsMapper.getSortCode();
+    }
 }

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

@@ -1,13 +1,11 @@
 package com.xjrsoft.module.student.vo;
 
+import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
 
 /**
 * @title: 学生荣誉表单出参
@@ -24,35 +22,25 @@ public class StudentHonorsVo {
     @ApiModelProperty("主键编号")
     private Long id;
     /**
-    * 序号
-    */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
     * 申请人
     */
-    @ApiModelProperty("申请人")
-    private Long applicantUserId;
-    /**
-    * 数据录入方式 1=推荐 2=登记
-    */
-    @ApiModelProperty("数据录入方式 1=推荐 2=登记")
-    private Integer dataEntryMethod;
+    @ApiModelProperty("申请人姓名")
+    private String applicantUserName;
     /**
     * 学期ID(base_semester)
     */
-    @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterId;
+    @ApiModelProperty("学生姓名")
+    private String studentName;
     /**
     * 班级id
     */
-    @ApiModelProperty("班级id")
-    private Long classId;
+    @ApiModelProperty("年级")
+    private String gradeName;
     /**
     * 学生用户编号
     */
-    @ApiModelProperty("学生用户编号")
-    private Long studentUserId;
+    @ApiModelProperty("班级")
+    private String className;
     /**
     * 学号
     */
@@ -68,16 +56,25 @@ public class StudentHonorsVo {
     */
     @ApiModelProperty("荣誉级别(xjr_dictionary_item[honors_level])")
     private String honorsLevel;
+
+    @ApiModelProperty("荣誉级别-中文")
+    private String honorsLevelCn;
     /**
     * 荣誉等级(xjr_dictionary_item[honors_grade])
     */
     @ApiModelProperty("荣誉等级(xjr_dictionary_item[honors_grade])")
     private String honorsGrade;
+
+    @ApiModelProperty("荣誉等级-中文")
+    private String honorsGradeCn;
     /**
     * 荣誉类型(xjr_dictionary_item[honors_type])
     */
     @ApiModelProperty("荣誉类型(xjr_dictionary_item[honors_type])")
     private String honorsType;
+
+    @ApiModelProperty("荣誉类型-中文")
+    private String honorsTypeCn;
     /**
     * 荣誉名称
     */
@@ -93,12 +90,8 @@ public class StudentHonorsVo {
     */
     @ApiModelProperty("附件文件id")
     private Long fileId;
-    /**
-    * 状态（1:结束 0:未结束）
-    */
-    @ApiModelProperty("状态（1:结束 0:未结束）")
-    private Integer status;
-
 
+    @ApiModelProperty("附件列表")
+    private List<File> fileInfos;
 
 }

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

@@ -5,7 +5,7 @@
 <mapper namespace="com.xjrsoft.module.student.mapper.StudentHonorsMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.StudentHonorsPageDto" resultType="com.xjrsoft.module.student.vo.StudentHonorsPageVo">
         SELECT t1.id,t1.sort_code,t2.name AS student_name,t1.student_id,t3.name AS honors_level,t4.name AS honors_type,
-        t5.name AS honors_grade,t1.name AS honors_name, t1.award_date,t1.status,t1.file_id FROM student_honors t1
+        t5.name AS honors_grade,t1.name, t1.award_date,t1.status,t1.file_id FROM student_honors t1
         LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
         LEFT JOIN xjr_dictionary_detail t3 ON t1.honors_level = t3.code AND t3.item_id = 1731576278748352514
         LEFT JOIN xjr_dictionary_detail t4 ON t1.honors_type = t4.code AND t4.item_id = 1731577666295418881
@@ -23,4 +23,24 @@
         INNER JOIN base_class t2 ON t1.class_id = t2.id
         WHERE t1.delete_mark = 0
     </select>
+
+    <select id="getInfo" resultType="com.xjrsoft.module.student.vo.StudentHonorsVo">
+        SELECT t1.id,t2.name AS student_name,t1.student_id,t4.name AS grade_name,t5.name AS class_name,
+        t1.major_name,t1.name AS applicant_user_name,t1.award_date,t1.name,t1.honors_level,t8.name AS honors_level_cn,
+        t1.honors_type,t9.name AS honors_type_cn,t1.honors_grade, t10.name AS honors_grade_cn,
+        t1.file_id  FROM student_honors t1
+        LEFT JOIN xjr_user t2 ON t1.student_user_id = t2.id
+        LEFT JOIN base_student_school_roll t3 ON t1.student_user_id = t3.user_id
+        LEFT JOIN base_grade t4 ON t3.grade_id = t4.id
+        LEFT JOIN base_class t5 ON t1.class_id = t5.id
+        LEFT JOIN base_major_set t6 ON t3.major_set_id = t6.id
+        LEFT JOIN xjr_user t7 ON t1.applicant_user_id = t7.id
+        LEFT JOIN xjr_dictionary_detail t8 ON t1.honors_level = t8.code AND t8.item_id = 1731576278748352514
+        LEFT JOIN xjr_dictionary_detail t9 ON t1.honors_type = t9.code AND t9.item_id = 1731577666295418881
+        LEFT JOIN xjr_dictionary_detail t10 ON t1.honors_grade = t10.code AND t10.item_id = 1731577201793028098
+        WHERE t1.id = #{id} and t1.delete_mark = 0
+    </select>
+    <select id="getSortCode" resultType="java.lang.Integer">
+        SELECT IFNULL(MAX(IFNULL(sort_code, 0)), 0) + 1 FROM student_honors
+    </select>
 </mapper>