liujie
2025-11-19 1a4b8b087f2fb5012b0a6cd69e836336098b4dd3
update
13个文件已修改
32 ■■■■■ 已修改文件
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyListenDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyPairDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyListenVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/SubjectVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyListen.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyPair.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyListenDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyListenVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/SubjectVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyListenDTO.java
@@ -16,6 +16,9 @@
    @ApiModelProperty("排序")
    private Integer studySort;
    @ApiModelProperty("排序ids 逗号隔开 和题目一一对应")
    private String sort;
    @ApiModelProperty("类型1常规 2示例 ")
    private Integer type;
}
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyPairDTO.java
@@ -15,6 +15,8 @@
    private Integer isVip;
    @ApiModelProperty("排序")
    private Integer studySort;
    @ApiModelProperty("排序ids 逗号隔开 和题目一一对应")
    private String sort;
}
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyListenVO.java
@@ -20,4 +20,6 @@
    @ApiModelProperty(value = "题型 1常规 2示例")
    private Integer type;
    @ApiModelProperty(value = "排序 逗号隔开 与题组名称位置对应")
    private String sort;
}
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java
@@ -17,4 +17,6 @@
    private Integer isVip;
    @ApiModelProperty(value = "id")
    private Integer id;
    @ApiModelProperty(value = "排序 逗号隔开 与题组名称位置对应")
    private String sort;
}
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/SubjectVO.java
@@ -19,4 +19,6 @@
    private Integer state;
    @ApiModelProperty(value = "所属分类名称")
    private String categoryName;
    @ApiModelProperty(value = "图片")
    private String img;
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -450,6 +450,7 @@
                tStudyListen.setRate(dto.getListenRate());
                tStudyListen.setStudySort(studyListenDTO.getStudySort());
                tStudyListen.setType(studyListenDTO.getType());
                tStudyListen.setSort(studyListenDTO.getSort());
                studyListenService.save(tStudyListen);
            }
            List<Integer> ids1 = studyLookService.lambdaQuery().eq(TStudyLook::getId, one.getId())
@@ -560,6 +561,7 @@
                tStudyPair.setRate(dto.getPairRate());
                tStudyPair.setIsVip(studyPairDTO.getIsVip());
                tStudyPair.setStudySort(studyPairDTO.getStudySort());
                tStudyPair.setSort(studyPairDTO.getSort());
                studyPairService.save(tStudyPair);
            }
        }
@@ -782,6 +784,7 @@
                studyListenVO.setIsVip(tStudyListen.getIsVip());
                studyListenVO.setId(tStudyListen.getId());
                studyListenVO.setType(tStudyListen.getType());
                studyListenVO.setSort(tStudyListen.getSort());
                listenVOS.add(studyListenVO);
            }
            res.setListenRate(tStudyListen.getRate());
@@ -925,6 +928,7 @@
                studyPairVO.setSubject(tStudyPair.getSubject());
                studyPairVO.setIsVip(tStudyPair.getIsVip());
                studyPairVO.setId(tStudyPair.getId());
                studyPairVO.setSort(tStudyPair.getSort());
                pairVOS.add(studyPairVO);
            }
            res.setPairRate(tStudyPair.getRate());
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyListen.java
@@ -65,4 +65,7 @@
    @ApiModelProperty("1常规 2示例")
    private Integer type;
    @ApiModelProperty("框架记忆排序 多个逗号隔开和故事ids一一对应")
    private String sort;
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyPair.java
@@ -60,4 +60,6 @@
    private String rate;
    @ApiModelProperty("排序")
    private Integer studySort;
    @ApiModelProperty("框架记忆排序 多个逗号隔开和故事ids一一对应")
    private String sort;
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyListenDTO.java
@@ -15,7 +15,8 @@
    private Integer isVip;
    @ApiModelProperty("排序")
    private Integer studySort;
    @ApiModelProperty("排序ids 逗号隔开 和题目一一对应")
    private String sort;
    @ApiModelProperty("类型1常规 2示例")
    private Integer type;
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java
@@ -15,6 +15,8 @@
    private Integer isVip;
    @ApiModelProperty("排序")
    private Integer studySort;
    @ApiModelProperty("排序ids 逗号隔开 和题目一一对应")
    private String sort;
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyListenVO.java
@@ -22,5 +22,8 @@
    @ApiModelProperty(value = "题型 1常规 2示例")
    private Integer type;
    @ApiModelProperty(value = "排序 逗号隔开 与题组名称位置对应")
    private String sort;
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairVO.java
@@ -17,4 +17,6 @@
    private Integer isVip;
    @ApiModelProperty(value = "id")
    private Integer id;
    @ApiModelProperty(value = "排序 逗号隔开 与题组名称位置对应")
    private String sort;
}
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/SubjectVO.java
@@ -23,4 +23,6 @@
    private Integer secondCategory;
    @ApiModelProperty(value = "所属分类名称")
    private String categoryName;
    @ApiModelProperty(value = "图片")
    private String img;
}