getMobilePage

src/main/java/com/xjrsoft/common/enums/ScoreTypeEnum.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.common.enums;
+
+/**
+ * 分数类型
+ */
+public enum ScoreTypeEnum {
+    /**
+     * 扣分
+     * */
+    ScoreMinus("score_minus", "扣分"),
+
+    /**
+     * 加分
+     * */
+    ScoreAdd("score_add", "加分");
+
+    final String code;
+    final String value;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    ScoreTypeEnum(final String code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+}

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

@@ -1,7 +1,6 @@
 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;
@@ -16,6 +15,7 @@ import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
 import com.xjrsoft.module.base.mapper.BaseClassMapper;
 import com.xjrsoft.module.student.dto.AddBaseStudentAssessmentInspectionDto;
+import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionMobilePageDto;
 import com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto;
 import com.xjrsoft.module.student.dto.UpdateBaseStudentAssessmentInspectionDto;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentCategory;
@@ -28,10 +28,7 @@ import com.xjrsoft.module.student.mapper.BaseStudentAssessmentProjectMapper;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentStudentRelationService;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentClassRelationListVo;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionVo;
-import com.xjrsoft.module.student.vo.BaseStudentAssessmentStudentRelationVo;
+import com.xjrsoft.module.student.vo.*;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
 import io.swagger.annotations.Api;
@@ -47,7 +44,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -79,21 +75,24 @@ public class BaseStudentAssessmentInspectionController {
         return RT.ok(ConventPage.getPageOutput(page, BaseStudentAssessmentInspectionPageVo.class));
     }
 
-    @GetMapping(value = "/mibliePage")
+    @GetMapping(value = "/mobile-page")
     @ApiOperation(value = "学生操行分记录管理列表(移动端分页)")
     @SaCheckPermission("basestudentbehaviormanage:detail")
-    public RT<PageOutput<BaseStudentAssessmentInspectionPageVo>> mibliePage(@Valid BaseStudentAssessmentInspectionPageDto dto) {
-        List<BaseClass> classList = baseClassMapper.selectList(
-                MPJWrappers.<BaseClass>lambdaJoin()
-                        .eq(BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
-                        .select(BaseClass.class, x -> VoToColumnUtil.fieldsToColumns(BaseClass.class).contains(x.getProperty()))
-        );
-        List<Long> classIds = new ArrayList<>();
-        for (BaseClass baseClass : classList) {
-            classIds.add(baseClass.getId());
-        }
-        dto.setClassIds(classIds);
-        return RT.ok(getData(dto));
+    public RT<PageOutput<BaseStudentAssessmentInspectionMobilePageVo>> mobilePage(@Valid BaseStudentAssessmentInspectionMobilePageDto dto) {
+//        List<BaseClass> classList = baseClassMapper.selectList(
+//                MPJWrappers.<BaseClass>lambdaJoin()
+//                        .eq(BaseClass::getTeacherId, StpUtil.getLoginIdAsLong())
+//                        .select(BaseClass.class, x -> VoToColumnUtil.fieldsToColumns(BaseClass.class).contains(x.getProperty()))
+//        );
+//        List<Long> classIds = new ArrayList<>();
+//        for (BaseClass baseClass : classList) {
+//            classIds.add(baseClass.getId());
+//        }
+//        dto.setClassIds(classIds);
+//        return RT.ok(getData(dto));
+
+        Page<BaseStudentAssessmentInspectionMobilePageVo> page = baseStudentAssessmentInspectionService.getMobilePage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        return RT.ok(ConventPage.getPageOutput(page, BaseStudentAssessmentInspectionMobilePageVo.class));
     }
 
     PageOutput<BaseStudentAssessmentInspectionPageVo> getData(BaseStudentAssessmentInspectionPageDto dto) {

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.student.dto;
+
+import com.xjrsoft.common.page.PageInput;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+* @title: 学生班级巡查考核
+* @Author dzx
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentInspectionMobilePageDto extends PageInput {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 班级编号
+     */
+    private List<Long> class_ids;
+}

src/main/java/com/xjrsoft/module/student/entity/BaseStudentAssessmentClassRelation.java

@@ -51,11 +51,6 @@ public class BaseStudentAssessmentClassRelation implements Serializable {
     */
     @ApiModelProperty("序号")
     private Integer sortCode;
-    /**
-    * 班主任姓名
-    */
-    @ApiModelProperty("班主任姓名")
-    private String teacherName;
 
 
 }

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

@@ -2,14 +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.common.page.PageOutput;
+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.BaseStudentAssessmentInspectionPageVo;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 /**
 * @title: 学生班级巡查考核
 * @Author dzx
@@ -20,10 +19,17 @@ import java.util.List;
 public interface BaseStudentAssessmentInspectionMapper extends MPJBaseMapper<BaseStudentAssessmentInspection> {
     /**
      * 分页查询
+     * @param page
      * @param dto
      * @return
      */
     Page<BaseStudentAssessmentInspectionPageVo> getPage(Page<BaseStudentAssessmentInspectionPageDto> page,BaseStudentAssessmentInspectionPageDto dto);
 
-    List<BaseStudentAssessmentInspection> getListAll();
+    /**
+     * app分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentAssessmentInspectionMobilePageVo> getMobilePage(Page<BaseStudentAssessmentInspectionMobilePageDto> page, BaseStudentAssessmentInspectionMobilePageDto dto);
 }

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

@@ -1,14 +1,13 @@
 package com.xjrsoft.module.student.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dingtalk.api.response.OapiRhinoOrderQueryResponse;
 import com.github.yulichang.base.MPJBaseService;
+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.BaseStudentAssessmentInspectionPageVo;
 
-import java.util.List;
-
 /**
 * @title: 学生班级巡查考核
 * @Author dzx
@@ -23,4 +22,12 @@ public interface IBaseStudentAssessmentInspectionService extends MPJBaseService<
      * @return
      */
     Page<BaseStudentAssessmentInspectionPageVo> getPage(Page<BaseStudentAssessmentInspectionPageDto> page,BaseStudentAssessmentInspectionPageDto dto);
+
+    /**
+     * app分页查询
+     * @param page
+     * @param dto
+     * @return
+     */
+    Page<BaseStudentAssessmentInspectionMobilePageVo> getMobilePage(Page<BaseStudentAssessmentInspectionMobilePageDto> page, BaseStudentAssessmentInspectionMobilePageDto dto);
 }

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

@@ -1,35 +1,42 @@
 package com.xjrsoft.module.student.service.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.toolkit.MPJWrappers;
+import com.xjrsoft.common.utils.VoToColumnUtil;
 import com.xjrsoft.module.base.entity.BaseClass;
+import com.xjrsoft.module.base.mapper.BaseClassMapper;
+import com.xjrsoft.module.form.entity.FormHistory;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentClassRelation;
 import com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection;
 import com.xjrsoft.module.student.mapper.BaseStudentAssessmentClassRelationMapper;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentClassRelationService;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentCategoryListVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.teacher.mapper.XjrUserMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
-* @title: 学生班级巡查考核-关联班级
-* @Author fanxp
-* @Date: 2023-11-16
-* @Version 1.0
-*/
+ * @title: 学生班级巡查考核-关联班级
+ * @Author fanxp
+ * @Date: 2023-11-16
+ * @Version 1.0
+ */
 @Service
 @AllArgsConstructor
 public class BaseStudentAssessmentClassRelationServiceImpl extends ServiceImpl<BaseStudentAssessmentClassRelationMapper, BaseStudentAssessmentClassRelation> implements IBaseStudentAssessmentClassRelationService {
 
     private final IBaseStudentAssessmentInspectionService baseStudentAssessmentInspectionService;
+
     private final BaseStudentAssessmentClassRelationMapper baseStudentAssessmentClassRelationMapper;
-    private final XjrUserMapper xjrUserMapper;
 
     @Override
     public Boolean dataCache(Long dataId) {
@@ -38,21 +45,10 @@ public class BaseStudentAssessmentClassRelationServiceImpl extends ServiceImpl<B
 
         for (String classId : classIdList) {
             BaseStudentAssessmentClassRelation classRelation = new BaseStudentAssessmentClassRelation();
-            Long classIdAsLong = Long.valueOf(classId);
+            Long classIdAsLong = Convert.toLong(classId);
             classRelation.setClassId(classIdAsLong);
             classRelation.setBaseStudentAssessmentInspectionId(dataId);
 
-            //根据班主任id查询出班主任的名字
-            XjrUser xjrUser = xjrUserMapper.selectOne(
-                    MPJWrappers.<XjrUser>lambdaJoin()
-                    .eq(BaseClass::getId, classIdAsLong)
-                    .innerJoin(BaseClass.class, BaseClass::getTeacherId, XjrUser::getId)
-            );
-
-            if(ObjectUtil.isNotNull(xjrUser)){
-                classRelation.setTeacherName(xjrUser.getName());
-            }
-
             baseStudentAssessmentClassRelationMapper.insert(classRelation);
         }
 

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

@@ -2,16 +2,17 @@ package com.xjrsoft.module.student.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.common.enums.ScoreTypeEnum;
+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.mapper.BaseStudentAssessmentInspectionMapper;
 import com.xjrsoft.module.student.service.IBaseStudentAssessmentInspectionService;
+import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionMobilePageVo;
 import com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @title: 学生班级巡查考核
  * @Author dzx
@@ -26,6 +27,25 @@ public class BaseStudentAssessmentInspectionServiceImpl extends MPJBaseServiceIm
 
     @Override
     public Page<BaseStudentAssessmentInspectionPageVo> getPage(Page<BaseStudentAssessmentInspectionPageDto> page, BaseStudentAssessmentInspectionPageDto dto) {
-        return assessmentInspectionMapper.getPage(page, dto);
+        Page<BaseStudentAssessmentInspectionPageVo> result = assessmentInspectionMapper.getPage(page, dto);
+        // 处理加减分
+        result.getRecords().forEach((node) -> {
+            if (node.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
+                node.setScore(node.getScore() * -1);
+            }
+        });
+        return result;
+    }
+
+    @Override
+    public Page<BaseStudentAssessmentInspectionMobilePageVo> getMobilePage(Page<BaseStudentAssessmentInspectionMobilePageDto> page, BaseStudentAssessmentInspectionMobilePageDto dto) {
+        Page<BaseStudentAssessmentInspectionMobilePageVo> result = assessmentInspectionMapper.getMobilePage(page, dto);
+        // 处理加减分
+        result.getRecords().forEach((node) -> {
+            if (node.getScoreType().equals(ScoreTypeEnum.ScoreMinus.getCode())) {
+                node.setScore(node.getScore() * -1);
+            }
+        });
+        return result;
     }
 }

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

@@ -0,0 +1,46 @@
+package com.xjrsoft.module.student.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+* @title: 学生班级巡查考核分页列表出参
+* @Author dzx
+* @Date: 2023-11-16
+* @Version 1.0
+*/
+@Data
+public class BaseStudentAssessmentInspectionMobilePageVo {
+
+    @ApiModelProperty("主键编号")
+    private String id;
+
+    @ApiModelProperty("考核时间")
+    private Date assessmentDate;
+
+    @ApiModelProperty("考核项目")
+    private String assessmentProjectName;
+
+    @ApiModelProperty("考核类别")
+    private String assessmentCategoryName;
+
+    @ApiModelProperty("考核班级")
+    private String assessmentClassName;
+
+    @ApiModelProperty("影响班级考核的学生人数")
+    private Integer studentCount;
+
+    @ApiModelProperty("原因")
+    private String reason;
+
+    @ApiModelProperty("分数")
+    private Double score;
+
+    @ApiModelProperty("分数类型(xjr_dictionary_item[score_type])")
+    private String scoreType;
+
+    @ApiModelProperty("分数类型名称")
+    private String scoreTypeCn;
+}

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

@@ -5,23 +5,35 @@
 <mapper namespace="com.xjrsoft.module.student.mapper.BaseStudentAssessmentInspectionMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.student.dto.BaseStudentAssessmentInspectionPageDto" resultType="com.xjrsoft.module.student.vo.BaseStudentAssessmentInspectionPageVo">
         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,
-               (
-                   select group_concat(b.name) from base_student_assessment_class_relation a
-                   left join base_class b on a.class_id=b.id
-                   where a.base_student_assessment_inspection_id=t.id group by a.base_student_assessment_inspection_id
-               ) as assessment_class_names,
-               (SELECT count(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id = t.id) as student_count
-                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
+        (
+            select group_concat(b.name) from base_student_assessment_class_relation a
+            left join base_class b on a.class_id=b.id
+            where a.base_student_assessment_inspection_id=t.id group by a.base_student_assessment_inspection_id
+        ) as assessment_class_names,
+        (
+            SELECT count(*) FROM base_student_assessment_student_relation WHERE base_student_assessment_inspection_id = t.id
+        ) as student_count
+        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.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="getListAll" resultType="com.xjrsoft.module.student.entity.BaseStudentAssessmentInspection">
-        select * from base_student_assessment_inspection;
+    <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,
+        (
+        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 ;
     </select>
 </mapper>

src/main/resources/sqlScript/20231113_sql.sql

@@ -243,7 +243,7 @@ CREATE TABLE base_student_assessment_inspection
     `base_semester_id` bigint COMMENT '学期ID(base_semester)',
     `grade_id` bigint  NULL DEFAULT NULL COMMENT '入学年级(base_grade)',
     `class_ids` varchar(4000)  NULL DEFAULT NULL COMMENT '班级Ids(多选)',
-    `assessment_date` date NULL DEFAULT NULL COMMENT '考核时间',
+    `assessment_date` datetime NULL DEFAULT NULL COMMENT '考核时间',
     `score` double NOT NULL DEFAULT 0 COMMENT '分数',
     `score_type` varchar(20) NULL DEFAULT NULL COMMENT '分数类型(xjr_dictionary_item[score_type])',
     `assessment_user_id` bigint  NULL DEFAULT NULL COMMENT '考核用户ID(xjr_user)',
@@ -262,6 +262,7 @@ CREATE TABLE base_student_assessment_student_relation
 (
     id BIGINT NOT NULL COMMENT '主键编号',
     `user_id`  BIGINT NULL DEFAULT NULL COMMENT'学生id',
+    `class_id` BIGINT NULL DEFAULT NULL COMMENT '班级编号',
     `base_student_assessment_inspection_id` BIGINT NULL DEFAULT NULL COMMENT '学生班级巡查考核id',
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
     `student_id` VARCHAR(30) NULL DEFAULT NULL COMMENT '学号',
@@ -284,7 +285,6 @@ CREATE TABLE base_student_assessment_class_relation
     `class_id`  BIGINT NULL DEFAULT NULL COMMENT'班级编号id',
     `base_student_assessment_inspection_id` BIGINT NULL DEFAULT NULL COMMENT '学生班级巡查考核id',
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `teacher_name` VARCHAR(30) NULL DEFAULT NULL COMMENT '班主任姓名',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联班级';
 
@@ -447,7 +447,6 @@ CREATE TABLE base_student_behavior_class_relation
     `class_id`  BIGINT NULL DEFAULT NULL COMMENT'班级编号id',
     `base_student_behavior_manage_id` BIGINT NULL DEFAULT NULL COMMENT '学生操行分记录管理id',
     `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
-    `teacher_name` VARCHAR(30) NULL DEFAULT NULL COMMENT '班主任姓名',
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联班级';
 --------------------------------------------------------------------学生操行--------------------------------------------------------------------