 YuNan
|
97e16394c5
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2024-10-24 18:54:32 +08:00 |
 Cool
|
5b4f68a44b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-10-24 18:52:21 +08:00 |
|
Cool
|
2cdc51d420
|
调整线程池配置
|
2024-10-24 18:51:57 +08:00 |
|
Cool
|
978661eee2
|
调整连接池配置
|
2024-10-24 18:50:11 +08:00 |
|
YuNan
|
17f9faa9f8
|
Merge remote-tracking branch 'refs/remotes/upstream/dev' into dev
|
2024-10-24 18:34:08 +08:00 |
|
Cool
|
ba1c0d0b6c
|
四六级数据同步,修改了数据库字段，将学号从id改为code，现id为表内自增主键id
|
2024-10-24 18:33:47 +08:00 |
|
Cool
|
d13486422c
|
四六级数据同步（待优化）
|
2024-10-24 15:04:41 +08:00 |
|
Cool
|
0ef7780459
|
学生导入接口
|
2024-10-23 20:44:00 +08:00 |
|
Cool
|
97e8f30549
|
学生导入接口
|
2024-10-23 19:17:05 +08:00 |
|
YuNan
|
519a3dc0f8
|
Merge remote-tracking branch 'refs/remotes/upstream/dev' into dev
|
2024-10-23 18:51:49 +08:00 |
|
Cool
|
a329b820e4
|
优化表格接口
|
2024-10-23 18:51:00 +08:00 |
|
YuNan
|
cfa58a6363
|
Merge remote-tracking branch 'refs/remotes/upstream/dev' into dev
|
2024-10-23 18:23:06 +08:00 |
|
Cool
|
0ac14a9518
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java
|
2024-10-23 18:20:48 +08:00 |
|
YuNan
|
b0a8de4b3b
|
getRateByBatch接口修正
|
2024-10-23 18:18:35 +08:00 |
|
Cool
|
afa290ba7c
|
导入接口，导入表格接口
|
2024-10-23 18:10:05 +08:00 |
|
YuNan
|
faa6144677
|
Merge pull request '添加根据批次查询年级 专业维度' (#6) from YuNan/CET-cmd-2.0:dev into dev
Reviewed-on: #6
|
2024-10-17 19:18:25 +08:00 |
|
YuNan
|
161257c78b
|
添加根据批次查询年级 专业维度
|
2024-10-17 19:17:53 +08:00 |
|
Cool
|
d09c8e13d8
|
根据批次获得年级数据
|
2024-10-17 17:30:26 +08:00 |
|
Cool
|
73b1c89ecd
|
Merge pull request '添加按批次对比分析两个接口' (#5) from YuNan/CET-cmd-2.0:dev into dev
Reviewed-on: #5
|
2024-10-17 15:31:35 +08:00 |
|
YuNan
|
b1992d60e1
|
代码优化
|
2024-10-17 15:28:58 +08:00 |
|
YuNan
|
2a68bc53ee
|
代码优化
|
2024-10-17 15:22:34 +08:00 |
|
YuNan
|
14ad6463ff
|
解决冲突
|
2024-10-17 14:27:42 +08:00 |
|
YuNan
|
43b8e942ad
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/controller/CenterController.java
# jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java
# jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/text.java
|
2024-10-17 14:27:04 +08:00 |
|
YuNan
|
42c5fe68be
|
解决冲突
|
2024-10-17 14:19:00 +08:00 |
|
YuNan
|
9b86eec766
|
revert 2bec05f542
revert 添加按批次对比分析两个接口
|
2024-10-17 14:16:07 +08:00 |
|
YuNan
|
7fc7e8a602
|
Merge branch 'dev' of http://62.234.217.137:3000/Big-Data-Lab/CET-cmd-2.0 into dev
# Conflicts:
# jeecg-module-system/jeecg-system-start/src/test/java/org/jeecg/modules/text.java
|
2024-10-17 14:08:22 +08:00 |
|
YuNan
|
2bec05f542
|
添加按批次对比分析两个接口
|
2024-10-17 13:54:47 +08:00 |
|
Cool
|
a6aba82501
|
四六级学生数据导入导出接口
|
2024-10-16 18:12:53 +08:00 |
|
Cool
|
489efb0ae4
|
四六级数据导入接口以及文件模版下载接口
|
2024-10-11 20:22:54 +08:00 |
|
YuNan
|
633ca01ac8
|
Merge pull request '修改接口方法' (#2) from YuNan/CET-cmd-2.0:dev into dev
Reviewed-on: #2
|
2024-09-10 00:02:03 +08:00 |
|
YuNan
|
47a86a9000
|
修改接口方法
|
2024-09-10 00:00:30 +08:00 |
|
Cool
|
b524851402
|
Merge pull request '依据学生id和姓名获取四级成绩' (#1) from YuNan/CET-cmd-2.0:dev into dev
Reviewed-on: #1
|
2024-09-09 21:40:07 +08:00 |
|
YuNan
|
018b55434c
|
依据学生id和姓名获取四级成绩修改
|
2024-09-09 21:37:47 +08:00 |
|
YuNan
|
1a078ceddd
|
Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
# jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICet_4Service.java
# jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java
|
2024-09-09 21:21:23 +08:00 |
|
YuNan
|
ad3f4c73eb
|
依据学生id和姓名获取四级成绩
|
2024-09-09 21:06:08 +08:00 |
|
Cool
|
6d8a6208bf
|
清洗cet4数据库数据
|
2024-09-09 21:04:42 +08:00 |
|
Cool
|
ceac91707d
|
修改mysql和redis地址
|
2024-09-08 16:01:57 +08:00 |
|
Cool
|
40916c76d6
|
添加多学院对比查询缓存
|
2024-05-31 20:39:05 +08:00 |
|
Cool
|
6b390b6788
|
删除单批次查询缓存
|
2024-05-31 16:31:33 +08:00 |
 xbx
|
a562efe488
|
添加解释
|
2024-05-30 20:51:49 +08:00 |
|
xbx
|
a5dc424f29
|
删除批次查询缓存
|
2024-05-27 13:48:01 +08:00 |
|
xbx
|
4a25704e8f
|
数据进行缓存
|
2024-05-22 14:13:19 +08:00 |
|
xbx
|
78c1a6a44a
|
数据进行缓存
|
2024-05-20 12:22:26 +08:00 |
|
Cool
|
182f2913c6
|
mybatisplus日志更改
|
2024-04-26 16:25:34 +08:00 |
|
xbx
|
8eacfd52dc
|
优化对比多学院接口
|
2024-04-24 15:45:03 +08:00 |
|
xbx
|
2ee73def1c
|
优化对比多学院接口
|
2024-04-23 23:18:15 +08:00 |
|
Cool
|
9f24ffb871
|
学院对比查询待完善
|
2024-04-23 16:45:14 +08:00 |
|
xbx
|
7b45bb819a
|
优化根据专业查询接口
|
2024-04-23 08:42:31 +08:00 |
|
xbx
|
8483abbd0b
|
新增根据专业查询接口
|
2024-04-22 19:54:54 +08:00 |
|
xbx
|
324cb24be3
|
新增根据专业查询接口
|
2024-04-22 17:01:23 +08:00 |