提交代码

This commit is contained in:
zlwu committed 2025-09-09 15:42:51 +08:00
1 parent 1c84ddaa14
commit b3de960892
12 files changed
+507 -117

No files matched your search

@@ -151,6 +151,19 @@ public class XskhDisciplineRecordController extends BaseController {
@RequestParam String disciplineTypeIds,
@RequestParam String startTime,
@RequestParam String endTime) {
return R.ok(xskhDisciplineRecordService.getStudentDisciplineRecords(studentId, disciplineTypeIds, startTime, endTime));
return R.ok(xskhDisciplineRecordService.getStudentDisciplineRecords(studentId, disciplineTypeIds, startTime,
endTime));
}
/**
* 获取指定违纪类型在指定时间范围内所有学生的最高总扣分
*/
@SaCheckPermission("disciplineRecord:disciplineRecord:query")
@GetMapping("/getMaxScoreByTypeAndPeriod/{typeId}")
public R<java.math.BigDecimal> getMaxScoreByTypeAndPeriod(
@NotNull(message = "违纪类型ID不能为空") @PathVariable Long typeId,
@RequestParam String startTime,
@RequestParam String endTime) {
return R.ok(xskhDisciplineRecordService.getMaxScoreByTypeAndPeriod(typeId, startTime, endTime));
}
}
@@ -143,4 +143,16 @@ public class XskhRewardRecordController extends BaseController {
@RequestParam String endTime) {
return R.ok(xskhRewardRecordService.getStudentRewardRecords(studentId, rewardTypeIds, startTime, endTime));
}
/**
* 获取指定奖励类型在指定时间范围内所有学生的最高总加分
*/
@SaCheckPermission("rewardRecord:rewardRecord:query")
@GetMapping("/getMaxScoreByTypeAndPeriod/{typeId}")
public R<java.math.BigDecimal> getMaxScoreByTypeAndPeriod(
@NotNull(message = "奖励类型ID不能为空") @PathVariable Long typeId,
@RequestParam String startTime,
@RequestParam String endTime) {
return R.ok(xskhRewardRecordService.getMaxScoreByTypeAndPeriod(typeId, startTime, endTime));
}
}
@@ -69,4 +69,16 @@ public interface XskhDisciplineRecordMapper extends BaseMapperPlus<XskhDisciplin
*/
int deleteHygieneCheckViolationByDisciplineRecordId(@Param("disciplineRecordId") Long disciplineRecordId);
/**
* 获取指定违纪类型在指定时间范围内所有学生的最高总扣分
*
* @param typeId 违纪类型ID
* @param startTime 开始时间
* @param endTime 结束时间
* @return 最高总扣分
*/
java.math.BigDecimal selectMaxScoreByTypeAndPeriod(@Param("typeId") Long typeId,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
}
@@ -51,4 +51,16 @@ public interface XskhRewardRecordMapper extends BaseMapperPlus<XskhRewardRecord,
@Param("rewardTypeIds") List<Long> rewardTypeIds,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
/**
* 获取指定奖励类型在指定时间范围内所有学生的最高总加分
*
* @param typeId 奖励类型ID
* @param startTime 开始时间
* @param endTime 结束时间
* @return 最高总加分
*/
java.math.BigDecimal selectMaxScoreByTypeAndPeriod(@Param("typeId") Long typeId,
@Param("startTime") String startTime,
@Param("endTime") String endTime);
}
@@ -91,4 +91,14 @@ public interface IXskhDisciplineRecordService {
*/
List<XskhDisciplineRecordVo> getStudentDisciplineRecords(Long studentId, String disciplineTypeIds, String startTime,
String endTime);
/**
* 获取指定违纪类型在指定时间范围内所有学生的最高总扣分
*
* @param typeId 违纪类型ID
* @param startTime 开始时间
* @param endTime 结束时间
* @return 最高总扣分
*/
java.math.BigDecimal getMaxScoreByTypeAndPeriod(Long typeId, String startTime, String endTime);
}
@@ -104,4 +104,14 @@ public interface IXskhRewardRecordService {
*/
List<XskhRewardRecordVo> getStudentRewardRecords(Long studentId, String rewardTypeIds, String startTime,
String endTime);
/**
* 获取指定奖励类型在指定时间范围内所有学生的最高总加分
*
* @param typeId 奖励类型ID
* @param startTime 开始时间
* @param endTime 结束时间
* @return 最高总加分
*/
java.math.BigDecimal getMaxScoreByTypeAndPeriod(Long typeId, String startTime, String endTime);
}
@@ -267,4 +267,23 @@ public class XskhDisciplineRecordServiceImpl implements IXskhDisciplineRecordSer
return baseMapper.selectStudentDisciplineRecords(studentId, typeIds, startTime, endTime);
}
/**
* 获取指定违纪类型在指定时间范围内所有学生的最高总扣分
*/
@Override
public java.math.BigDecimal getMaxScoreByTypeAndPeriod(Long typeId, String startTime, String endTime) {
log.info("获取违纪类型 {} 在时间范围 {} - {} 内的最高总扣分", typeId, startTime, endTime);
java.math.BigDecimal maxScore = baseMapper.selectMaxScoreByTypeAndPeriod(typeId, startTime, endTime);
// 如果查询结果为null,返回0
if (maxScore == null) {
log.info("违纪类型 {} 在指定时间范围内无数据,返回0", typeId);
return java.math.BigDecimal.ZERO;
}
log.info("违纪类型 {} 的最高总扣分为: {}", typeId, maxScore);
return maxScore;
}
}
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Arrays;
import java.util.stream.Collectors;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
/**
* 学生奖励记录Service业务层处理
@@ -31,6 +32,7 @@ import java.util.Map;
* @author ruoyi
* @date 2025-01-03
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class XskhRewardRecordServiceImpl implements IXskhRewardRecordService {
@@ -249,4 +251,23 @@ public class XskhRewardRecordServiceImpl implements IXskhRewardRecordService {
return baseMapper.selectStudentRewardRecords(studentId, typeIds, startTime, endTime);
}
/**
* 获取指定奖励类型在指定时间范围内所有学生的最高总加分
*/
@Override
public java.math.BigDecimal getMaxScoreByTypeAndPeriod(Long typeId, String startTime, String endTime) {
log.info("获取奖励类型 {} 在时间范围 {} - {} 内的最高总加分", typeId, startTime, endTime);
java.math.BigDecimal maxScore = baseMapper.selectMaxScoreByTypeAndPeriod(typeId, startTime, endTime);
// 如果查询结果为null,返回0
if (maxScore == null) {
log.info("奖励类型 {} 在指定时间范围内无数据,返回0", typeId);
return java.math.BigDecimal.ZERO;
}
log.info("奖励类型 {} 的最高总加分为: {}", typeId, maxScore);
return maxScore;
}
}
@@ -134,4 +134,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and deleted = 0
</update>
<!-- 获取指定违纪类型在指定时间范围内所有学生的最高总扣分 -->
<select id="selectMaxScoreByTypeAndPeriod" resultType="java.math.BigDecimal">
<![CDATA[
SELECT MAX(student_total_score) as max_score
FROM (
SELECT student_id, SUM(score_deduction) as student_total_score
FROM xskh_discipline_record
WHERE discipline_type_id = #{typeId}
AND discipline_date >= #{startTime}
AND discipline_date <= #{endTime}
AND status = '1'
AND deleted = 0
GROUP BY student_id
) student_scores
]]>
</select>
</mapper>
@@ -151,4 +151,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by create_time desc
</select>
<!-- 获取指定奖励类型在指定时间范围内所有学生的最高总加分 -->
<select id="selectMaxScoreByTypeAndPeriod" resultType="java.math.BigDecimal">
<![CDATA[
SELECT MAX(student_total_score) as max_score
FROM (
SELECT student_id, SUM(score_addition) as student_total_score
FROM xskh_reward_record
WHERE reward_type_id = #{typeId}
AND reward_date >= #{startTime}
AND reward_date <= #{endTime}
AND status = '1'
AND deleted = 0
GROUP BY student_id
) student_scores
]]>
</select>
</mapper>