操行管理，pc端接口调整

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

@@ -3,34 +3,23 @@ package com.xjrsoft.module.student.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.MPJWrappers;
 import com.xjrsoft.common.model.result.RT;
 import com.xjrsoft.common.page.ConventPage;
 import com.xjrsoft.common.page.PageOutput;
 import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
-import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
-import com.xjrsoft.module.organization.entity.Department;
 import com.xjrsoft.module.student.dto.AddBaseStudentBehaviorManageDto;
 import com.xjrsoft.module.student.dto.BaseStudentBehaviorManagePageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentBehaviorManageDto;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorCategory;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorManage;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorProject;
-import com.xjrsoft.module.student.entity.BaseStudentBehaviorStudentRelation;
-import com.xjrsoft.module.student.entity.BaseStudentSchoolRoll;
 import com.xjrsoft.module.student.mapper.BaseStudentBehaviorClassRelationMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentBehaviorStudentRelationMapper;
 import com.xjrsoft.module.student.service.IBaseStudentBehaviorManageService;
-import com.xjrsoft.module.student.vo.BaseStudentBehaviorClassRelationVo;
 import com.xjrsoft.module.student.vo.BaseStudentBehaviorManagePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageVo;
-import com.xjrsoft.module.student.vo.BaseStudentBehaviorStudentRelationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -66,14 +55,15 @@ public class BaseStudentBehaviorManageController {
     private final BaseClassMapper baseClassMapper;
 
     @GetMapping(value = "/page")
-    @ApiOperation(value="学生操行分记录管理列表(分页)")
+    @ApiOperation(value="学生操行分记录管理列表(pc端)")
     @SaCheckPermission("basestudentbehaviormanage:detail")
     public RT<PageOutput<BaseStudentBehaviorManagePageVo>> page(@Valid BaseStudentBehaviorManagePageDto dto){
-        return RT.ok(getData(dto));
+        Page<BaseStudentBehaviorManagePageVo> page = baseStudentBehaviorManageService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        return RT.ok(ConventPage.getPageOutput(page, BaseStudentBehaviorManagePageVo.class));
     }
 
-    @GetMapping(value = "/mibliePage")
-    @ApiOperation(value="学生操行分记录管理列表(移动端分页)")
+    @GetMapping(value = "/miblie-page")
+    @ApiOperation(value="学生操行分记录管理列表(移动端)")
     @SaCheckPermission("basestudentbehaviormanage:detail")
     public RT<PageOutput<BaseStudentBehaviorManagePageVo>> mibliePage(@Valid BaseStudentBehaviorManagePageDto dto){
 
@@ -86,80 +76,36 @@ public class BaseStudentBehaviorManageController {
         for (BaseClass baseClass : classList) {
             classIds.add(baseClass.getId());
         }
-        dto.setClassIds(classIds);
         return RT.ok(getData(dto));
     }
 
     PageOutput<BaseStudentBehaviorManagePageVo> getData(BaseStudentBehaviorManagePageDto dto){
-        IPage<BaseStudentBehaviorManagePageVo> page = baseStudentBehaviorManageService.selectJoinListPage(ConventPage.getPage(dto), BaseStudentBehaviorManagePageVo.class,
-                MPJWrappers.<BaseStudentBehaviorManage>lambdaJoin()
-                .like(StrUtil.isNotEmpty(dto.getName()), BaseStudentBehaviorStudentRelation::getName, dto.getName())
-                .like(ObjectUtil.isNotNull(dto.getSemesterId()), BaseStudentBehaviorManage::getBaseSemesterId, dto.getSemesterId())
-                .in(ObjectUtil.isNotNull(dto.getBehaviorCategoryIds()), BaseStudentBehaviorManage::getBaseStudentBehaviorCategoryId, dto.getBehaviorCategoryIds())
-                .in(ObjectUtil.isNotNull(dto.getBehaviorProjectIds()), BaseStudentBehaviorManage::getBaseStudentBehaviorProjectId, dto.getBehaviorProjectIds())
-                .in(ObjectUtil.isNotNull(dto.getOrgIds()), Department::getId, dto.getOrgIds())
-                .in(ObjectUtil.isNotNull(dto.getGradeIds()), BaseStudentBehaviorManage::getGradeId, dto.getGradeIds())
-                .in(ObjectUtil.isNotNull(dto.getMajorSetIds()), BaseStudentSchoolRoll::getMajorSetId, dto.getMajorSetIds())
-                .in(ObjectUtil.isNotNull(dto.getClassIds()), BaseStudentBehaviorClassRelation::getClassId, dto.getClassIds())
-                .like(StrUtil.isNotEmpty(dto.getModifyUserName()), "t.modify_user_id = (select id from xjr_user where name like concat('%',?,'%'))", dto.getModifyUserName())
-                .like(StrUtil.isNotEmpty(dto.getCreateUserName()), "t.create_user_id = (select id from xjr_user where name like concat('%',?,'%'))", dto.getCreateUserName())
-                .eq(BaseStudentBehaviorManage::getStatus, 1)
-                .eq(ObjectUtil.isNotNull(dto.getIsAffect()), BaseStudentBehaviorManage::getIsAffect, dto.getIsAffect())
-                .select(BaseStudentBehaviorManage::getId)
-                .select(BaseStudentBehaviorStudentRelation::getClassName)
-                .select(BaseStudentBehaviorStudentRelation::getName)
-                .select(BaseStudentBehaviorProject::getScoreType)
-                .select(BaseStudentBehaviorStudentRelation::getStudentId)
-                .select(BaseStudentBehaviorStudentRelation::getSortCode)
-                .select(BaseStudentBehaviorManage::getFileId)
-                .select(BaseStudentBehaviorManage::getAssessmentAddress)
-                .select(BaseStudentBehaviorManage::getAssessmentDate)
-                .select(BaseStudentBehaviorManage::getScore)
-                .select(BaseStudentBehaviorManage::getScoreNumber)
-                .select(BaseStudentBehaviorManage::getTotalScore)
-                .select(BaseStudentBehaviorManage::getIsAffect)
-                .selectAs(BaseStudentBehaviorCategory::getName, BaseStudentBehaviorManagePageVo::getBehaviorCategoryName)
-                .selectAs(BaseStudentBehaviorProject::getName, BaseStudentBehaviorManagePageVo::getBehaviorProjectName)
-                .selectAs(BaseStudentBehaviorProject::getName, BaseStudentBehaviorManagePageVo::getBehaviorProjectName)
-                .innerJoin(BaseStudentBehaviorCategory.class, BaseStudentBehaviorCategory::getId, BaseStudentBehaviorManage::getBaseStudentBehaviorCategoryId)
-                .innerJoin(BaseStudentBehaviorProject.class, BaseStudentBehaviorProject::getId, BaseStudentBehaviorManage::getBaseStudentBehaviorProjectId)
-                .innerJoin(BaseSemester.class, BaseSemester::getId, BaseStudentBehaviorManage::getBaseSemesterId)
-                .innerJoin(BaseStudentBehaviorStudentRelation.class, BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, BaseStudentBehaviorManage::getId)
-                .innerJoin(BaseStudentBehaviorClassRelation.class, BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, BaseStudentBehaviorManage::getId)
-                .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentBehaviorClassRelation::getClassId)
-                .innerJoin(Department.class, Department::getId, BaseClass::getOrgId)
-                .leftJoin(BaseStudentSchoolRoll.class, BaseStudentSchoolRoll::getUserId, BaseStudentBehaviorStudentRelation::getUserId)
-        );
-        return ConventPage.getPageOutput(page, BaseStudentBehaviorManagePageVo.class);
+
+        return null;
     }
 
     @GetMapping(value = "/info")
-    @ApiOperation(value="根据id查询学生操行分记录管理信息")
+    @ApiOperation(value="根据id查询学生操行分记录管理信息(pc端)")
     @SaCheckPermission("basestudentbehaviormanage:detail")
     public RT<BaseStudentBehaviorManageVo> info(@RequestParam Long id){
-        BaseStudentBehaviorManage baseStudentBehaviorManage = baseStudentBehaviorManageService.getById(id);
+        BaseStudentBehaviorManageVo baseStudentBehaviorManage = baseStudentBehaviorManageService.getInfo(id);
         if (baseStudentBehaviorManage == null) {
            return RT.error("找不到此数据！");
         }
-        BaseStudentBehaviorManageVo behaviorManageVo = BeanUtil.toBean(baseStudentBehaviorManage, BaseStudentBehaviorManageVo.class);
-        //查询班级
-        List<BaseStudentBehaviorClassRelation> classList = baseStudentBehaviorClassRelationMapper.selectList(
-                MPJWrappers.<BaseStudentBehaviorClassRelation>lambdaJoin()
-                .eq(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, id)
-                .selectAs(BaseClass::getName, BaseStudentBehaviorClassRelationVo::getClassName)
-                .select(BaseStudentBehaviorClassRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorClassRelation.class).contains(x.getProperty()))
-                .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentBehaviorClassRelation::getClassId)
-        );
-        behaviorManageVo.setBaseStudentBehaviorClassRelationList(BeanUtil.copyToList(classList, BaseStudentBehaviorClassRelationVo.class));
-        //查询学生
-        List<BaseStudentBehaviorStudentRelation> studentList = baseStudentBehaviorStudentRelationMapper.selectList(
-                MPJWrappers.<BaseStudentBehaviorStudentRelation>lambdaJoin()
-                .eq(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, id)
-                .select(BaseStudentBehaviorStudentRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorStudentRelation.class).contains(x.getProperty()))
-        );
-        behaviorManageVo.setBaseStudentBehaviorStudentRelationList(BeanUtil.copyToList(studentList, BaseStudentBehaviorStudentRelationVo.class));
 
-        return RT.ok(behaviorManageVo);
+        return RT.ok(baseStudentBehaviorManage);
+    }
+
+    @GetMapping(value = "/mobile-info")
+    @ApiOperation(value="根据id查询学生操行分记录管理信息(移动端)")
+    @SaCheckPermission("basestudentbehaviormanage:detail")
+    public RT<BaseStudentBehaviorManageVo> mobileInfo(@RequestParam Long id){
+        BaseStudentBehaviorManageVo baseStudentBehaviorManage = baseStudentBehaviorManageService.getInfo(id);
+        if (baseStudentBehaviorManage == null) {
+            return RT.error("找不到此数据！");
+        }
+
+        return RT.ok(baseStudentBehaviorManage);
     }
 
 

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

@@ -0,0 +1,84 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+* @title: 学生操行分记录管理分页查询入参
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseStudentBehaviorManageMobilePageDto extends PageInput {
+
+    /**
+     * 是否影响
+     */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+
+    /**
+     * 学期id
+     */
+    @ApiModelProperty("学期id")
+    private Long semesterId;
+
+    /**
+     * 考核类别ids
+     */
+    @ApiModelProperty("考核类别ids")
+    private String behaviorCategoryIds;
+
+    /**
+     * 考核项目ids
+     */
+    @ApiModelProperty("考核项目ids")
+    private String behaviorProjectIds;
+
+    /**
+     * 考核类型
+     */
+    @ApiModelProperty("考核类型")
+    private String scoreType;
+
+    /**
+     * 组织结构ids
+     */
+    @ApiModelProperty("组织结构ids")
+    private String orgIds;
+
+    /**
+     * 年级ids
+     */
+    @ApiModelProperty("年级id")
+    private Long gradeId;
+
+    /**
+     * 专业ids
+     */
+    @ApiModelProperty("专业ids")
+    private String majorSetIds;
+
+    /**
+     * 班级ids
+     */
+    @ApiModelProperty("班级ids")
+    private String classIds;
+
+    /**
+     * 修改人
+     */
+    @ApiModelProperty("修改人")
+    private String modifyUserName;
+
+    /**
+     * 等级人
+     */
+    @ApiModelProperty("等级人")
+    private String createUserName;
+}

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

@@ -4,13 +4,6 @@ import com.xjrsoft.common.page.PageInput;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
 
 
 /**
@@ -29,12 +22,6 @@ public class BaseStudentBehaviorManagePageDto extends PageInput {
     @ApiModelProperty("是否影响(1:是 0:否)")
     private Integer isAffect;
 
-    /**
-     * 学生
-     */
-    @ApiModelProperty("学生")
-    private String name;
-
     /**
      * 学期id
      */
@@ -44,54 +31,49 @@ public class BaseStudentBehaviorManagePageDto extends PageInput {
     /**
      * 考核类别ids
      */
-    @ApiModelProperty("考核类别ids")
-    private List<Long> behaviorCategoryIds;
+    @ApiModelProperty("考核类别id")
+    private String behaviorCategoryId;
 
     /**
      * 考核项目ids
      */
-    @ApiModelProperty("考核项目ids")
-    private List<Long> behaviorProjectIds;
-
-    /**
-     * 考核类型
-     */
-    @ApiModelProperty("考核类型")
-    private String scoreType;
+    @ApiModelProperty("考核项目id")
+    private String behaviorProjectId;
 
     /**
      * 组织结构ids
      */
-    @ApiModelProperty("组织结构ids")
-    private List<Long> orgIds;
+    @ApiModelProperty("组织结构id")
+    private String orgId;
 
     /**
      * 年级ids
      */
-    @ApiModelProperty("年级ids")
-    private List<Long> gradeIds;
+    @ApiModelProperty("年级id")
+    private Long gradeId;
+
 
     /**
-     * 专业ids
+     * 考核人
      */
-    @ApiModelProperty("专业ids")
-    private List<Long> majorSetIds;
+    @ApiModelProperty("考核人ids")
+    private String assessmentUserIds;
 
     /**
-     * 班级ids
+     * 考核地址
      */
-    @ApiModelProperty("班级ids")
-    private List<Long> classIds;
+    @ApiModelProperty("考核地址")
+    private String assessmentAddress;
 
     /**
-     * 修改人
+     * 考核时间-开始
      */
-    @ApiModelProperty("修改人")
-    private String modifyUserName;
+    @ApiModelProperty("考核时间-开始")
+    private String startDate;
 
     /**
-     * 等级人
+     * 考核时间-开始
      */
-    @ApiModelProperty("等级人")
-    private String createUserName;
+    @ApiModelProperty("考核时间-结束")
+    private String endDate;
 }

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

@@ -1,8 +1,14 @@
 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.BaseStudentBehaviorManageMobilePageDto;
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorManagePageDto;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorManage;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageMobileVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManagePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -13,5 +19,31 @@ import org.apache.ibatis.annotations.Mapper;
 */
 @Mapper
 public interface BaseStudentBehaviorManageMapper extends MPJBaseMapper<BaseStudentBehaviorManage> {
+    /**
+     * 分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentBehaviorManagePageVo> getPage(Page<BaseStudentBehaviorManagePageDto> page, BaseStudentBehaviorManagePageDto dto);
 
+    /**
+     * 数据详情
+     * @return
+     */
+    BaseStudentBehaviorManageVo getInfo(Long id);
+
+    /**
+     * app分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentBehaviorManageMobilePageVo> getMobilePage(Page<BaseStudentBehaviorManageMobilePageDto> page, BaseStudentBehaviorManageMobilePageDto dto);
+
+    /**
+     * app数据详情
+     * @return
+     */
+    BaseStudentBehaviorManageMobileVo getMobileInfo(Long id);
 }

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

@@ -1,9 +1,15 @@
 package com.xjrsoft.module.student.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorManageMobilePageDto;
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorManagePageDto;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorManage;
-import lombok.Data;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageMobileVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManagePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageVo;
+
 import java.util.List;
 
 /**
@@ -37,4 +43,31 @@ public interface IBaseStudentBehaviorManageService extends MPJBaseService<BaseSt
     * @return
     */
     Boolean delete(List<Long> ids);
+
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentBehaviorManagePageVo> getPage(Page<BaseStudentBehaviorManagePageDto> page, BaseStudentBehaviorManagePageDto dto);
+
+    /**
+     * 数据详情
+     * @return
+     */
+    BaseStudentBehaviorManageVo getInfo(Long id);
+
+    /**
+     * app分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentBehaviorManageMobilePageVo> getMobilePage(Page<BaseStudentBehaviorManageMobilePageDto> page, BaseStudentBehaviorManageMobilePageDto dto);
+
+    /**
+     * app数据详情
+     * @return
+     */
+    BaseStudentBehaviorManageMobileVo getMobileInfo(Long id);
 }

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

@@ -1,21 +1,37 @@
 package com.xjrsoft.module.student.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.hutool.core.bean.BeanUtil;
+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.entity.BaseStudentBehaviorStudentRelation;
-import com.xjrsoft.module.student.mapper.BaseStudentBehaviorStudentRelationMapper;
+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.student.dto.BaseStudentBehaviorManageMobilePageDto;
+import com.xjrsoft.module.student.dto.BaseStudentBehaviorManagePageDto;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorClassRelation;
-import com.xjrsoft.module.student.mapper.BaseStudentBehaviorClassRelationMapper;
 import com.xjrsoft.module.student.entity.BaseStudentBehaviorManage;
+import com.xjrsoft.module.student.entity.BaseStudentBehaviorStudentRelation;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorClassRelationMapper;
 import com.xjrsoft.module.student.mapper.BaseStudentBehaviorManageMapper;
+import com.xjrsoft.module.student.mapper.BaseStudentBehaviorStudentRelationMapper;
 import com.xjrsoft.module.student.service.IBaseStudentBehaviorManageService;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorClassRelationVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageMobilePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageMobileVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManagePageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorManageVo;
+import com.xjrsoft.module.student.vo.BaseStudentBehaviorStudentRelationVo;
+import com.xjrsoft.module.system.entity.File;
+import com.xjrsoft.module.system.service.IFileService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 
 /**
 * @title: 学生操行分记录管理
@@ -26,23 +42,23 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 @Service
 @AllArgsConstructor
 public class BaseStudentBehaviorManageServiceImpl extends MPJBaseServiceImpl<BaseStudentBehaviorManageMapper, BaseStudentBehaviorManage> implements IBaseStudentBehaviorManageService {
-    private final BaseStudentBehaviorManageMapper baseStudentBehaviorManageBaseStudentBehaviorManageMapper;
-
-    private final BaseStudentBehaviorStudentRelationMapper baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper;
-    private final BaseStudentBehaviorClassRelationMapper baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper;
+    private final BaseStudentBehaviorManageMapper baseStudentBehaviorManageMapper;
 
+    private final BaseStudentBehaviorStudentRelationMapper baseStudentBehaviorStudentRelationMapper;
+    private final BaseStudentBehaviorClassRelationMapper baseStudentBehaviorClassRelationMapper;
+    private final IFileService fileService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(BaseStudentBehaviorManage baseStudentBehaviorManage) {
-        baseStudentBehaviorManageBaseStudentBehaviorManageMapper.insert(baseStudentBehaviorManage);
+        baseStudentBehaviorManageMapper.insert(baseStudentBehaviorManage);
         for (BaseStudentBehaviorStudentRelation baseStudentBehaviorStudentRelation : baseStudentBehaviorManage.getBaseStudentBehaviorStudentRelationList()) {
             baseStudentBehaviorStudentRelation.setBaseStudentBehaviorManageId(baseStudentBehaviorManage.getId());
-            baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.insert(baseStudentBehaviorStudentRelation);
+            baseStudentBehaviorStudentRelationMapper.insert(baseStudentBehaviorStudentRelation);
         }
         for (BaseStudentBehaviorClassRelation baseStudentBehaviorClassRelation : baseStudentBehaviorManage.getBaseStudentBehaviorClassRelationList()) {
             baseStudentBehaviorClassRelation.setBaseStudentBehaviorManageId(baseStudentBehaviorManage.getId());
-            baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.insert(baseStudentBehaviorClassRelation);
+            baseStudentBehaviorClassRelationMapper.insert(baseStudentBehaviorClassRelation);
         }
 
         return true;
@@ -51,11 +67,11 @@ public class BaseStudentBehaviorManageServiceImpl extends MPJBaseServiceImpl<Bas
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean update(BaseStudentBehaviorManage baseStudentBehaviorManage) {
-        baseStudentBehaviorManageBaseStudentBehaviorManageMapper.updateById(baseStudentBehaviorManage);
+        baseStudentBehaviorManageMapper.updateById(baseStudentBehaviorManage);
         //********************************* BaseStudentBehaviorStudentRelation  增删改  开始 *******************************************/
         {
             // 查出所有子级的id
-            List<BaseStudentBehaviorStudentRelation> baseStudentBehaviorStudentRelationList = baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.selectList(Wrappers.lambdaQuery(BaseStudentBehaviorStudentRelation.class).eq(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, baseStudentBehaviorManage.getId()).select(BaseStudentBehaviorStudentRelation::getId));
+            List<BaseStudentBehaviorStudentRelation> baseStudentBehaviorStudentRelationList = baseStudentBehaviorStudentRelationMapper.selectList(Wrappers.lambdaQuery(BaseStudentBehaviorStudentRelation.class).eq(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, baseStudentBehaviorManage.getId()).select(BaseStudentBehaviorStudentRelation::getId));
             List<Long> baseStudentBehaviorStudentRelationIds = baseStudentBehaviorStudentRelationList.stream().map(BaseStudentBehaviorStudentRelation::getId).collect(Collectors.toList());
             //原有子表单 没有被删除的主键
             List<Long> baseStudentBehaviorStudentRelationOldIds = baseStudentBehaviorManage.getBaseStudentBehaviorStudentRelationList().stream().map(BaseStudentBehaviorStudentRelation::getId).filter(Objects::nonNull).collect(Collectors.toList());
@@ -65,18 +81,18 @@ public class BaseStudentBehaviorManageServiceImpl extends MPJBaseServiceImpl<Bas
             for (BaseStudentBehaviorStudentRelation baseStudentBehaviorStudentRelation : baseStudentBehaviorManage.getBaseStudentBehaviorStudentRelationList()) {
                 //如果不等于空则修改
                 if (baseStudentBehaviorStudentRelation.getId() != null) {
-                    baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.updateById(baseStudentBehaviorStudentRelation);
+                    baseStudentBehaviorStudentRelationMapper.updateById(baseStudentBehaviorStudentRelation);
                 }
                 //如果等于空 则新增
                 else {
                     //已经不存在的id 删除
                     baseStudentBehaviorStudentRelation.setBaseStudentBehaviorManageId(baseStudentBehaviorManage.getId());
-                    baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.insert(baseStudentBehaviorStudentRelation);
+                    baseStudentBehaviorStudentRelationMapper.insert(baseStudentBehaviorStudentRelation);
                 }
             }
             //已经不存在的id 删除
             if(baseStudentBehaviorStudentRelationRemoveIds.size() > 0){
-                baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.deleteBatchIds(baseStudentBehaviorStudentRelationRemoveIds);
+                baseStudentBehaviorStudentRelationMapper.deleteBatchIds(baseStudentBehaviorStudentRelationRemoveIds);
             }
         }
         //********************************* BaseStudentBehaviorStudentRelation  增删改  结束 *******************************************/
@@ -84,7 +100,7 @@ public class BaseStudentBehaviorManageServiceImpl extends MPJBaseServiceImpl<Bas
         //********************************* BaseStudentBehaviorClassRelation  增删改  开始 *******************************************/
         {
             // 查出所有子级的id
-            List<BaseStudentBehaviorClassRelation> baseStudentBehaviorClassRelationList = baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.selectList(Wrappers.lambdaQuery(BaseStudentBehaviorClassRelation.class).eq(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, baseStudentBehaviorManage.getId()).select(BaseStudentBehaviorClassRelation::getId));
+            List<BaseStudentBehaviorClassRelation> baseStudentBehaviorClassRelationList = baseStudentBehaviorClassRelationMapper.selectList(Wrappers.lambdaQuery(BaseStudentBehaviorClassRelation.class).eq(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, baseStudentBehaviorManage.getId()).select(BaseStudentBehaviorClassRelation::getId));
             List<Long> baseStudentBehaviorClassRelationIds = baseStudentBehaviorClassRelationList.stream().map(BaseStudentBehaviorClassRelation::getId).collect(Collectors.toList());
             //原有子表单 没有被删除的主键
             List<Long> baseStudentBehaviorClassRelationOldIds = baseStudentBehaviorManage.getBaseStudentBehaviorClassRelationList().stream().map(BaseStudentBehaviorClassRelation::getId).filter(Objects::nonNull).collect(Collectors.toList());
@@ -94,18 +110,18 @@ public class BaseStudentBehaviorManageServiceImpl extends MPJBaseServiceImpl<Bas
             for (BaseStudentBehaviorClassRelation baseStudentBehaviorClassRelation : baseStudentBehaviorManage.getBaseStudentBehaviorClassRelationList()) {
                 //如果不等于空则修改
                 if (baseStudentBehaviorClassRelation.getId() != null) {
-                    baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.updateById(baseStudentBehaviorClassRelation);
+                    baseStudentBehaviorClassRelationMapper.updateById(baseStudentBehaviorClassRelation);
                 }
                 //如果等于空 则新增
                 else {
                     //已经不存在的id 删除
                     baseStudentBehaviorClassRelation.setBaseStudentBehaviorManageId(baseStudentBehaviorManage.getId());
-                    baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.insert(baseStudentBehaviorClassRelation);
+                    baseStudentBehaviorClassRelationMapper.insert(baseStudentBehaviorClassRelation);
                 }
             }
             //已经不存在的id 删除
             if(baseStudentBehaviorClassRelationRemoveIds.size() > 0){
-                baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.deleteBatchIds(baseStudentBehaviorClassRelationRemoveIds);
+                baseStudentBehaviorClassRelationMapper.deleteBatchIds(baseStudentBehaviorClassRelationRemoveIds);
             }
         }
         //********************************* BaseStudentBehaviorClassRelation  增删改  结束 *******************************************/
@@ -116,10 +132,62 @@ public class BaseStudentBehaviorManageServiceImpl extends MPJBaseServiceImpl<Bas
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean delete(List<Long> ids) {
-        baseStudentBehaviorManageBaseStudentBehaviorManageMapper.deleteBatchIds(ids);
-        baseStudentBehaviorManageBaseStudentBehaviorStudentRelationMapper.delete(Wrappers.lambdaQuery(BaseStudentBehaviorStudentRelation.class).in(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, ids));
-        baseStudentBehaviorManageBaseStudentBehaviorClassRelationMapper.delete(Wrappers.lambdaQuery(BaseStudentBehaviorClassRelation.class).in(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, ids));
+        baseStudentBehaviorManageMapper.deleteBatchIds(ids);
+        baseStudentBehaviorStudentRelationMapper.delete(Wrappers.lambdaQuery(BaseStudentBehaviorStudentRelation.class).in(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, ids));
+        baseStudentBehaviorClassRelationMapper.delete(Wrappers.lambdaQuery(BaseStudentBehaviorClassRelation.class).in(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, ids));
 
         return true;
     }
+
+    @Override
+    public Page<BaseStudentBehaviorManagePageVo> getPage(Page<BaseStudentBehaviorManagePageDto> page, BaseStudentBehaviorManagePageDto dto) {
+        Page<BaseStudentBehaviorManagePageVo> result = baseStudentBehaviorManageMapper.getPage(page, dto);
+        result.getRecords().forEach((node) -> {
+            if (node.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
+                node.setScore(node.getScore() * -1);
+            }
+        });
+        return result;
+    }
+
+    @Override
+    public BaseStudentBehaviorManageVo getInfo(Long id) {
+        BaseStudentBehaviorManageVo result = baseStudentBehaviorManageMapper.getInfo(id);
+        if (result == null) {
+            return null;
+        }
+        // 处理加减分
+        if (result.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
+            result.setScore(result.getScore() * -1);
+        }
+        //查询班级
+        List<BaseStudentBehaviorClassRelation> classList = baseStudentBehaviorClassRelationMapper.selectList(
+                MPJWrappers.<BaseStudentBehaviorClassRelation>lambdaJoin()
+                        .eq(BaseStudentBehaviorClassRelation::getBaseStudentBehaviorManageId, id)
+                        .selectAs(BaseClass::getName, BaseStudentBehaviorClassRelationVo::getClassName)
+                        .select(BaseStudentBehaviorClassRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorClassRelation.class).contains(x.getProperty()))
+                        .innerJoin(BaseClass.class, BaseClass::getId, BaseStudentBehaviorClassRelation::getClassId)
+        );
+        result.setBaseStudentBehaviorClassRelationList(BeanUtil.copyToList(classList, BaseStudentBehaviorClassRelationVo.class));
+        //查询学生
+        List<BaseStudentBehaviorStudentRelation> studentList = baseStudentBehaviorStudentRelationMapper.selectList(
+                MPJWrappers.<BaseStudentBehaviorStudentRelation>lambdaJoin()
+                        .eq(BaseStudentBehaviorStudentRelation::getBaseStudentBehaviorManageId, id)
+                        .select(BaseStudentBehaviorStudentRelation.class, x -> VoToColumnUtil.fieldsToColumns(BaseStudentBehaviorStudentRelation.class).contains(x.getProperty()))
+        );
+        result.setBaseStudentBehaviorStudentRelationList(BeanUtil.copyToList(studentList, BaseStudentBehaviorStudentRelationVo.class));
+        // 获取文件列表
+        result.setFileInfos(fileService.list(Wrappers.<File>query().lambda().eq(File::getFolderId, result.getFileId())));
+        return result;
+    }
+
+    @Override
+    public Page<BaseStudentBehaviorManageMobilePageVo> getMobilePage(Page<BaseStudentBehaviorManageMobilePageDto> page, BaseStudentBehaviorManageMobilePageDto dto) {
+        return null;
+    }
+
+    @Override
+    public BaseStudentBehaviorManageMobileVo getMobileInfo(Long id) {
+        return null;
+    }
 }

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

@@ -0,0 +1,106 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学生操行分记录管理分页列表出参
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorManageMobilePageVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 考核时间
+    */
+    @ApiModelProperty("考核时间")
+    private Date assessmentDate;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Double score;
+    /**
+    * 分数次数
+    */
+    @ApiModelProperty("分数次数")
+    private Double scoreNumber;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+
+    /**
+    * 考核地点
+    */
+    @ApiModelProperty("考核地点")
+    private String assessmentAddress;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+    /**
+     * 学期
+     */
+    @ApiModelProperty("学期")
+    private String semesterName;
+    /**
+     * 考核类别
+     */
+    @ApiModelProperty("考核类别")
+    private String behaviorCategoryName;
+    /**
+     * 考核项目
+     */
+    @ApiModelProperty("考核项目")
+    private String behaviorProjectName;
+
+    /**
+     * 考核类型
+     */
+    @ApiModelProperty("考核类型")
+    private String scoreType;
+
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    private String behaviorClassNames;
+
+    /**
+     * 考核人
+     */
+    @ApiModelProperty("考核人")
+    private String assessmentUserName;
+}

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

@@ -0,0 +1,121 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+* @title: 学生操行分记录管理表单出参
+* @Author dzx
+* @Date: 2023-11-17
+* @Version 1.0
+*/
+@Data
+public class BaseStudentBehaviorManageMobileVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 学生操行分考核类别编号（base_student_behavior_category）
+    */
+    @ApiModelProperty("学生操行分考核类别编号（base_student_behavior_category）")
+    private Long baseStudentBehaviorCategoryId;
+    /**
+    * 学生操行分考核项目编号（base_student_behavior_project）
+    */
+    @ApiModelProperty("学生操行分考核项目编号（base_student_behavior_project）")
+    private Long baseStudentBehaviorProjectId;
+    /**
+    * 学期ID(base_semester)
+    */
+    @ApiModelProperty("学期ID(base_semester)")
+    private Long baseSemesterId;
+    /**
+    * 入学年级(base_grade)
+    */
+    @ApiModelProperty("入学年级(base_grade)")
+    private Long gradeId;
+    /**
+    * 班级Ids(多选)
+    */
+    @ApiModelProperty("班级Ids(多选)")
+    private String classIds;
+    /**
+    * 考核时间
+    */
+    @ApiModelProperty("考核时间")
+    private Date assessmentDate;
+    /**
+    * 总分
+    */
+    @ApiModelProperty("总分")
+    private Double totalScore;
+    /**
+    * 分数
+    */
+    @ApiModelProperty("分数")
+    private Double score;
+    /**
+    * 分数次数
+    */
+    @ApiModelProperty("分数次数")
+    private Double scoreNumber;
+    /**
+    * 是否影响(1:是 0:否)
+    */
+    @ApiModelProperty("是否影响(1:是 0:否)")
+    private Integer isAffect;
+    /**
+    * 考核用户ID(xjr_user)
+    */
+    @ApiModelProperty("考核用户ID(xjr_user)")
+    private Long assessmentUserId;
+    /**
+    * 考核机构(xjr_department)
+    */
+    @ApiModelProperty("考核机构(xjr_department)")
+    private Long assessmentDepartmentId;
+    /**
+    * 考核地点
+    */
+    @ApiModelProperty("考核地点")
+    private String assessmentAddress;
+    /**
+    * 备注
+    */
+    @ApiModelProperty("备注")
+    private String remark;
+    /**
+    * 文件ID(xjr_file)
+    */
+    @ApiModelProperty("文件ID(xjr_file)")
+    private Long fileId;
+    /**
+    * 状态（1:结束 0:未结束）
+    */
+    @ApiModelProperty("状态（1:结束 0:未结束）")
+    private Integer status;
+
+
+    /**
+    * baseStudentBehaviorStudentRelation
+    */
+    @ApiModelProperty("baseStudentBehaviorStudentRelation子表")
+    private List<BaseStudentBehaviorStudentRelationVo> baseStudentBehaviorStudentRelationList;
+    /**
+    * baseStudentBehaviorClassRelation
+    */
+    @ApiModelProperty("baseStudentBehaviorClassRelation子表")
+    private List<BaseStudentBehaviorClassRelationVo> baseStudentBehaviorClassRelationList;
+
+}

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

@@ -20,66 +20,11 @@ public class BaseStudentBehaviorManagePageVo {
     @ApiModelProperty("主键编号")
     private String id;
     /**
-    * 创建人
-    */
-    @ApiModelProperty("创建人")
-    private Long createUserId;
-    /**
-    * 创建时间
-    */
-    @ApiModelProperty("创建时间")
-    private Date createDate;
-    /**
-    * 修改人
-    */
-    @ApiModelProperty("修改人")
-    private Long modifyUserId;
-    /**
-    * 修改时间
-    */
-    @ApiModelProperty("修改时间")
-    private Date modifyDate;
-    /**
-    * 删除标记
-    */
-    @ApiModelProperty("删除标记")
-    private Integer deleteMark;
-    /**
-    * 有效标志
-    */
-    @ApiModelProperty("有效标志")
-    private Integer enabledMark;
-    /**
     * 序号
     */
     @ApiModelProperty("序号")
     private Integer sortCode;
     /**
-    * 学生操行分考核类别编号（base_student_behavior_category）
-    */
-    @ApiModelProperty("学生操行分考核类别编号（base_student_behavior_category）")
-    private Long baseStudentBehaviorCategoryId;
-    /**
-    * 学生操行分考核项目编号（base_student_behavior_project）
-    */
-    @ApiModelProperty("学生操行分考核项目编号（base_student_behavior_project）")
-    private Long baseStudentBehaviorProjectId;
-    /**
-    * 学期ID(base_semester)
-    */
-    @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterId;
-    /**
-    * 入学年级(base_grade)
-    */
-    @ApiModelProperty("入学年级(base_grade)")
-    private Long gradeId;
-    /**
-    * 班级Ids(多选)
-    */
-    @ApiModelProperty("班级Ids(多选)")
-    private String classIds;
-    /**
     * 考核时间
     */
     @ApiModelProperty("考核时间")
@@ -104,16 +49,7 @@ public class BaseStudentBehaviorManagePageVo {
     */
     @ApiModelProperty("是否影响(1:是 0:否)")
     private Integer isAffect;
-    /**
-    * 考核用户ID(xjr_user)
-    */
-    @ApiModelProperty("考核用户ID(xjr_user)")
-    private Long assessmentUserId;
-    /**
-    * 考核机构(xjr_department)
-    */
-    @ApiModelProperty("考核机构(xjr_department)")
-    private Long assessmentDepartmentId;
+
     /**
     * 考核地点
     */
@@ -134,21 +70,6 @@ public class BaseStudentBehaviorManagePageVo {
     */
     @ApiModelProperty("状态（1:结束 0:未结束）")
     private Integer status;
-    /**
-     * 学号
-     */
-    @ApiModelProperty("学号")
-    private String studentId;
-    /**
-     * 学生姓名
-     */
-    @ApiModelProperty("学生姓名")
-    private String name;
-    /**
-     * 班级名称
-     */
-    @ApiModelProperty("班级名称")
-    private String className;
     /**
      * 学期
      */
@@ -170,4 +91,16 @@ public class BaseStudentBehaviorManagePageVo {
      */
     @ApiModelProperty("考核类型")
     private String scoreType;
+
+    /**
+     * 班级名称
+     */
+    @ApiModelProperty("班级名称")
+    private String behaviorClassNames;
+
+    /**
+     * 考核人
+     */
+    @ApiModelProperty("考核人")
+    private String assessmentUserName;
 }

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

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.student.vo;
 
+import com.xjrsoft.module.system.entity.File;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -31,31 +32,6 @@ public class BaseStudentBehaviorManageVo {
     @ApiModelProperty("序号")
     private Integer sortCode;
     /**
-    * 学生操行分考核类别编号（base_student_behavior_category）
-    */
-    @ApiModelProperty("学生操行分考核类别编号（base_student_behavior_category）")
-    private Long baseStudentBehaviorCategoryId;
-    /**
-    * 学生操行分考核项目编号（base_student_behavior_project）
-    */
-    @ApiModelProperty("学生操行分考核项目编号（base_student_behavior_project）")
-    private Long baseStudentBehaviorProjectId;
-    /**
-    * 学期ID(base_semester)
-    */
-    @ApiModelProperty("学期ID(base_semester)")
-    private Long baseSemesterId;
-    /**
-    * 入学年级(base_grade)
-    */
-    @ApiModelProperty("入学年级(base_grade)")
-    private Long gradeId;
-    /**
-    * 班级Ids(多选)
-    */
-    @ApiModelProperty("班级Ids(多选)")
-    private String classIds;
-    /**
     * 考核时间
     */
     @ApiModelProperty("考核时间")
@@ -81,16 +57,6 @@ public class BaseStudentBehaviorManageVo {
     @ApiModelProperty("是否影响(1:是 0:否)")
     private Integer isAffect;
     /**
-    * 考核用户ID(xjr_user)
-    */
-    @ApiModelProperty("考核用户ID(xjr_user)")
-    private Long assessmentUserId;
-    /**
-    * 考核机构(xjr_department)
-    */
-    @ApiModelProperty("考核机构(xjr_department)")
-    private Long assessmentDepartmentId;
-    /**
     * 考核地点
     */
     @ApiModelProperty("考核地点")
@@ -111,7 +77,6 @@ public class BaseStudentBehaviorManageVo {
     @ApiModelProperty("状态（1:结束 0:未结束）")
     private Integer status;
 
-
     /**
     * baseStudentBehaviorStudentRelation
     */
@@ -123,4 +88,14 @@ public class BaseStudentBehaviorManageVo {
     @ApiModelProperty("baseStudentBehaviorClassRelation子表")
     private List<BaseStudentBehaviorClassRelationVo> baseStudentBehaviorClassRelationList;
 
+    /**
+     * 分数类型
+     */
+    @ApiModelProperty("分数类型")
+    private String scoreType;
+    /**
+     * 附件列表
+     */
+    @ApiModelProperty("附件列表")
+    private List<File> fileInfos;
 }

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

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.student.mapper.BaseStudentBehaviorManageMapper">
+    <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentBehaviorManagePageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentBehaviorManagePageVo">
+        SELECT t.id, t2.score_type,
+        t.file_id, t.assessment_address, t3.name AS semester_name, t1.sort_code,
+        t.assessment_date, t.score, t.score_number, t.total_score, t4.name AS grade_name,
+        t.is_affect, t1.name AS behaviorCategoryName, t2.name AS behaviorProjectName,
+        (
+        SELECT GROUP_CONCAT(b.name) FROM base_student_behavior_class_relation a
+        LEFT JOIN base_class b ON a.class_id = b.id
+        WHERE a.base_student_behavior_manage_id = t.id GROUP BY a.base_student_behavior_manage_id
+        ) AS behavior_class_names,
+        (
+        SELECT NAME FROM xjr_user WHERE id = t.assessment_user_id
+        ) AS assessment_user_name
+        FROM base_student_behavior_manage t
+        LEFT JOIN base_student_behavior_category t1 ON t1.id = t.base_student_behavior_category_id
+        LEFT JOIN base_student_behavior_project t2 ON t2.id = t.base_student_behavior_project_id
+        LEFT JOIN base_semester t3 ON t3.id = t.base_semester_id
+        LEFT JOIN base_grade t4 ON t.grade_id = t4.id
+        WHERE t.delete_mark = 0 AND t1.delete_mark = 0 AND t2.delete_mark = 0 AND (t.status = 1)
+
+        <if test="dto.gradeId != null">
+            and t.grade_id = #{dto.gradeId}
+        </if>
+        <if test="dto.semesterId != null">
+            and t.base_semester_id = #{dto.semesterId}
+        </if>
+        <if test="dto.startDate != null and dto.startDate != ''">
+            and t.assessment_date &gt;= #{dto.startDate}
+        </if>
+        <if test="dto.endDate != null and dto.endDate != ''">
+            and t.assessment_date &lt;= #{dto.endDate}
+        </if>
+        <if test="dto.assessmentUserIds != null and dto.assessmentUserIds != ''">
+            AND t.assessment_user_id in
+            <foreach item="userId" index="index" collection="dto.assessmentUserIds" open="(" close=")" separator=",">
+                #{userId}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="getInfo" resultType="com.xjrsoft.module.student.vo.BaseStudentBehaviorManageVo">
+        SELECT t.id, t2.score_type, t1.sort_code,
+               t.file_id, t.assessment_address, t3.name AS semester_name,
+               t.assessment_date, t.score, t.score_number, t.total_score, t4.name AS grade_name,
+               t.is_affect, t1.name AS behaviorCategoryName, t2.name AS behaviorProjectName,
+               (
+                   SELECT GROUP_CONCAT(b.name) FROM base_student_behavior_class_relation a
+                   LEFT JOIN base_class b ON a.class_id = b.id
+                   WHERE a.base_student_behavior_manage_id = t.id GROUP BY a.base_student_behavior_manage_id
+               ) AS asbinarysessment_class_names,
+               (
+                   SELECT name FROM xjr_user WHERE id = t.assessment_user_id
+               ) AS assessment_user_name
+        FROM base_student_behavior_manage t
+                 LEFT JOIN base_student_behavior_category t1 ON t1.id = t.base_student_behavior_category_id
+                 LEFT JOIN base_student_behavior_project t2 ON t2.id = t.base_student_behavior_project_id
+                 LEFT JOIN base_semester t3 ON t3.id = t.base_semester_id
+                 LEFT JOIN base_grade t4 ON t.grade_id = t4.id
+        WHERE t.delete_mark = 0 AND t1.delete_mark = 0 AND t2.delete_mark = 0 AND t.status = 1
+          AND t.id = #{id}
+    </select>
+
+    <select id="getMobilePage" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto" 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,
+        (
+            SELECT count(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id =
+            t1.id and class_id=t.class_id
+        ) as student_count
+        from base_student_assessment_class_relation t
+        left join base_student_assessment_inspection t1 on t1.id=t.base_student_assessment_inspection_id
+        left join base_student_assessment_category t2 on (t2.id = t1.base_student_assessment_category_id)
+        left join base_student_assessment_project t3 on (t3.id = t1.base_student_assessment_project_id)
+        left join xjr_dictionary_detail t4 on t4.code=t1.score_type
+        left join base_class t5 on t5.id=t.class_id
+        where t1.delete_mark=0 and t1.status=1 and t.class_id in
+        <foreach item="classId" index="index" collection="dto.classIds" open="(" close=")" separator=",">
+            #{classId}
+        </foreach>
+        <if test="dto.projectIds != null">
+            and t1.base_student_assessment_project_id in
+            <foreach item="projectId" index="index" collection="dto.projectIds" open="(" close=")" separator=",">
+                #{projectId}
+            </foreach>
+        </if>
+        <if test="dto.startDate != null and dto.startDate != ''">
+            and t1.assessment_date &gt;= #{dto.startDate}
+        </if>
+        <if test="dto.endDate != null and dto.endDate != ''">
+            and t1.assessment_date &lt;= #{dto.endDate}
+        </if>
+    </select>
+
+    <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
+        left join base_student_assessment_inspection t1 on t1.id=t.base_student_assessment_inspection_id
+        left join base_student_assessment_category t2 on (t2.id = t1.base_student_assessment_category_id)
+        left join base_student_assessment_project t3 on (t3.id = t1.base_student_assessment_project_id)
+        left join xjr_dictionary_detail t4 on t4.code=t1.score_type
+        left join base_class t5 on t5.id=t.class_id
+        left join xjr_user t6 on t1.assessment_user_id=t6.id
+        left join xjr_user t7 on t1.create_user_id=t7.id
+        where t.id=#{id};
+    </select>
+</mapper>