joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity
1,010 Commits 12 Branches 10 Tags 54 MiB
4ef20d7d62
Commit Graph

966 Commits

Author SHA1 Message Date
Jade
980b0531d0 simulationJob 2021-05-11 15:17:48 +08:00
walker-sheng
4cb457ab16 Merge remote-tracking branch 'origin/test' into restruct-new 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/job/SimulationScheduledJob.java
 2021-05-11 15:06:42 +08:00
Jade
e41342f0ce simulationJob 2021-05-11 15:04:15 +08:00
walker-sheng
489733931d Merge remote-tracking branch 'origin/test' into restruct-new 2021-05-11 13:45:58 +08:00
Jade
ac98015ed9 simulationJob 2021-05-11 10:49:48 +08:00
walker-sheng
1a79319379 Merge remote-tracking branch 'origin/test' into restruct-new 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/Simulation.java
#	src/main/java/club/joylink/rtss/simulation/job/SimulationScheduledJob.java
 2021-05-11 09:56:40 +08:00
Jade
19bee0ab24 simulationJob 2021-05-11 09:53:21 +08:00
walker-sheng
b61a416da1 Merge remote-tracking branch 'origin/test' into restruct-new 2021-05-10 17:18:52 +08:00
joylink_zhangsai
730ab7cac9 发布地图数据检查与否由配置决定；获取地图数据接口添加检查配置数据 2021-05-10 17:11:13 +08:00
joylink_zhangsai
fb2f66f275 添加校验所有地图数据接口 2021-05-10 15:44:34 +08:00
walker-sheng
ef7c81fd51 仿真结构——抽象仿真设备对象状态变化监控（响应式/触发式） 
轨道交通仿真——实现仿真道岔、信号机、计轴和联锁道岔、信号机、区段设备状态变化通知监控逻辑
 2021-05-10 15:04:40 +08:00
joylink_zhangsai
a4b42d13d8 列车到站后先记录实际运行图信息；实迹运行图添加是否站前折返字段 2021-05-10 14:34:10 +08:00
joylink_zhangsai
f3115f7faf 大铁道岔单解添加联动 2021-05-08 16:31:53 +08:00
joylink_zhangsai
ed5f05a23a 大铁侧防锁闭添加条件<道岔未占用> 2021-05-08 16:26:51 +08:00
joylink_zhangsai
c7d5c38b73 大铁进路办理代码结构修改；大铁道岔转动、单/解锁联动；cilRepository.config赋值 2021-05-08 14:47:20 +08:00
joylink_zhangsai
f234e39935 添加联锁机重启操作（未测试）；修改大铁侧向列车排列不了bug；添加ATS故障（未测试） 2021-05-08 09:21:13 +08:00
joylink_zhangsai
79a26eb86c 场景录音用户查询bug修改 2021-05-06 17:04:15 +08:00
joylink_zhangsai
5284177cf2 场景语音识别错误信息记录修改 2021-05-06 16:12:54 +08:00
joylink_zhangsai
0763a46ced 大铁道岔联动转动 2021-05-06 15:52:38 +08:00
joylink_zhangsai
1660113cb3 <整个场景的语音校验接口>小改动 2021-05-06 15:02:14 +08:00
joylink_zhangsai
16c88d6357 场景语音录制相关接口实现 2021-05-06 13:50:17 +08:00
thesai
05b88e4a1c 重载语音识别方法 2021-05-05 21:43:42 +08:00
thesai
7b960c809e 大铁进路排列代码结构调整 2021-05-05 18:54:55 +08:00
joylink_zhangsai
0237c53000 场景语音录制 2021-04-30 18:29:07 +08:00
joylink_zhangsai
edf2973634 竞赛错误语音记录 2021-04-30 14:06:50 +08:00
joylink_zhangsai
732a856207 大铁引导办理增加检查 2021-04-30 13:04:01 +08:00
joylink_zhangsai
687ada1133 竞赛场景恢复 2021-04-29 18:59:35 +08:00
joylink_zhangsai
5db771b765 大铁排列进路区段提前锁闭问题修改 2021-04-29 18:47:49 +08:00
joylink_zhangsai
de20ed1f5b 大铁操作bug修改 2021-04-29 18:18:48 +08:00
joylink_zhangsai
7cd4eaac15 大铁进路逻辑修改；剧本车次识别增加内容 2021-04-29 17:31:44 +08:00
joylink_zhangsai
e966d6360c 竞赛场景暂时走小程序逻辑、操作类动作直接完成（为了测试） 2021-04-29 16:46:02 +08:00
joylink_zhangsai
38ce09edf8 竞赛场景暂时走小程序逻辑、非会话动作直接完成（为了测试） 2021-04-29 16:36:47 +08:00
joylink_zhangsai
b34a77df10 数据构建bug修改 2021-04-29 15:57:57 +08:00
joylink_zhangsai
d5b588d21a Merge remote-tracking branch 'origin/test' into test 2021-04-29 15:47:47 +08:00
joylink_zhangsai
f9aa41c5bd 语音识别结果修正内容增加 2021-04-29 15:47:34 +08:00
walker-sheng
e17503d902 Merge remote-tracking branch 'origin/test' into test 2021-04-29 15:30:11 +08:00
walker-sheng
9089cd122e 轨道交通仿真——commonRepository的轨道路径构建修改 2021-04-29 15:29:57 +08:00
joylink_zhangsai
3f45fc1c8f 语音训练功能添加结果修正；大铁仿真bug修改；添加大铁项目登录 2021-04-29 13:30:45 +08:00
walker-sheng
7abffd511e Merge remote-tracking branch 'origin/test' into test 2021-04-29 10:47:20 +08:00
walker-sheng
d1ff82aaf0 仿真结构——仿真、仿真成员、仿真用户vo信息通用获取接口及流程抽象实现 2021-04-29 10:47:02 +08:00
joylink_zhangsai
bd80a423c1 语音识别服务修改 2021-04-29 09:21:29 +08:00
joylink_zhangsai
604bfd0d20 大铁引导bug修改 2021-04-28 18:49:57 +08:00
joylink_zhangsai
5604630845 道岔初始化bug修改；接近锁闭判断条件修改； 2021-04-28 18:12:00 +08:00
walker-sheng
ecdd948079 Merge remote-tracking branch 'origin/test' into test 2021-04-28 17:29:02 +08:00
walker-sheng
66dcf3541c 大铁线路信号机接近区段数据构建 2021-04-28 17:28:47 +08:00
joylink_zhangsai
6c80e68b75 取消列车进入进路逻辑判断；引导信号颜色修改；进路初始化逻辑添加 2021-04-28 17:26:08 +08:00
joylink_zhangsai
88ec13709f Merge remote-tracking branch 'origin/test' into test 2021-04-28 15:40:34 +08:00
joylink_zhangsai
1505ff4604 大铁引导总锁和通过进路操作 2021-04-28 15:40:20 +08:00
walker-sheng
035f9fffdf 大铁线路进路数据构建bug修改，添加删除时更新敌对关系逻辑 2021-04-28 14:51:26 +08:00
walker-sheng
d9226d47b6 轨道交通仿真——srSignal状态初始化修改 2021-04-28 10:44:44 +08:00
walker-sheng
6b69b956b6 Merge remote-tracking branch 'origin/test' into test 2021-04-28 10:34:35 +08:00
walker-sheng
f26d4516e6 轨道交通仿真——仿真设备添加状态初始化 2021-04-28 10:34:15 +08:00
joylink_zhangsai
6d40a8c5d9 Merge remote-tracking branch 'origin/test' into test 2021-04-28 09:29:00 +08:00
joylink_zhangsai
c231bc5ead 大铁仿真操作实现中 2021-04-28 09:28:49 +08:00
walker-sheng
bd3b7b8087 轨道交通仿真——仿真设备添加状态初始化 2021-04-27 18:42:37 +08:00
walker-sheng
63fdbbfcaf 轨道交通仿真——处理报错 2021-04-27 17:11:31 +08:00
walker-sheng
04d42aff4f Merge remote-tracking branch 'origin/test' into test 
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/rt/CIL/bo/CilSignal.java
 2021-04-27 17:10:29 +08:00
walker-sheng
4e553f67bd 轨道交通仿真——添加信号机故障注入、移除逻辑，信号机基础属性添加是否调车信号机字段 2021-04-27 17:09:40 +08:00
joylink_zhangsai
d2c9e3436a Merge remote-tracking branch 'origin/test' into test 2021-04-27 09:19:53 +08:00
joylink_zhangsai
9df81aecf4 大铁仿真操作实现中 2021-04-27 09:19:39 +08:00
walker-sheng
b894b414df 轨道交通仿真——添加计轴故障注入、移除逻辑完善 2021-04-26 18:39:24 +08:00
walker-sheng
bad2536d3f 仿真结构——添加仿真时间消息同步，仿真故障注入、移除通用接口和事件机制 
轨道交通仿真——添加道岔故障注入、移除逻辑
 2021-04-26 17:09:35 +08:00
joylink_zhangsai
48bc9bd59d 删除道岔、区段、信号机的Cil类中本应属于Common类的字段 2021-04-26 13:54:39 +08:00
joylink_zhangsai
1590a7cbcc 大铁仿真操作实现中 2021-04-26 13:25:46 +08:00
walker-sheng
71b5dcbf59 Merge remote-tracking branch 'origin/test' into test 2021-04-25 17:53:25 +08:00
walker-sheng
b0946a9baf 轨道交通仿真——通用数据repo构建 2021-04-25 17:53:06 +08:00
joylink_zhangsai
0331485a8b Merge remote-tracking branch 'origin/test' into test 2021-04-23 18:14:14 +08:00
joylink_zhangsai
71245dd6a2 新版仿真操作实现中 2021-04-23 18:13:47 +08:00
walker-sheng
d6c5cfaecf 消息推送——ATS消息构建调整 2021-04-23 18:12:20 +08:00
walker-sheng
a261c9e3e9 Merge remote-tracking branch 'origin/test' into test 2021-04-23 15:23:34 +08:00
walker-sheng
34f3c7a94b 消息推送——ATS构建下一发送消息问题修改 2021-04-23 15:23:08 +08:00
joylink_zhangsai
0e3ab8cac8 新版仿真进路与取消进路实现；子系统更新接口修改 2021-04-23 15:20:39 +08:00
walker-sheng
0f64c9b2c3 仿真公共接口添加初始化接口 2021-04-23 14:38:36 +08:00
walker-sheng
8912639885 仿真设备状态消息推送流程抽象 
轨道交通仿真——实现ATS消息推送流程
 2021-04-23 14:18:53 +08:00
walker-sheng
55300ffa1e 大铁通过多进路创建bug修改 2021-04-23 10:53:17 +08:00
joylink_zhangsai
a1a65a216a ats道岔消息构建添加更多字段 2021-04-22 17:50:13 +08:00
joylink_zhangsai
e15ed2db11 新版仿真ws消息推送实现 2021-04-22 16:04:28 +08:00
walker-sheng
303760220a 轨道交通仿真——创建过程添加初始化仿真成员和创建者扮演成员，调通操作调用 2021-04-22 14:40:20 +08:00
joylink_zhangsai
89d8c4b198 仿真创建时构建数据逻辑修改；地图子系统编辑添加对newApi的修改功能；添加生成单个子系统的接口（未测试） 2021-04-22 11:18:14 +08:00
joylink_zhangsai
828c618db7 Merge remote-tracking branch 'origin/test' into test 2021-04-22 11:05:53 +08:00
walker-sheng
a3b9a6c81f 轨道交通仿真——添加道岔转动三个操作 2021-04-22 11:01:09 +08:00
joylink_zhangsai
c23da105a0 新版仿真，添加创建仿真和获取仿真信息接口（构建数据的逻辑先去掉了，因为大铁线路数据不完整）；仿真消息发送功能实现中 2021-04-22 10:51:38 +08:00
walker-sheng
e7db868c99 轨道交通仿真仓库构建修改 2021-04-22 10:27:50 +08:00
walker-sheng
7b6cb60ba3 地图检查配置字段导入导出添加 2021-04-22 09:06:08 +08:00
walker-sheng
79cc4b43b4 地图绘制添加检查配置和发布时是否检查逻辑 
地图数据添加相关配置字段
 2021-04-21 16:02:10 +08:00
walker-sheng
78459f3a1b 大铁进路生成逻辑bug修改 
地图绘制添加检查配置
 2021-04-21 14:56:32 +08:00
walker-sheng
e4cbf34b01 大铁进路生成逻辑bug修改 2021-04-21 09:47:25 +08:00
walker-sheng
d9ed6eea4e Merge remote-tracking branch 'origin/test' into test 2021-04-19 17:24:56 +08:00
walker-sheng
a81d9f1677 新仿真通用对象构建添加侧防 
大铁进路生成添加敌对进路关系构建和重复code检查逻辑
 2021-04-19 17:24:35 +08:00
joylink_zhangsai
57deb846f1 信号按钮添加字段 2021-04-19 16:35:50 +08:00
walker-sheng
1d2157db49 Merge remote-tracking branch 'origin/test' into test 2021-04-19 16:02:04 +08:00
walker-sheng
13b6581f09 新仿真通用对象构建添加进路、延续保护进路 2021-04-19 16:01:46 +08:00
joylink_zhangsai
d50157321a 信号机类型添加调车信号机 2021-04-19 13:49:35 +08:00
joylink_zhangsai
cd521791fc Merge remote-tracking branch 'origin/test' into test 2021-04-16 18:31:06 +08:00
joylink_zhangsai
f9d95dba62 新版仿真进路办理及道岔转动逻辑初步实现 2021-04-16 18:30:54 +08:00
walker-sheng
dbd2d0f22e 添加仿真通用对象构建 
大铁进路创建接口和生成逻辑开发
地图数据检查重新实现（未完成）
 2021-04-16 18:12:28 +08:00
DU
b0ecb17cf2 导入地图数据修改 2021-04-16 11:05:04 +08:00
joylink_zhangsai
8f0199b6a3 Merge remote-tracking branch 'origin/test' into test 2021-04-13 18:31:09 +08:00
joylink_zhangsai
a0d99564e4 地图数据添加信号按钮 2021-04-13 18:30:59 +08:00
DU
c540da932a 删除测试代码 2021-04-13 17:06:06 +08:00
DU
011ffd5ccf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2021-04-13 16:59:55 +08:00
DU
4220a2881d 测试语音 2021-04-13 16:59:46 +08:00
joylink_zhangsai
f90726cacf 扫码登录也根据登录项目设置组织信息 2021-04-13 16:08:44 +08:00
DU
ce39d404b1 地图分组导入bug修改 2021-04-13 15:37:01 +08:00
DU
485f37d06c 华为语音jar引入 2021-04-13 10:03:24 +08:00
DU
3bd9cb71a7 地图组管理修改 2021-04-13 10:00:29 +08:00
DU
997773136f 先删除华为语音相关 2021-04-12 19:01:57 +08:00
joylink_zhangsai
87aab8ab15 Merge remote-tracking branch 'origin/test' into test 2021-04-12 18:49:42 +08:00
DU
cc8d28295c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test 2021-04-12 18:48:50 +08:00
joylink_zhangsai
a46c3c9805 目的地码构建代码调整 2021-04-12 18:48:49 +08:00
DU
250de1dc73 地图数据归类，huawei语音调试 2021-04-12 18:48:41 +08:00
joylink_zhangsai
7b426cbf45 目的地码数据构建bug修改 2021-04-12 17:36:38 +08:00
joylink_zhangsai
783db4fa0f 目的地码数据构建速度优化 2021-04-12 16:09:07 +08:00
walker-sheng
b03c41705e 包调整 2021-04-12 11:36:36 +08:00
walker-sheng
986fc71d60 包调整 2021-04-12 11:35:21 +08:00
walker-sheng
7f0a9284fe Merge remote-tracking branch 'origin/test' into test 2021-04-12 11:31:58 +08:00
walker-sheng
6d7ff4b6fd 修改包名 2021-04-12 11:31:41 +08:00
joylink_zhangsai
c4de48a386 华为语音识别回滚 2021-04-12 11:21:29 +08:00
DU
776955fbdb 华为语音包依赖 2021-04-12 11:17:26 +08:00
DU
d7cadb46b7 语音识别修改 2021-04-12 11:14:38 +08:00
joylink_zhangsai
d681f9c29a 华为语音识别回滚 2021-04-12 11:11:29 +08:00
DU
83d7238b11 Merge remote-tracking branch 'origin/test' into test1 2021-04-12 11:04:31 +08:00
DU
80349d14c0 Revert "Revert "删除表sql"" 
语音识别改用百度接口
 2021-04-12 11:02:42 +08:00
walker-sheng
1582188a39 Merge remote-tracking branch 'origin/test' into test 2021-04-12 11:01:48 +08:00
walker-sheng
de1858889a 交路生成过滤掉少于两个站台轨的交路的构建 2021-04-12 11:01:30 +08:00
joylink_zhangsai
08f06554bb 仿真权限校验逻辑修改 2021-04-12 10:57:07 +08:00
joylink_zhangsai
cc0a01aebb Revert "Revert "改用华为语音识别服务"" 
This reverts commit bec904c7
 2021-04-12 10:11:10 +08:00
joylink_zhangsai
249c8c1eb7 Merge remote-tracking branch 'origin/test' into test 2021-04-09 18:24:48 +08:00
joylink_zhangsai
5485c27c3b 泰雷兹操作调试 2021-04-09 18:24:39 +08:00
walker-sheng
f8f4352008 新仿真逻辑开发 2021-04-09 18:23:34 +08:00
DU
b5e3e5d2e5 宁波三导入修改 2021-04-09 11:05:09 +08:00
DU
bf109450e5 运行图校验修改 宁波三导入备车变更车次回库外加一个服务车次 2021-04-09 10:23:00 +08:00
DU
6aee4ce7e9 运行图中间出库调整 2021-04-08 16:39:44 +08:00
DU
34b5be2c29 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-04-07 18:27:27 +08:00
DU
f242c3ca26 运行图出库首站/入库末站在环路上，校验增加出入库，编辑操作去掉出入库设置 2021-04-07 18:27:19 +08:00
joylink_zhangsai
6e06be24fe Merge remote-tracking branch 'origin/test' into test 2021-04-07 17:59:31 +08:00
joylink_zhangsai
2a28c4f48e 转换轨列车不发车bug修改 2021-04-07 17:58:54 +08:00
DU
d0e68bf84e 校验修改 2021-04-06 19:40:38 +08:00
DU
c9c491848b 校验修改 2021-04-06 19:18:32 +08:00
DU
d81ec9f650 修改运行图校验 2021-04-06 18:46:56 +08:00
DU
34e1388120 运行图生成 2021-04-06 18:16:32 +08:00
DU
3cc7c1c548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-04-06 18:14:32 +08:00
DU
1fa4451a2d 运行图校验 2021-04-06 18:14:20 +08:00
joylink_zhangsai
2bad6177d1 Merge remote-tracking branch 'origin/test' into test 2021-04-06 13:38:21 +08:00
joylink_zhangsai
59891464a1 更新地图版本时不再生成默认交路 2021-04-06 13:38:06 +08:00
walker-sheng
9f2d67de6a Merge remote-tracking branch 'origin/test' into test 2021-04-02 19:41:48 +08:00
walker-sheng
6798b74964 侧防锁闭逻辑bug修改 
新仿真逻辑——CI功能开发
 2021-04-02 19:41:34 +08:00
joylink_zhangsai
8d3cfc90ba 移动授权计算bug修改 2021-04-02 18:54:47 +08:00
joylink_zhangsai
28f992fb7c Merge remote-tracking branch 'origin/test' into test 2021-04-02 18:07:17 +08:00
joylink_zhangsai
9ef0bb210d 屏蔽门关门后，如果线路选择了自动调整运行，延时6秒发车 2021-04-02 18:07:04 +08:00
walker-sheng
a166f3e4be 侧防锁闭逻辑问题修改 2021-04-02 17:07:03 +08:00
walker-sheng
5965385be5 联锁进路信号机级别、重复封锁、开放进路后联锁条件检查等流程修改 2021-04-02 16:23:12 +08:00
joylink_zhangsai
2f0e64a231 Merge remote-tracking branch 'origin/test' into test 2021-04-02 16:19:41 +08:00
joylink_zhangsai
04a49c1f2d 补充真实设备的故障状态重置 2021-04-02 16:19:32 +08:00
walker-sheng
6c247db987 三维课程数据接口bug修改 2021-04-02 15:34:56 +08:00
walker-sheng
085383bb5f 三维课程数据接口bug修改 2021-04-02 15:32:19 +08:00
joylink_zhangsai
4f6e140a31 Merge remote-tracking branch 'origin/test' into test 2021-04-02 14:22:38 +08:00
joylink_zhangsai
277eb6e244 移动授权计算逻辑修改 2021-04-02 14:22:19 +08:00
walker-sheng
a3465dc020 新仿真逻辑——CI联锁系统逻辑开发 2021-04-02 11:22:40 +08:00
walker-sheng
7027712908 添加信号机新字段存储对象逻辑 2021-04-02 11:21:14 +08:00
walker-sheng
d90288429d Merge remote-tracking branch 'origin/test' into test 2021-04-02 11:18:03 +08:00
walker-sheng
3fbe678a5d 进路侧防逻辑调整，添加侧防为信号机时，禁止信号机进路办理逻辑 2021-04-02 11:17:41 +08:00
joylink_zhangsai
47d5ad0bb0 修改因组织和项目改为一对多关系导致的bug 2021-04-02 10:51:49 +08:00
joylink_zhangsai
707d23e2cc 修改接口地址 2021-04-02 09:06:18 +08:00
joylink_zhangsai
376c4c6a54 Merge remote-tracking branch 'origin/test' into test 2021-04-02 08:53:35 +08:00
joylink_zhangsai
733c06b191 用户表添加org_id，导入的学生与组织永远关联；组织和项目改为一对多 2021-04-01 16:30:01 +08:00
walker-sheng
1278ab42e1 Merge remote-tracking branch 'origin/test' into test 2021-03-31 18:07:19 +08:00
walker-sheng
d52faf40e7 开发三维课程数据增删改查接口 2021-03-31 18:06:59 +08:00
joylink_zhangsai
14d168b88f 添加管理员查询组织树接口 2021-03-31 15:32:27 +08:00
walker-sheng
0e2d9e339a Merge remote-tracking branch 'origin/test' into test 2021-03-31 14:23:06 +08:00
walker-sheng
9c62b15593 新仿真逻辑——CI联锁系统逻辑开发 2021-03-31 14:22:43 +08:00
joylink_zhangsai
d1c27dc910 打开的屏蔽门ma计算bug修改 2021-03-31 09:53:38 +08:00
joylink_zhangsai
ad506486c0 教学管理考试查询bug修改 2021-03-30 18:27:44 +08:00
joylink_zhangsai
06f9914f1a 修改课程查询接口 2021-03-30 15:24:35 +08:00
joylink_zhangsai
4793a5a21a 查询排课报错 2021-03-30 15:10:58 +08:00
joylink_zhangsai
740cded8d8 修改教学管理功能及bug 2021-03-30 14:39:03 +08:00
joylink_zhangsai
13afe241fa 课程和考试的重名检测不过滤下架的数据 2021-03-30 13:22:54 +08:00
joylink_zhangsai
fccd063da8 Merge remote-tracking branch 'origin/test' into test 2021-03-30 13:05:39 +08:00
joylink_zhangsai
0333bb4a2d 评价规则bug修改 2021-03-30 13:05:25 +08:00
DU
e757d5c50e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-30 09:38:39 +08:00
DU
40e5ea3af8 默认运行等级 变成70~50km/h 2021-03-30 09:38:31 +08:00
walker-sheng
e7099f59af Merge remote-tracking branch 'origin/test' into test 2021-03-29 18:30:19 +08:00
walker-sheng
a6485ca3e8 新仿真对象逻辑调整 
新仿真逻辑——CI联锁系统逻辑开发
 2021-03-29 18:30:08 +08:00
joylink_zhangsai
2b0cb91e55 小bug修改 2021-03-29 18:25:57 +08:00
joylink_zhangsai
a658bd7312 课程名修改添加同名校验；评价规则应用到sql修改 2021-03-29 18:19:23 +08:00
joylink_zhangsai
ad71bfb0df 修改教学管理课程删除后创建同名课程依然报错bug；修改创建试卷报错bug 2021-03-29 17:14:17 +08:00
joylink_zhangsai
038f3b3ecd 拷贝地图功能中，拷贝考试逻辑修改 2021-03-29 16:25:56 +08:00
joylink_zhangsai
d3c9626947 修改<将评价规则应用到><查询评价规则能应用到>接口bug 2021-03-29 15:53:55 +08:00
joylink_zhangsai
0ac681ed53 考试不和课程关联 2021-03-29 15:04:13 +08:00
joylink_zhangsai
1fa81de61f Merge remote-tracking branch 'origin/test' into test 2021-03-26 18:43:04 +08:00
joylink_zhangsai
de57624817 考试改为不和课程关联 2021-03-26 18:42:52 +08:00
DU
1a4351a084 回库修改 2021-03-26 17:20:53 +08:00
joylink_zhangsai
d6fe4e75fb Merge remote-tracking branch 'origin/temp' into test 2021-03-26 17:13:40 +08:00
walker-sheng
40956d2c52 Merge remote-tracking branch 'origin/test' into test 2021-03-26 17:08:39 +08:00
joylink_zhangsai
5167575dde 暂时提交 2021-03-26 17:08:06 +08:00
DU
9752b2b21f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/rtss-server into test1 2021-03-26 16:44:29 +08:00
DU
d1b8fcea3d 删除文件 2021-03-26 16:44:21 +08:00
DU
72a6546297 生成bug修改 2021-03-26 16:43:18 +08:00
joylink_zhangsai
4801d11b3b 教学管理bug修改 2021-03-25 20:42:19 +08:00
joylink_zhangsai
4e478b95a2 教学管理功能修改 2021-03-25 19:46:34 +08:00