fanxp 1 year ago
parent
commit
72d65505d8

+ 4 - 50
src/main/java/com/xjrsoft/module/student/controller/BaseStudentAssessmentInspectionController.java

@@ -76,54 +76,8 @@ public class BaseStudentAssessmentInspectionController {
     @ApiOperation(value = "根据id查询学生班级巡查考核信息")
     @SaCheckPermission("basestudentassessmentinspection:detail")
     public RT<BaseStudentAssessmentInspectionVo> info(@RequestParam Long id) {
-        BaseStudentAssessmentInspection baseStudentAssessmentInspection = baseStudentAssessmentInspectionService.getById(id);
-        if (baseStudentAssessmentInspection == null) {
-            return RT.error("找不到此数据!");
-        }
-        BaseStudentAssessmentInspectionVo baseStudentAssessmentInspectionVo = BeanUtil.toBean(baseStudentAssessmentInspection, BaseStudentAssessmentInspectionVo.class);
-        //查询班级
-        LambdaQueryWrapper<BaseStudentAssessmentClassRelation> classQueryWrapper = new LambdaQueryWrapper<>();
-        classQueryWrapper
-                .eq(BaseStudentAssessmentClassRelation::getBaseStudentAssessmentInspectionId, id)
-                .select(BaseStudentAssessmentClassRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentClassRelationListVo.class).contains(x.getProperty()));
-        List<BaseStudentAssessmentClassRelation> classList = baseStudentAssessmentClassRelationService.list(classQueryWrapper);
-        baseStudentAssessmentInspectionVo.setClassList(BeanUtil.copyToList(classList, BaseStudentAssessmentClassRelationListVo.class));
-
-        //查询学生
-        LambdaQueryWrapper<BaseStudentAssessmentStudentRelation> studentQueryWrapper = new LambdaQueryWrapper<>();
-        studentQueryWrapper
-                .eq(BaseStudentAssessmentStudentRelation::getBaseStudentAssessmentInspectionId, id)
-                .select(BaseStudentAssessmentStudentRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentStudentRelationVo.class).contains(x.getProperty()));
-        List<BaseStudentAssessmentStudentRelation> studentList = baseStudentAssessmentStudentRelationService.list(studentQueryWrapper);
-        baseStudentAssessmentInspectionVo.setStudentList(BeanUtil.copyToList(studentList, BaseStudentAssessmentStudentRelationVo.class));
-        baseStudentAssessmentInspectionVo.setStudentCount(studentList.size());
-
-        //查询考核项目
-        BaseStudentAssessmentProject project = baseStudentAssessmentProjectMapper.selectById(baseStudentAssessmentInspection.getBaseStudentAssessmentProjectId());
-        if (project != null) {
-            baseStudentAssessmentInspectionVo.setAssessmentProjectName(project.getName());
-        }
-        //查询考核类别
-        BaseStudentAssessmentCategory category = baseStudentAssessmentCategoryMapper.selectById(baseStudentAssessmentInspection.getBaseStudentAssessmentCategoryId());
-        if (category != null) {
-            baseStudentAssessmentInspectionVo.setAssessmentCategoryName(category.getName());
-        }
-        //登记人
-        XjrUser createUser = xjrUserMapper.selectById(baseStudentAssessmentInspection.getCreateUserId());
-        if (createUser != null) {
-            baseStudentAssessmentInspectionVo.setCreateUserName(createUser.getName());
-        }
-        //考核人
-        XjrUser assessmentUser = xjrUserMapper.selectById(baseStudentAssessmentInspection.getAssessmentUserId());
-        if (createUser != null) {
-            baseStudentAssessmentInspectionVo.setAssessmentUserName(assessmentUser.getName());
-        }
-        //修改人
-        XjrUser modifyUser = xjrUserMapper.selectById(baseStudentAssessmentInspection.getModifyUserId());
-        if (modifyUser != null) {
-            baseStudentAssessmentInspectionVo.setModifyUserName(modifyUser.getName());
-        }
-        return RT.ok(baseStudentAssessmentInspectionVo);
+        BaseStudentAssessmentInspectionVo result = baseStudentAssessmentInspectionService.getInfo(id);
+        return RT.ok(result);
     }
 
     @GetMapping(value = "/mobile-page")
@@ -137,8 +91,8 @@ public class BaseStudentAssessmentInspectionController {
     @GetMapping(value = "/mobile-info")
     @ApiOperation(value = "根据id查询学生班级巡查考核信息(移动端)")
     @SaCheckPermission("basestudentassessmentinspection:detail")
-    public RT<BaseStudentAssessmentInspectionMobileVo> mobileInfo(@Valid BaseStudentAssessmentInspectionMobileDto dto) {
-        BaseStudentAssessmentInspectionMobileVo result = baseStudentAssessmentInspectionService.getMobileInfo(dto);
+    public RT<BaseStudentAssessmentInspectionMobileVo> mobileInfo(@Valid Long id) {
+        BaseStudentAssessmentInspectionMobileVo result = baseStudentAssessmentInspectionService.getMobileInfo(id);
         return RT.ok(result);
     }
 

+ 0 - 18
src/main/java/com/xjrsoft/module/student/dto/BaseStudentAssessmentInspectionMobileDto.java

@@ -1,18 +0,0 @@
-package com.xjrsoft.module.student.dto;
-
-import com.xjrsoft.common.page.ListInput;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-@Data
-public class BaseStudentAssessmentInspectionMobileDto extends ListInput {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty("主键")
-    @NotNull(message = "主键不能为空!")
-    private Long id;
-}

+ 1 - 1
src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentClassRelationMapper.java

@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
 * @Version 1.0
 */
 @Mapper
-public interface BaseStudentAssessmentClassRelationMapper extends BaseMapper<BaseStudentAssessmentClassRelation> {
+public interface BaseStudentAssessmentClassRelationMapper extends MPJBaseMapper<BaseStudentAssessmentClassRelation> {
 
 }

+ 8 - 2
src/main/java/com/xjrsoft/module/student/mapper/BaseStudentAssessmentInspectionMapper.java

@@ -2,13 +2,13 @@ package com.xjrsoft.module.student.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseMapper;
-import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobileDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -27,6 +27,12 @@ public interface BaseStudentAssessmentInspectionMapper extends MPJBaseMapper<Bas
      */
     Page<BaseStudentAssessmentInspectionPageVo> getPage(Page<BaseStudentAssessmentInspectionPageDto> page,BaseStudentAssessmentInspectionPageDto dto);
 
+    /**
+     * 数据详情
+     * @return
+     */
+    BaseStudentAssessmentInspectionVo getInfo(Long id);
+
     /**
      * app分页查询
      * @param page
@@ -39,5 +45,5 @@ public interface BaseStudentAssessmentInspectionMapper extends MPJBaseMapper<Bas
      * app数据详情
      * @return
      */
-    BaseStudentAssessmentInspectionMobileVo getMobileInfo(BaseStudentAssessmentInspectionMobileDto dto);
+    BaseStudentAssessmentInspectionMobileVo getMobileInfo(Long id);
 }

+ 8 - 2
src/main/java/com/xjrsoft/module/student/service/IBaseStudentAssessmentInspectionService.java

@@ -2,13 +2,13 @@ package com.xjrsoft.module.student.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
-import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobileDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo;
 
 /**
 * @title: 学生班级巡查考核
@@ -25,6 +25,12 @@ public interface IBaseStudentAssessmentInspectionService extends MPJBaseService<
      */
     Page<BaseStudentAssessmentInspectionPageVo> getPage(Page<BaseStudentAssessmentInspectionPageDto> page,BaseStudentAssessmentInspectionPageDto dto);
 
+    /**
+     * 数据详情
+     * @return
+     */
+    BaseStudentAssessmentInspectionVo getInfo(Long id);
+
     /**
      * app分页查询
      * @param page
@@ -37,5 +43,5 @@ public interface IBaseStudentAssessmentInspectionService extends MPJBaseService<
      * app数据详情
      * @return
      */
-    BaseStudentAssessmentInspectionMobileVo getMobileInfo(BaseStudentAssessmentInspectionMobileDto dto);
+    BaseStudentAssessmentInspectionMobileVo getMobileInfo(Long id);
 }

+ 52 - 8
src/main/java/com/xjrsoft/module/student/service/impl/BaseStudentAssessmentInspectionServiceImpl.java

@@ -1,23 +1,28 @@
 package com.xjrsoft.module.student.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.enums.ScoreTypeEnum;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.oa.entity.Schedule;
-import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobileDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentStudentRelation;
+import com.xjrsoft.module.student.entity.BaseStudentCadre;
+import com.xjrsoft.module.student.mapper.BaseStudentAssessmentClassRelationMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentAssessmentInspectionMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentAssessmentStudentRelationMapper;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
+import com.xjrsoft.module.student.vo.*;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
+import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +42,8 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
     private final BaseStudentAssessmentStudentRelationMapper assessmentStudentRelationMapper;
 
+    private final BaseStudentAssessmentClassRelationMapper assessmentClassRelationMapper;
+
     private final IFileService fileService;
 
     @Override
@@ -51,6 +58,43 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
         return result;
     }
 
+    @Override
+    public BaseStudentAssessmentInspectionVo getInfo(Long id) {
+        BaseStudentAssessmentInspectionVo result = assessmentInspectionMapper.getInfo(id);
+        // 处理加减分
+        if (result.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
+            result.setScore(result.getScore() * -1);
+        }
+
+        // 获取班级信息
+        List<BaseStudentAssessmentClassListVo> baseStudentAssessmentClassListVos = assessmentClassRelationMapper.selectJoinList(BaseStudentAssessmentClassListVo.class,
+                MPJWrappers.<BaseStudentAssessmentClassRelation>lambdaJoin()
+                        .leftJoin(BaseClass.class, BaseClass::getId, BaseStudentAssessmentClassRelation::getClassId)
+                        .leftJoin(XjrUser.class, XjrUser::getId, BaseClass::getTeacherId)
+                        .eq(BaseStudentAssessmentClassRelation::getBaseStudentAssessmentInspectionId, id)
+                        .select(BaseStudentAssessmentClassRelation::getId)
+                        .selectAs(BaseClass::getName, BaseStudentAssessmentClassListVo::getClassName)
+                        .selectAs(XjrUser::getName, BaseStudentAssessmentClassListVo::getTeacherName)
+                        .selectAs(XjrUser::getMobile, BaseStudentAssessmentClassListVo::getMobile)
+                        .select(BaseStudentAssessmentClassRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentAssessmentClassRelation.class).contains(x.getProperty()))
+
+        );
+        result.setClassList(baseStudentAssessmentClassListVos);
+
+
+        // 获取学生信息
+        List<BaseStudentAssessmentStudentRelation> baseStudentAssessmentStudentRelations = assessmentStudentRelationMapper.selectList(
+                Wrappers.<BaseStudentAssessmentStudentRelation>query().lambda()
+                        .eq(BaseStudentAssessmentStudentRelation::getBaseStudentAssessmentInspectionId, result.getId())
+        );
+        result.setStudentList(baseStudentAssessmentStudentRelations);
+
+        // 获取文件列表
+        result.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, result.getFileId())));
+
+        return result;
+    }
+
     @Override
     public Page<BaseStudentAssessmentInspectionMobilePageVo> getMobilePage(Page<BaseStudentAssessmentInspectionMobilePageDto> page, BaseStudentAssessmentInspectionMobilePageDto dto) {
         Page<BaseStudentAssessmentInspectionMobilePageVo> result = assessmentInspectionMapper.getMobilePage(page, dto);
@@ -64,8 +108,8 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
     }
 
     @Override
-    public BaseStudentAssessmentInspectionMobileVo getMobileInfo(BaseStudentAssessmentInspectionMobileDto dto) {
-        BaseStudentAssessmentInspectionMobileVo result = assessmentInspectionMapper.getMobileInfo(dto);
+    public BaseStudentAssessmentInspectionMobileVo getMobileInfo(Long id) {
+        BaseStudentAssessmentInspectionMobileVo result = assessmentInspectionMapper.getMobileInfo(id);
         // 处理加减分
         if (result.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
             result.setScore(result.getScore() * -1);
@@ -75,13 +119,13 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
         List<BaseStudentAssessmentStudentRelation> baseStudentAssessmentStudentRelations = assessmentStudentRelationMapper.selectList(
                 Wrappers.<BaseStudentAssessmentStudentRelation>query().lambda()
                         .eq(BaseStudentAssessmentStudentRelation::getBaseStudentAssessmentInspectionId, result.getBaseStudentAssessmentInspectionId())
-                        .eq(BaseStudentAssessmentStudentRelation::getClassId,result.getClassId())
+                        .eq(BaseStudentAssessmentStudentRelation::getClassId, result.getClassId())
         );
         result.setStudentList(baseStudentAssessmentStudentRelations);
         result.setStudentCount(baseStudentAssessmentStudentRelations.size());
 
         // 获取文件列表
-        result.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId,result.getFileId())));
+        result.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, result.getFileId())));
 
         return result;
     }

+ 44 - 0
src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentClassListVo.java

@@ -0,0 +1,44 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+* @title: 学生班级巡查考核-关联班级列表列表入参
+* @Author fanxp
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentClassListVo {
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 班级编号id
+    */
+    @ApiModelProperty("班级编号id")
+    private Long classId;
+    /**
+     * 班级编号id
+     */
+    @ApiModelProperty("班级编号id")
+    private String className;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 班主任姓名
+    */
+    @ApiModelProperty("班主任姓名")
+    private String teacherName;
+    /**
+     * 班主任电话
+     */
+    @ApiModelProperty("班主任电话")
+    private String mobile;
+}

+ 29 - 101
src/main/java/com/xjrsoft/module/student/vo/BaseStudentAssessmentInspectionVo.java

@@ -1,6 +1,8 @@
 package com.xjrsoft.module.student.vo;
 
 import com.github.yulichang.annotation.EntityMapping;
+import com.xjrsoft.module.student.entity.BaseStudentAssessmentStudentRelation;
+import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -18,122 +20,48 @@ import java.util.Date;
 */
 @Data
 public class BaseStudentAssessmentInspectionVo {
-
-    /**
-     * 主键编号
-     */
     @ApiModelProperty("主键编号")
-    private Long id;
-    /**
-     * 序号
-     */
-    @ApiModelProperty("序号")
-    private Integer sortCode;
-    /**
-     * 学生考核项目编号(base_student_assessment_category)
-     */
-    @ApiModelProperty("学生考核项目编号(base_student_assessment_category)")
-    private Long baseStudentAssessmentCategoryId;
-    /**
-     * 班级考核项目编号(base_student_assessment_project)
-     */
-    @ApiModelProperty("班级考核项目编号(base_student_assessment_project)")
-    private Long baseStudentAssessmentProjectId;
-    /**
-     * 学期ID(base_semester)
-     */
-    @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterId;
-    /**
-     * 入学年级(base_grade)
-     */
-    @ApiModelProperty("入学年级(base_grade)")
-    private Long gradeId;
-    /**
-     * 班级Ids(多选)
-     */
-    @ApiModelProperty("班级Ids(多选)")
-    private String classIds;
-    /**
-     * 考核时间
-     */
+    private String id;
+
+    @ApiModelProperty("学期(base_semester)")
+    private String semesterName;
+
+    @ApiModelProperty("年级(base_grade)")
+    private String gradeName;
+
     @ApiModelProperty("考核时间")
     private Date assessmentDate;
-    /**
-     * 分数
-     */
+
     @ApiModelProperty("分数")
     private Double score;
-    /**
-     * 分数类型(xjr_dictionary_item[score_type])
-     */
+
     @ApiModelProperty("分数类型(xjr_dictionary_item[score_type])")
     private String scoreType;
-    /**
-     * 考核用户ID(xjr_user)
-     */
-    @ApiModelProperty("考核用户ID(xjr_user)")
-    private Long assessmentUserId;
-    /**
-     * 原因
-     */
+
+    @ApiModelProperty("分数类型名称")
+    private String scoreTypeCn;
+
+    @ApiModelProperty("考核用户(xjr_user)")
+    private String assessmentUserName;
+
     @ApiModelProperty("原因")
     private String reason;
-    /**
-     * 文件ID(xjr_file)
-     */
-    @ApiModelProperty("文件ID(xjr_file)")
-    private Long fileId;
-    /**
-     * 状态(1:结束 0:未结束)
-     */
-    @ApiModelProperty("状态(1:结束 0:未结束)")
-    private Integer status;
-
-    /**
-     * 考核人名字
-     */
-    @ApiModelProperty("考核人名字")
-    private String assessmentUserName;
 
-    /**
-     * 考核人名字
-     */
-    @ApiModelProperty("登记人")
-    private String createUserName;
-
-    /**
-     * 最后修改人
-     */
-    @ApiModelProperty("最后修改人")
-    private String modifyUserName;
-
-    /**
-     * 考核项目
-     */
     @ApiModelProperty("考核项目")
     private String assessmentProjectName;
 
-    /**
-     * 考核类别
-     */
     @ApiModelProperty("考核类别")
     private String assessmentCategoryName;
 
-    /**
-     * 影响班级考核的学生
-     */
+    @ApiModelProperty("附件编号")
+    private Long fileId;
+
     @ApiModelProperty("影响班级考核的学生")
-    @EntityMapping(thisField = "id", joinField = "baseStudentAssessmentInspectionId")
-    private List<BaseStudentAssessmentStudentRelationVo> studentList;
-
-    /**
-     * 考核班级
-     */
-    @ApiModelProperty("考核班级")
-    @EntityMapping(thisField = "id", joinField = "baseStudentAssessmentInspectionId")
-    private List<BaseStudentAssessmentClassRelationListVo> classList;
-
-    @ApiModelProperty("学生人数")
-    private Integer studentCount;
+    private List<BaseStudentAssessmentStudentRelation> studentList;
+
+    @ApiModelProperty("附件列表")
+    private List<File> fileInfos;
+
+    @ApiModelProperty("班级信息")
+    private List<BaseStudentAssessmentClassListVo> classList;
 }

+ 14 - 1
src/main/resources/mapper/student/BaseStudentAssessmentInspectionMapper.xml

@@ -23,6 +23,19 @@
         where  t.delete_mark=0 and t1.delete_mark=0  and t2.delete_mark=0  and t3.delete_mark=0 and t.status=1;
     </select>
 
+    <select id="getInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo">
+        select t.id,t.score,t.score_type,t.assessment_date,t.reason,t1.name as assessment_category_name,t2.name as assessment_project_name,
+        t3.name as semester_name,t4.name as grade_name,t5.name as assessment_user_name,t6.name as score_type_cn,t.file_id
+        from base_student_assessment_inspection t
+        left join base_student_assessment_category t1 on (t1.id = t.base_student_assessment_category_id)
+        left join base_student_assessment_project t2 on (t2.id = t.base_student_assessment_project_id)
+        left join base_semester t3 on t.base_semester_id=t3.id
+        left join base_grade t4 on t.grade_id=t4.id
+        left join xjr_user t5 on t.assessment_user_id=t5.id
+        left join xjr_dictionary_detail t6 on t6.code=t.score_type
+        where t.id=#{id} and t.delete_mark=0 and t1.delete_mark=0  and t2.delete_mark=0  and t3.delete_mark=0 and t.status=1;
+    </select>
+
     <select id="getMobilePage" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo">
         select t.id,t1.assessment_date,t2.name as assessment_category_name,t3.name as assessment_project_name,t5.name as assessment_class_name,t1.reason,t1.score,t1.score_type,t4.name as score_type_cn,
         (
@@ -37,7 +50,7 @@
         where  t1.delete_mark=0 and t1.status=1 ;
     </select>
 
-    <select id="getMobileInfo" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobileDto" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo">
+    <select id="getMobileInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobileVo">
         select t.id,t.class_id,t.base_student_assessment_inspection_id,t1.score,t5.name as assessment_class_name,t2.name as assessment_category_name,t3.name as assessment_project_name,t1.assessment_date,t1.reason,
         t6.name as assessment_user_name,t7.name as create_user_name,t1.create_date,t1.file_id,t1.score_type,t4.name as score_type_cn
         from base_student_assessment_class_relation t