更新学生成绩后台首页

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/notice/XiaoyuanNoticeController.java

@@ -47,6 +47,16 @@ public class XiaoyuanNoticeController extends BaseController {
         return xiaoyuanNoticeService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 我的校园新闻列表
+     */
+    @GetMapping("/myList")
+    public TableDataInfo<XiaoyuanNoticeVo> myList(XiaoyuanNoticeBo bo, PageQuery pageQuery)
+    {
+        List<XiaoyuanNoticeVo> list = xiaoyuanNoticeService.selectXiaoyuanNoticeMyList(bo, pageQuery);
+        return TableDataInfo.build(list);
+    }
+
     /**
      * 导出校园新闻列表
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/score/ScoreDataController.java

@@ -1,14 +1,17 @@
 package org.dromara.system.controller.score;
 
 import java.util.List;
+import java.util.Map;
 
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.core.domain.AjaxResult;
 import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.system.domain.score.ScoreData;
+import org.dromara.system.domain.score.ScoreDataStudent;
 import org.dromara.system.domain.score.bo.ScoreDataBo;
 import org.dromara.system.domain.score.vo.ScoreDataVo;
 import org.dromara.system.domain.vo.SysUserImportVo;
@@ -94,7 +97,7 @@ public class ScoreDataController extends BaseController {
     @SaCheckPermission("score:score:add")
     @Log(title = "成绩", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @PostMapping()
+    @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ScoreDataBo bo) {
         return toAjax(scoreDataService.insertByBo(bo));
     }
@@ -122,4 +125,35 @@ public class ScoreDataController extends BaseController {
                           @PathVariable Long[] scoreIds) {
         return toAjax(scoreDataService.deleteWithValidByIds(List.of(scoreIds), true));
     }
+
+
+    /**
+     * 后台首页成绩统计排名
+     */
+    @PostMapping("/indexPaiMing")
+    public AjaxResult indexPaiMing(@RequestBody ScoreData scoreData)
+    {
+        List<ScoreDataStudent> scoreDataStudentList = scoreDataService.indexPaiMing(scoreData);
+        return AjaxResult.success(scoreDataStudentList);
+    }
+
+    /**
+     * 后台首页成绩统计分段人数饼图
+     */
+    @PostMapping("/indexBingTu")
+    public AjaxResult indexBingTu(@RequestBody ScoreData scoreData)
+    {
+        Map<String, Object> map = scoreDataService.indexBingTu(scoreData);
+        return AjaxResult.success(map);
+    }
+
+    /**
+     * 后台首页成绩统计分段人数折线图
+     */
+    @PostMapping("/indexZheXian")
+    public AjaxResult indexZheXian(@RequestBody ScoreData scoreData)
+    {
+        Map<String, Object> map = scoreDataService.indexZheXian(scoreData);
+        return AjaxResult.success(map);
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/score/ScoreDataMfController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.score;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.score.bo.ScoreDataMfBo;
+import org.dromara.system.domain.score.vo.ScoreDataMfVo;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.system.service.IScoreDataMfService;
+
+/**
+ * 成绩满分
+ *
+ * @author boman
+ * @date 2023-08-22
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/dataMf")
+public class ScoreDataMfController extends BaseController {
+
+    private final IScoreDataMfService scoreDataMfService;
+
+    /**
+     * 查询成绩满分列表
+     */
+    @SaCheckPermission("system:dataMf:list")
+    @GetMapping("/list")
+    public TableDataInfo<ScoreDataMfVo> list(ScoreDataMfBo bo, PageQuery pageQuery) {
+        return scoreDataMfService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出成绩满分列表
+     */
+    @SaCheckPermission("system:dataMf:export")
+    @Log(title = "成绩满分", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ScoreDataMfBo bo, HttpServletResponse response) {
+        List<ScoreDataMfVo> list = scoreDataMfService.queryList(bo);
+        ExcelUtil.exportExcel(list, "成绩满分", ScoreDataMfVo.class, response);
+    }
+
+    /**
+     * 获取成绩满分详细信息
+     *
+     * @param mfId 主键
+     */
+    @SaCheckPermission("system:dataMf:query")
+    @GetMapping("/{mfId}")
+    public R<ScoreDataMfVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long mfId) {
+        return R.ok(scoreDataMfService.queryById(mfId));
+    }
+
+    /**
+     * 新增成绩满分
+     */
+    @SaCheckPermission("system:dataMf:add")
+    @Log(title = "成绩满分", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ScoreDataMfBo bo) {
+        return toAjax(scoreDataMfService.insertByBo(bo));
+    }
+
+    /**
+     * 修改成绩满分
+     */
+    @SaCheckPermission("system:dataMf:edit")
+    @Log(title = "成绩满分", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ScoreDataMfBo bo) {
+        return toAjax(scoreDataMfService.updateByBo(bo));
+    }
+
+    /**
+     * 删除成绩满分
+     *
+     * @param mfIds 主键串
+     */
+    @SaCheckPermission("system:dataMf:remove")
+    @Log(title = "成绩满分", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{mfIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] mfIds) {
+        return toAjax(scoreDataMfService.deleteWithValidByIds(List.of(mfIds), true));
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/ScoreData.java

@@ -52,6 +52,10 @@ public class ScoreData extends TenantEntity {
      * 隐私设置 1:仅自己 2:仅本班 3:全部
      */
     private String privacyType;
+    /**
+     * 是否进行年级统计 N:否 Y:是 必须保证同一年级考试时间一样
+     */
+    private String scoreType;
 
     /**
      * 备注

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/ScoreDataMf.java

@@ -0,0 +1,56 @@
+package org.dromara.system.domain.score;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 成绩满分对象 score_data_mf
+ *
+ * @author boman
+ * @date 2023-08-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("score_data_mf")
+public class ScoreDataMf extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 学科满分id
+     */
+    @TableId(value = "mf_id")
+    private Long mfId;
+
+    /**
+     * 成绩表id
+     */
+    private Long scoreId;
+
+    /**
+     * 学科
+     */
+    private String xueke;
+
+    /**
+     * 满分
+     */
+    private String manfen;
+
+    /**
+     * 平均分
+     */
+    private String avg;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/ScoreDataStudent.java

@@ -50,7 +50,7 @@ public class ScoreDataStudent extends TenantEntity {
     /**
      * 总分
      */
-    private String zongfen;
+    private int zongfen;
 
     /**
      * 平均分

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/bo/ScoreDataBo.java

@@ -1,5 +1,6 @@
 package org.dromara.system.domain.score.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -59,6 +60,10 @@ public class ScoreDataBo extends BaseEntity {
      */
     //@NotBlank(message = "隐私设置 1:仅自己 2:仅本班 3:全部不能为空", groups = { AddGroup.class, EditGroup.class })
     private String privacyType;
+    /**
+     * 是否进行年级统计
+     */
+    private String scoreType;
 
     /**
      * 备注
@@ -72,6 +77,13 @@ public class ScoreDataBo extends BaseEntity {
     //@NotBlank(message = "班级平均分不能为空", groups = { AddGroup.class, EditGroup.class })
     private String avg;
 
+    @TableField(exist = false)
     private List<ScoreDataStudentBo> scoreDataStudentBoList;
 
+    /**
+     * 成绩满分
+     */
+    @TableField(exist = false)
+    private List<ScoreDataMfBo> scoreDataMfBoList;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/bo/ScoreDataDetailBo.java

@@ -1,5 +1,6 @@
 package org.dromara.system.domain.score.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -76,5 +77,6 @@ public class ScoreDataDetailBo extends BaseEntity {
     //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    @TableField(exist = false)
     private List<ScoreDataStudentBo> scoreDataStudentBoList;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/bo/ScoreDataMfBo.java

@@ -0,0 +1,60 @@
+package org.dromara.system.domain.score.bo;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import org.dromara.system.domain.score.ScoreDataMf;
+
+/**
+ * 成绩满分业务对象 score_data_mf
+ *
+ * @author boman
+ * @date 2023-08-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ScoreDataMf.class, reverseConvertGenerate = false)
+public class ScoreDataMfBo extends BaseEntity {
+
+    /**
+     * 学科满分id
+     */
+    @NotNull(message = "学科满分id不能为空", groups = { EditGroup.class })
+    private Long mfId;
+
+    /**
+     * 成绩表id
+     */
+    @NotNull(message = "成绩表id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long scoreId;
+
+    /**
+     * 学科
+     */
+    @NotBlank(message = "学科不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String xueke;
+
+    /**
+     * 满分
+     */
+    @NotBlank(message = "满分不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String manfen;
+
+    /**
+     * 平均分
+     */
+    @NotBlank(message = "平均分不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String avg;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/bo/ScoreDataStudentBo.java

@@ -1,5 +1,6 @@
 package org.dromara.system.domain.score.bo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -75,6 +76,7 @@ public class ScoreDataStudentBo extends BaseEntity {
      */
     //@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
+    @TableField(exist = false)
 
     private List<ScoreDataDetailBo> scoreDataDetailBoList;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/vo/ScoreDataMfVo.java

@@ -0,0 +1,65 @@
+package org.dromara.system.domain.score.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.score.ScoreDataMf;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 成绩满分视图对象 score_data_mf
+ *
+ * @author boman
+ * @date 2023-08-22
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ScoreDataMf.class)
+public class ScoreDataMfVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 学科满分id
+     */
+    @ExcelProperty(value = "学科满分id")
+    private Long mfId;
+
+    /**
+     * 成绩表id
+     */
+    @ExcelProperty(value = "成绩表id")
+    private Long scoreId;
+
+    /**
+     * 学科
+     */
+    @ExcelProperty(value = "学科")
+    private String xueke;
+
+    /**
+     * 满分
+     */
+    @ExcelProperty(value = "满分")
+    private String manfen;
+
+    /**
+     * 平均分
+     */
+    @ExcelProperty(value = "平均分")
+    private String avg;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/vo/ScoreDataStudentVo.java

@@ -3,6 +3,7 @@ package org.dromara.system.domain.score.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.system.domain.score.ScoreDataStudent;
@@ -80,6 +81,6 @@ public class ScoreDataStudentVo implements Serializable {
      */
     @ExcelProperty(value = "备注")
     private String remark;
-
+    @TableField(exist = false)
     private List<ScoreDataDetailVo> scoreDataDetailVoList;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/score/vo/ScoreDataVo.java

@@ -3,9 +3,11 @@ package org.dromara.system.domain.score.vo;
 import java.util.Date;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.system.domain.score.ScoreData;
+import org.dromara.system.domain.score.bo.ScoreDataMfBo;
 import org.dromara.system.domain.score.bo.ScoreDataStudentBo;
 
 import java.io.Serial;
@@ -62,6 +64,11 @@ public class ScoreDataVo implements Serializable {
      */
     @ExcelProperty(value = "隐私设置 1:仅自己 2:仅本班 3:全部")
     private String privacyType;
+    /**
+     * 是否进行年级统计 N:否 Y:是 必须保证同一年级考试时间一样
+     */
+    //@ExcelProperty(value = "是否进行年级统计 1:仅自己 2:仅本班 3:全部")
+    private String scoreType;
 
     /**
      * 备注
@@ -74,6 +81,12 @@ public class ScoreDataVo implements Serializable {
      */
     @ExcelProperty(value = "班级平均分")
     private String avg;
+    @TableField(exist = false)
 
     private List<ScoreDataStudentVo> scoreDataStudentVoList;
+    /**
+     * 成绩满分
+     */
+    @TableField(exist = false)
+    private List<ScoreDataMfBo> scoreDataMfBoList;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/score/ScoreDataMfMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.system.mapper.score;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.score.ScoreDataMf;
+import org.dromara.system.domain.score.vo.ScoreDataMfVo;
+
+/**
+ * 成绩满分Mapper接口
+ *
+ * @author boman
+ * @date 2023-08-22
+ */
+public interface ScoreDataMfMapper extends BaseMapperPlus<ScoreDataMf, ScoreDataMfVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/score/ScoreDataStudentMapper.java

@@ -5,6 +5,8 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.system.domain.score.ScoreDataStudent;
 import org.dromara.system.domain.score.vo.ScoreDataStudentVo;
 
+import java.util.List;
+
 /**
  * 成绩_子学生idMapper接口
  *
@@ -13,4 +15,12 @@ import org.dromara.system.domain.score.vo.ScoreDataStudentVo;
  */
 public interface ScoreDataStudentMapper extends BaseMapperPlus<ScoreDataStudent, ScoreDataStudentVo> {
 
+    /**
+     * 查询成绩排名
+     * @param scoreClassId
+     * @return
+     */
+    public List<ScoreDataStudent> selectScoreDataByScoreClassId(String scoreClassId);
+
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IScoreDataMfService.java

@@ -0,0 +1,47 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.score.bo.ScoreDataMfBo;
+import org.dromara.system.domain.score.vo.ScoreDataMfVo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 成绩满分Service接口
+ *
+ * @author boman
+ * @date 2023-08-22
+ */
+public interface IScoreDataMfService {
+
+    /**
+     * 查询成绩满分
+     */
+    ScoreDataMfVo queryById(Long mfId);
+
+    /**
+     * 查询成绩满分列表
+     */
+    TableDataInfo<ScoreDataMfVo> queryPageList(ScoreDataMfBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询成绩满分列表
+     */
+    List<ScoreDataMfVo> queryList(ScoreDataMfBo bo);
+
+    /**
+     * 新增成绩满分
+     */
+    Boolean insertByBo(ScoreDataMfBo bo);
+
+    /**
+     * 修改成绩满分
+     */
+    Boolean updateByBo(ScoreDataMfBo bo);
+
+    /**
+     * 校验并批量删除成绩满分信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/notice/XiaoyuanNoticeServiceImpl.java

@@ -114,6 +114,19 @@ public class XiaoyuanNoticeServiceImpl implements IXiaoyuanNoticeService {
         return TableDataInfo.build(result);
     }
 
+    /**
+     * 我的校园新闻列表
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    @Override
+    public List<XiaoyuanNoticeVo> selectXiaoyuanNoticeMyList(XiaoyuanNoticeBo bo, PageQuery pageQuery) {
+        bo.setSenderId(String.valueOf(LoginHelper.getUserId()));
+        LambdaQueryWrapper<XiaoyuanNotice> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
     /**
      * 查询校园新闻列表
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataMfServiceImpl.java

@@ -0,0 +1,112 @@
+package org.dromara.system.service.impl.score;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.score.ScoreDataMf;
+import org.dromara.system.domain.score.bo.ScoreDataMfBo;
+import org.dromara.system.domain.score.vo.ScoreDataMfVo;
+import org.dromara.system.mapper.score.ScoreDataMfMapper;
+import org.springframework.stereotype.Service;
+import org.dromara.system.service.IScoreDataMfService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 成绩满分Service业务层处理
+ *
+ * @author boman
+ * @date 2023-08-22
+ */
+@RequiredArgsConstructor
+@Service
+public class ScoreDataMfServiceImpl implements IScoreDataMfService {
+
+    private final ScoreDataMfMapper baseMapper;
+
+    /**
+     * 查询成绩满分
+     */
+    @Override
+    public ScoreDataMfVo queryById(Long mfId){
+        return baseMapper.selectVoById(mfId);
+    }
+
+    /**
+     * 查询成绩满分列表
+     */
+    @Override
+    public TableDataInfo<ScoreDataMfVo> queryPageList(ScoreDataMfBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ScoreDataMf> lqw = buildQueryWrapper(bo);
+        Page<ScoreDataMfVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询成绩满分列表
+     */
+    @Override
+    public List<ScoreDataMfVo> queryList(ScoreDataMfBo bo) {
+        LambdaQueryWrapper<ScoreDataMf> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ScoreDataMf> buildQueryWrapper(ScoreDataMfBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ScoreDataMf> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getScoreId() != null, ScoreDataMf::getScoreId, bo.getScoreId());
+        lqw.eq(StringUtils.isNotBlank(bo.getXueke()), ScoreDataMf::getXueke, bo.getXueke());
+        lqw.eq(StringUtils.isNotBlank(bo.getManfen()), ScoreDataMf::getManfen, bo.getManfen());
+        lqw.eq(StringUtils.isNotBlank(bo.getAvg()), ScoreDataMf::getAvg, bo.getAvg());
+        return lqw;
+    }
+
+    /**
+     * 新增成绩满分
+     */
+    @Override
+    public Boolean insertByBo(ScoreDataMfBo bo) {
+        ScoreDataMf add = MapstructUtils.convert(bo, ScoreDataMf.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setMfId(add.getMfId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改成绩满分
+     */
+    @Override
+    public Boolean updateByBo(ScoreDataMfBo bo) {
+        ScoreDataMf update = MapstructUtils.convert(bo, ScoreDataMf.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ScoreDataMf entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除成绩满分
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/score/ScoreDataServiceImpl.java

@@ -2,28 +2,30 @@ package org.dromara.system.service.impl.score;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.core.constant.CacheConstants;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.system.domain.score.ScoreData;
 import org.dromara.system.domain.score.ScoreDataDetail;
 import org.dromara.system.domain.score.ScoreDataStudent;
 import org.dromara.system.domain.score.bo.ScoreDataBo;
 import org.dromara.system.domain.score.bo.ScoreDataDetailBo;
+import org.dromara.system.domain.score.bo.ScoreDataMfBo;
 import org.dromara.system.domain.score.bo.ScoreDataStudentBo;
 import org.dromara.system.domain.score.vo.ScoreDataVo;
 import org.dromara.system.mapper.score.ScoreDataDetailMapper;
 import org.dromara.system.mapper.score.ScoreDataMapper;
+import org.dromara.system.mapper.score.ScoreDataMfMapper;
 import org.dromara.system.mapper.score.ScoreDataStudentMapper;
 import org.dromara.system.service.score.IScoreDataService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 成绩Service业务层处理
@@ -38,12 +40,14 @@ public class ScoreDataServiceImpl implements IScoreDataService {
     private final ScoreDataMapper baseMapper;
     private final ScoreDataStudentMapper scoreDataStudentMapper;
     private final ScoreDataDetailMapper scoreDataDetailMapper;
+    private final ScoreDataMfMapper scoreDataMfMapper;
+
 
     /**
      * 查询成绩
      */
     @Override
-    public ScoreDataVo queryById(Long scoreId){
+    public ScoreDataVo queryById(Long scoreId) {
         return baseMapper.selectVoById(scoreId);
     }
 
@@ -83,33 +87,52 @@ public class ScoreDataServiceImpl implements IScoreDataService {
      */
     @Override
     public Boolean insertByBo(ScoreDataBo bo) {
+        ScoreData add = MapstructUtils.convert(bo, ScoreData.class);
+        //validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        Long scoreId = add.getScoreId();
+        if (flag) {
+            bo.setScoreId(scoreId);
+        }
+        //班级总分
+        long classZf = 0L;
+        //获取各科成绩满分
+        List<ScoreDataMfBo> scoreDataMfBoList = bo.getScoreDataMfBoList();
+        if (scoreDataMfBoList != null && scoreDataMfBoList.size() > 0) {
+            for (ScoreDataMfBo scoreDataMfBo : scoreDataMfBoList) {
+                scoreDataMfBo.setScoreId(scoreId);
+            }
+            scoreDataMfMapper.insertBatch(MapstructUtils.convert(scoreDataMfBoList, org.dromara.system.domain.score.ScoreDataMf.class));
+        }
         //从考试信息中获取所有学生信息,在获取该学生所有考试成绩
         List<ScoreDataStudentBo> scoreDataStudentBoList = bo.getScoreDataStudentBoList();
-        if (scoreDataStudentBoList != null && scoreDataStudentBoList.size() > 0){
+        if (scoreDataStudentBoList != null && scoreDataStudentBoList.size() > 0) {
             for (ScoreDataStudentBo scoreDataStudentBo : scoreDataStudentBoList) {
                 List<ScoreDataDetailBo> scoreDataDetailBoList = scoreDataStudentBo.getScoreDataDetailBoList();
-                if (scoreDataDetailBoList != null && scoreDataDetailBoList.size() > 0){
-                    Long zf = 0L;
+                if (scoreDataDetailBoList != null && scoreDataDetailBoList.size() > 0) {
+                    long zf = 0L;
                     //计算总分
                     for (ScoreDataDetailBo scoreDataDetailBo : scoreDataDetailBoList) {
                         //总分 = 总分 + 单科成绩
                         zf = zf + scoreDataDetailBo.getScore();
-                        ScoreDataDetail scoreDataDetail = MapstructUtils.convert(scoreDataDetailBo, ScoreDataDetail.class);
-                        scoreDataDetailMapper.insert(scoreDataDetail);
+                        scoreDataDetailBo.setScoreId(scoreId);
+                        scoreDataDetailBo.setScoreDataName(scoreDataStudentBo.getScoreDataName());
+                        scoreDataDetailBo.setScoreDataNameId(scoreDataStudentBo.getScoreDataNameId());
                     }
+                    classZf = classZf + zf;
                     scoreDataStudentBo.setZongfen(zf);
                     //计算平均分 = 总分/学科数
-                    scoreDataStudentBo.setAvg(String.valueOf(zf/scoreDataDetailBoList.size()));
-                    ScoreDataStudent scoreDataStudent = MapstructUtils.convert(scoreDataStudentBo, org.dromara.system.domain.score.ScoreDataStudent.class);
+                    scoreDataStudentBo.setAvg(String.valueOf(zf / scoreDataDetailBoList.size()));
+                    ScoreDataStudent scoreDataStudent = MapstructUtils.convert(scoreDataStudentBo, ScoreDataStudent.class);
+                    scoreDataStudent.setScoreId(scoreId);
                     scoreDataStudentMapper.insert(scoreDataStudent);
+                    scoreDataDetailMapper.insertBatch(MapstructUtils.convert(scoreDataDetailBoList, ScoreDataDetail.class));
                 }
             }
-        }
-        ScoreData add = MapstructUtils.convert(bo, ScoreData.class);
-        //validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setScoreId(add.getScoreId());
+            //计算班级总分平均分=各学生总分/学生人数
+            long classAvg = classZf / scoreDataStudentBoList.size();
+            add.setAvg(String.valueOf(classAvg));
+            baseMapper.updateById(add);
         }
         return flag;
     }
@@ -127,7 +150,7 @@ public class ScoreDataServiceImpl implements IScoreDataService {
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ScoreData entity){
+    private void validEntityBeforeSave(ScoreData entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -136,9 +159,144 @@ public class ScoreDataServiceImpl implements IScoreDataService {
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 后台首页成绩统计排名
+     */
+    @Override
+    public List<ScoreDataStudent> indexPaiMing(ScoreData scoreData) {
+        List<ScoreDataStudent> scoreDataStudents = scoreDataStudentMapper.selectScoreDataByScoreClassId(scoreData.getScoreClassId());
+        if (scoreDataStudents != null && scoreDataStudents.size() > 0) {
+            scoreDataStudents = scoreDataStudents.subList(0, Math.min(scoreDataStudents.size(), 10));
+        }
+        return scoreDataStudents;
+    }
+
+    /**
+     * 后台首页成绩统计分段人数饼图最新一次考试
+     */
+    @Override
+    public Map<String, Object> indexBingTu(ScoreData scoreData) {
+        //获取缓存的数据
+        Map<String, Object> cacheMap = RedisUtils.getCacheMap(CacheConstants.FEN_DUAN_NEW + scoreData.getScoreClassId());
+        //获取班级id对应的最新考试id
+        Long scoreDataId = (Long) RedisUtils.getCacheObject(CacheConstants.SCORE_ID + scoreData.getScoreClassId());
+        boolean flag = false;
+        if (cacheMap != null) {
+            //获取redis缓存的考试id
+            Long scoreId = (Long) cacheMap.get("scoreId");
+            //判断最新一次考试id和缓存id是否匹配
+            if (scoreDataId != null && scoreDataId.equals(scoreId)) {
+                //说明缓存就是最新的
+                return cacheMap;
+            } else {
+                //说明缓存数据不是最新的需要放到对比数据key中去 成为对比数据
+                flag = true;
+            }
+        }
+        Map<String, Object> map = new HashMap<>(8);
+        int a = 0, b = 0, c = 0, d = 0, e = 0, f = 0, g = 0, h = 0;
+        map.put("One", a);
+        map.put("Tow", b);
+        map.put("Thr", c);
+        map.put("For", d);
+        map.put("Fiv", e);
+        map.put("Six", f);
+        map.put("Sev", g);
+        map.put("Eig", h);
+        List<ScoreDataStudent> scoreDataStudents = scoreDataStudentMapper.selectScoreDataByScoreClassId(scoreData.getScoreClassId());
+
+        if (scoreDataStudents != null && scoreDataStudents.size() > 0) {
+            int zongfen = 0;
+            //计算各个分数段有多少人
+            for (ScoreDataStudent scoreDataDetail : scoreDataStudents) {
+                zongfen = scoreDataDetail.getZongfen();
+                if (zongfen >= 0 && zongfen <= 100) {
+                    a++;
+                } else if (zongfen > 100 && zongfen <= 200) {
+                    b++;
+                } else if (zongfen > 200 && zongfen <= 300) {
+                    c++;
+                } else if (zongfen > 300 && zongfen <= 400) {
+                    d++;
+                } else if (zongfen > 400 && zongfen <= 500) {
+                    e++;
+                } else if (zongfen > 500 && zongfen <= 600) {
+                    f++;
+                } else if (zongfen > 600 && zongfen <= 700) {
+                    g++;
+                } else if (zongfen > 700) {
+                    h++;
+                }
+            }
+            map.put("One", a);
+            map.put("Tow", b);
+            map.put("Thr", c);
+            map.put("For", d);
+            map.put("Fiv", e);
+            map.put("Six", f);
+            map.put("Sev", g);
+            map.put("Eig", h);
+            map.put("scoreId", scoreDataStudents.get(0).getScoreId());
+            //把最新数据放到最新缓存key中
+            RedisUtils.setCacheMap(CacheConstants.FEN_DUAN_NEW + scoreData.getScoreClassId(), map);
+            RedisUtils.setCacheObject(CacheConstants.SCORE_ID + scoreData.getScoreClassId(), scoreDataStudents.get(0).getScoreId());
+            if (flag) {
+                //放入对比数据
+                RedisUtils.setCacheMap(CacheConstants.FEN_DUAN_LAST + scoreData.getScoreClassId(), cacheMap);
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 后台首页成绩统计分段人数折线图
+     */
+    @Override
+    public Map<String, Object> indexZheXian(ScoreData scoreData) {
+        Map<String, Object> map = new HashMap<>(8);
+        //分段
+        List<String> x = new ArrayList<>();
+        x.add("One");
+        x.add("Tow");
+        x.add("Thr");
+        x.add("For");
+        x.add("Fiv");
+        x.add("Six");
+        x.add("Sev");
+        x.add("Eig");
+        //本次
+        List<Object> y1 = new ArrayList<>();
+        //上次
+        List<Object> y2 = new ArrayList<>();
+        Map<String, Object> cacheMapNew = RedisUtils.getCacheMap(CacheConstants.FEN_DUAN_NEW + scoreData.getScoreClassId());
+        Map<String, Object> cacheMapLast = RedisUtils.getCacheMap(CacheConstants.FEN_DUAN_LAST + scoreData.getScoreClassId());
+        if (cacheMapNew != null && cacheMapNew.size() > 0) {
+            for (String key : cacheMapNew.keySet()) {
+                if (!"scoreId".equals(key)) {
+                    y1.add(cacheMapNew.get(key));
+                    if (cacheMapLast.get(key) != null) {
+                        y2.add(cacheMapLast.get(key));
+                    } else {
+                        y2.add(0);
+                    }
+                }
+            }
+        } else {
+            for (int i = 0; i < 8; i++) {
+                y1.add(0);
+                y2.add(0);
+            }
+        }
+
+        map.put("x", x);
+        map.put("y1", y1);
+        map.put("y2", y2);
+        return map;
+    }
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/notice/IXiaoyuanNoticeService.java

@@ -26,6 +26,7 @@ public interface IXiaoyuanNoticeService {
      * 查询校园新闻列表
      */
     TableDataInfo<XiaoyuanNoticeVo> queryPageList(XiaoyuanNoticeBo bo, PageQuery pageQuery);
+    List<XiaoyuanNoticeVo> selectXiaoyuanNoticeMyList(XiaoyuanNoticeBo bo, PageQuery pageQuery);
 
     /**
      * 查询校园新闻列表

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/score/IScoreDataService.java

@@ -2,10 +2,13 @@ package org.dromara.system.service.score;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.score.ScoreData;
+import org.dromara.system.domain.score.ScoreDataStudent;
 import org.dromara.system.domain.score.bo.ScoreDataBo;
 import org.dromara.system.domain.score.vo.ScoreDataVo;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 成绩Service接口
@@ -44,4 +47,19 @@ public interface IScoreDataService {
      * 校验并批量删除成绩信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+    /**
+     * 后台首页成绩统计排名
+     */
+    public List<ScoreDataStudent> indexPaiMing(ScoreData scoreData);
+    /**
+     * 后台首页成绩统计分段人数饼图
+     */
+    public Map<String,Object> indexBingTu(ScoreData scoreData);
+
+    /**
+     * 后台首页成绩统计分段人数折线图
+     */
+    public Map<String,Object> indexZheXian(ScoreData scoreData);
 }

ruoyi-modules/ruoyi-system/src/main/resources/mapper/score/ScoreDataMfMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.system.mapper.score.ScoreDataMfMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/score/ScoreDataStudentMapper.xml

@@ -3,5 +3,21 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.system.mapper.score.ScoreDataStudentMapper">
-
+    <resultMap type="org.dromara.system.domain.score.vo.ScoreDataStudentVo" id="ScoreDataDetailsResult">
+    </resultMap>
+    <select id="selectScoreDataByScoreClassId" parameterType="string" resultMap="ScoreDataDetailsResult">
+        select
+            s.zongfen,s.score_id,s.avg,s.details_type
+        from
+            score_data_student s
+        WHERE
+                s.score_id = (
+                SELECT
+                    score_id
+                FROM
+                    score_data
+                WHERE
+                    score_class_id = #{scoreClassId} order by score_time DESC limit 1)
+        order by b.score_sort s.zongfen DESC
+    </select>
 </mapper>