Commit Graph

365 Commits

Author SHA1 Message Date
wans
9992824733 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 21:25:00 +08:00
ly19960718
1c289fd8aa 报名增加修改报名机构接口 2021-05-15 21:24:37 +08:00
ly19960718
b08e87d628 Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 21:16:15 +08:00
ly19960718
fd7405fbc2 报名增加修改报名机构接口 2021-05-15 21:16:01 +08:00
wans
ffce59930c 添加合并列表页 2021-05-15 20:47:15 +08:00
cuibaocheng
6c6e7f001a 修改考场分配页面 2021-05-15 20:37:28 +08:00
cuibaocheng
b5cd931c58 Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 20:24:19 +08:00
cuibaocheng
b37b3d4717 修改考场分配页面 2021-05-15 20:24:03 +08:00
ly19960718
acc8efd2ec Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 20:23:30 +08:00
ly19960718
7f6ba953ab 自定义人 2021-05-15 20:23:24 +08:00
Renpc-kilig
b4d1b0fcbe Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 20:12:22 +08:00
Renpc-kilig
ef3b36afe7 bug修改。 2021-05-15 20:12:13 +08:00
cuibaocheng
19d1d53fb0 Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 20:06:58 +08:00
cuibaocheng
cd946a1b02 修改考场分配页面 2021-05-15 20:06:50 +08:00
wans
5b4b0c841a 添加增加人员 2021-05-15 19:53:41 +08:00
wans
4f7d48e4b1 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 19:42:37 +08:00
wans
5099a92f1e 考试是申请逻辑 2021-05-15 19:42:31 +08:00
ly19960718
d57d5f1f5c 报名验证修改 2021-05-15 19:13:23 +08:00
wans
261b449c8e Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 19:12:28 +08:00
wans
574d083472 提交 2021-05-15 19:12:22 +08:00
ly19960718
45653ccc98 Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 19:11:54 +08:00
wans
5cedacf50c 提交 2021-05-15 19:11:50 +08:00
ly19960718
cd84ccf63d 报名验证修改 2021-05-15 19:11:38 +08:00
cuibaocheng
4e649f5c1a 修改考场分配页面 2021-05-15 19:11:09 +08:00
wans
ad435b8084 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 19:11:08 +08:00
ly19960718
e7d9df37bd Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 18:53:24 +08:00
ly19960718
e374a9dc56 学生表修改 2021-05-15 18:53:15 +08:00
Renpc-kilig
8aec321733 bug修改。 2021-05-15 18:52:55 +08:00
Renpc-kilig
3c46ab1cb5 bug修改。 2021-05-15 18:51:04 +08:00
Renpc-kilig
b8320226b8 bug修改。 2021-05-15 18:45:57 +08:00
Renpc-kilig
7c40de8b2a bug修改。 2021-05-15 18:38:40 +08:00
Renpc-kilig
dd41e1c08e bug修改。
考试成绩录入。
2021-05-15 18:13:29 +08:00
Renpc-kilig
680f648751 bug修改。 2021-05-15 18:04:16 +08:00
wans
706c4fa470 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 17:57:47 +08:00
Renpc-kilig
c6fbc4e8e0 Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 17:57:06 +08:00
Renpc-kilig
3896b2b5ab bug修改。 2021-05-15 17:56:51 +08:00
ly19960718
542c94f3a8 新增报名配置 2021-05-15 17:56:47 +08:00
wans
458b3fcc6f Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 17:37:01 +08:00
ly19960718
818bea57c9 Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 17:36:40 +08:00
ly19960718
c977d25aec 新增报名配置 2021-05-15 17:36:06 +08:00
wans
1e006c96e3 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 17:23:02 +08:00
Renpc-kilig
b8b32bd6b3 bug修改。 2021-05-15 17:21:54 +08:00
wans
6c50605f80 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 17:15:41 +08:00
Renpc-kilig
82620ebe6c bug修改。 2021-05-15 17:15:29 +08:00
wans
4529cd056f Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 17:08:31 +08:00
Renpc-kilig
c05deab518 bug修改。 2021-05-15 16:51:55 +08:00
Renpc-kilig
dc7cbebff8 bug修改。 2021-05-15 16:49:12 +08:00
wans
ffc3f96310 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 16:18:42 +08:00
Renpc-kilig
4f2b5cc649 bug修改。 2021-05-15 16:18:29 +08:00
wans
5844e89f24 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 16:13:37 +08:00
ly19960718
54b1e93d64 新增报名配置 2021-05-15 16:11:14 +08:00
ly19960718
a4b5fbc9a1 报名信息 新增自定义添加报名信息接口 2021-05-15 15:55:43 +08:00
Renpc-kilig
bd1d51f4db 开班计划审核
考试申请审核
2021-05-15 15:51:38 +08:00
cuibaocheng
9a32253260 Merge remote-tracking branch 'origin/baotou-signup' into baotou-signup 2021-05-15 15:37:55 +08:00
cuibaocheng
b56565d8cc 修改考场分配页面 2021-05-15 15:36:33 +08:00
wans
6eb6236781 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 14:53:29 +08:00
ly19960718
2c5e8a7b89 报名信息 新增自定义添加报名信息接口 2021-05-15 14:53:06 +08:00
wans
e9789aa4da Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 14:46:27 +08:00
ly19960718
a21083afde 报名信息 新增自定义添加报名信息接口 2021-05-15 14:45:38 +08:00
wans
c266bd6d81 Merge branch 'baotou-signup' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup into baotou-signup 2021-05-15 14:43:46 +08:00
wans
f4c9f20420 修改开班计划逻辑 2021-05-15 14:43:37 +08:00
ly19960718
3bb9e6bc7d 报名信息 新增自定义添加报名信息接口 2021-05-15 13:41:21 +08:00
Renpc-kilig
e96386f122 开班计划审核
考试申请审核
2021-05-15 13:06:55 +08:00
Renpc-kilig
a7f58dbc6e 开班计划审核
考试申请审核
2021-05-15 12:49:21 +08:00
ly19960718
02e7411427 新增班级学生管理 修改报名相关功能 2021-05-15 11:30:11 +08:00
ly19960718
ed568ef787 新增班级学生管理 修改报名相关功能 2021-05-15 11:26:30 +08:00
ly19960718
1a0a4fbe89 应急局统计页面 2021-05-13 16:44:12 +08:00
Renpc-kilig
7a252476ee 开班计划和考试申请增加统计。 2021-05-13 16:22:29 +08:00
Renpc-kilig
3e1b1ef423 开班计划和考试申请增加统计。 2021-05-13 15:44:20 +08:00
Renpc-kilig
d0e0a9437b Merge remote-tracking branch 'origin/master' 2021-05-13 11:17:44 +08:00
Renpc-kilig
0e3dbcdd98 开班计划和考试申请增加统计。 2021-05-13 11:16:43 +08:00
cuibaocheng
9d378a3049 准考证新增考试地点 2021-05-13 09:53:11 +08:00
Renpc-kilig
7c8c39c4d0 功能完善,页面展示修改。 2021-05-12 17:31:02 +08:00
wans
549c9c3aef 添加时间校验 2021-05-12 17:20:00 +08:00
wans
c115d0a8db Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-12 16:57:55 +08:00
wans
14b2998622 添加查询准考证的逻辑 2021-05-12 16:57:46 +08:00
ly19960718
13194c0fd8 Merge remote-tracking branch 'origin/master' 2021-05-12 16:56:42 +08:00
ly19960718
3dc67cd8ce 应急局统计页面 2021-05-12 16:56:30 +08:00
cuibaocheng
c8507a2abc 图片套版生成模块 2021-05-12 16:56:16 +08:00
wans
536a619b12 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-12 15:20:48 +08:00
wans
cc67c74f36 参考人员信息 2021-05-12 15:20:33 +08:00
Renpc-kilig
1927a79fa7 考试申请审核新增提交确认。 2021-05-12 15:18:03 +08:00
wans
605ad7a713 修改添加考场信息情况判断 2021-05-12 15:17:54 +08:00
Renpc-kilig
78f4706313 Merge remote-tracking branch 'origin/master' 2021-05-12 15:12:41 +08:00
Renpc-kilig
778766a9e7 考试申请bug修改。 2021-05-12 15:12:29 +08:00
wans
2feeb259ef Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-12 15:03:59 +08:00
wans
6c5c50201d 修改重新提交考试申请 2021-05-12 15:03:45 +08:00
Renpc-kilig
36a4eef640 考试申请bug修改。 2021-05-12 15:03:04 +08:00
ly19960718
bc62daf13c 培训机构统计页面完结 2021-05-12 15:00:00 +08:00
wans
f23d2a0ea7 修改考试申请回显bug 2021-05-12 14:35:34 +08:00
wans
1045372e1a 修改时间选择不生效问题 2021-05-12 14:22:21 +08:00
wans
42e52ee711 修改考试申请页面 2021-05-12 14:18:13 +08:00
wans
9e405052a8 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-12 14:09:36 +08:00
wans
392461e398 修改考试申请时间校验 2021-05-12 14:09:17 +08:00
cuibaocheng
29b8af651c 增加考点的统计页面 2021-05-12 14:07:02 +08:00
wans
dd6746a3bd Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-12 10:52:12 +08:00
wans
5254def059 优化界面细节问题 2021-05-12 10:52:06 +08:00
Renpc-kilig
d050f7b602 Merge remote-tracking branch 'origin/master' 2021-05-12 10:46:51 +08:00
Renpc-kilig
0d191bfd54 列表展示美化 2021-05-12 10:46:42 +08:00
ly19960718
6e9158e6f6 Merge remote-tracking branch 'origin/master' 2021-05-12 10:45:51 +08:00
ly19960718
48be439332 报名逻辑修改 2021-05-12 10:45:42 +08:00
Renpc-kilig
da5131b414 Merge remote-tracking branch 'origin/master' 2021-05-12 10:44:09 +08:00
Renpc-kilig
47f62c3960 列表展示美化 2021-05-12 10:43:56 +08:00
ly19960718
328d4fef5a 修改报名审核逻辑 2021-05-12 09:39:36 +08:00
ly19960718
a0d2f355fc 首页统计相关功能 2021-05-11 18:07:18 +08:00
Renpc-kilig
d6fda44964 考试申请功能修改。 2021-05-11 15:00:34 +08:00
wans
49978c26a0 添加考试申请对接逻辑 2021-05-11 09:19:02 +08:00
Renpc-kilig
b96b4151c9 考试申请bug修改。 2021-05-10 18:07:59 +08:00
Renpc-kilig
502f13c158 考试申请字段新增。 2021-05-10 18:01:49 +08:00
Renpc-kilig
33a85dfd0c 考试申请查询条件修改。 2021-05-10 16:15:42 +08:00
Renpc-kilig
585a4ac9a4 考试申请查询条件修改。 2021-05-10 16:14:24 +08:00
Renpc-kilig
86a7549d0e 考试申请bug修改。 2021-05-10 15:10:46 +08:00
Renpc-kilig
77363e9610 考试申请功能添加考试编号。 2021-05-10 11:23:25 +08:00
ly19960718
46b87b0e6e Merge remote-tracking branch 'origin/master' 2021-05-10 11:00:40 +08:00
ly19960718
4176edbce5 修改报名列表报错问题 2021-05-10 11:00:30 +08:00
Renpc-kilig
d9a7d74dc4 Merge remote-tracking branch 'origin/master' 2021-05-10 11:00:10 +08:00
Renpc-kilig
7de86babb4 考试申请功能。 2021-05-10 10:59:53 +08:00
wans
f8f15a1668 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-08 16:51:27 +08:00
ly19960718
c440eff0b7 app接口更新 2021-05-08 16:51:18 +08:00
wans
a907570ccc 添加考试申请逻辑 2021-05-08 16:51:17 +08:00
cuibaocheng
e1a16ef108 图片套版生成模块 2021-05-07 15:00:09 +08:00
ly19960718
3b8d105a07 1 2021-05-07 14:44:50 +08:00
ly19960718
5987972967 报名字段修改 2021-05-07 14:42:21 +08:00
ly19960718
c4205186fd app报名相关接口修改 2021-05-07 13:45:13 +08:00
cuibaocheng
cb46ff719c 图片套版生成模块 2021-05-07 12:38:37 +08:00
cuibaocheng
6cec78fc8b 图片套版生成模块 2021-05-07 11:09:51 +08:00
Renpc-kilig
03c574ee3d 列表字段显示问题修改。
bug修改。
功能完善(未分配考场时,不允许分配监考老师。)
2021-05-07 11:03:01 +08:00
ly19960718
a7b378b796 修改app报名接口 2021-05-06 18:38:01 +08:00
wans
92901b788e 培训计划回显编辑方法完善 2021-05-06 18:36:57 +08:00
cuibaocheng
5b3577125d 图片套版生成模块 2021-05-05 18:17:17 +08:00
Renpc-kilig
f58efac12a 考试申请审核功能修改。 2021-05-05 17:26:28 +08:00
Renpc-kilig
f88f526861 考试申请审核功能修改。 2021-05-05 17:09:32 +08:00
Renpc-kilig
e41cd545d8 考试申请审核功能修改。 2021-05-05 17:01:59 +08:00
cuibaocheng
20da5aa0a0 图片套版生成模块 2021-05-05 16:59:54 +08:00
Renpc-kilig
5dfd58f787 考试申请审核功能修改。 2021-05-05 16:30:28 +08:00
ly19960718
839f88e04f 富文本编辑框资源文件 2021-05-05 16:11:07 +08:00
wans
7ad9952e16 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-05 15:56:46 +08:00
wans
fdb4da2158 补充讲师培训计划细节逻辑 2021-05-05 15:56:38 +08:00
ly19960718
ac5112571f Merge remote-tracking branch 'origin/master' 2021-05-05 15:26:23 +08:00
ly19960718
814d937fe3 增加查询培训计划参数 2021-05-05 15:26:11 +08:00
wans
f4d875df1e Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-05 15:17:55 +08:00
wans
db8c8f33ee 添加计划类型和允许报名时间约束 2021-05-05 15:17:44 +08:00
ly19960718
c24b6f0539 修改单词 2021-05-05 15:13:31 +08:00
ly19960718
94aea144ed 修改报名审核问题 2021-05-05 15:12:41 +08:00
ly19960718
10cd9b6ec2 Merge remote-tracking branch 'origin/master' 2021-05-05 15:00:33 +08:00
ly19960718
f6c359bce0 培训计划添加报备审核状态判断 2021-05-05 15:00:23 +08:00
cuibaocheng
9d86f0272d 图片套版生成模块 2021-05-05 14:54:59 +08:00
Renpc-kilig
a57a2b9a09 Merge remote-tracking branch 'origin/master' 2021-05-05 14:51:58 +08:00
Renpc-kilig
5baee63e8b Merge remote-tracking branch 'origin/master' 2021-05-05 14:51:47 +08:00
wans
571703caa4 bug修改 2021-05-05 14:51:40 +08:00
Renpc-kilig
79e078f3dd 考试申请审核功能修改。 2021-05-05 14:51:34 +08:00
wans
84c80dbe25 讲师课程培训计划关联机构ID 2021-05-05 14:48:07 +08:00
cuibaocheng
3d73403c72 图片套版生成模块 2021-05-05 14:40:03 +08:00
Renpc-kilig
922f315f5a 考试申请审核功能修改。 2021-05-05 14:35:08 +08:00
cuibaocheng
fa9bd80940 图片套版生成模块 2021-05-05 14:20:48 +08:00
cuibaocheng
fb3059d131 图片套版生成模块 2021-05-05 13:44:57 +08:00
ly19960718
76d05ee11c Merge remote-tracking branch 'origin/master' 2021-05-05 13:17:14 +08:00
cuibaocheng
45136485bf Merge remote-tracking branch 'origin/master' 2021-05-05 13:11:25 +08:00
cuibaocheng
a2b255b52b 图片套版生成模块 2021-05-05 13:11:10 +08:00
ly19960718
8453fdcc59 取消登录机构绑定, 2021-05-05 13:10:35 +08:00
wans
a2bd1710d5 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-05 12:51:47 +08:00
wans
4e016f2268 小修改 2021-05-05 12:51:38 +08:00
ly19960718
a4ba12e13e 修改功能 2021-05-05 12:47:02 +08:00
ly19960718
d65c2c63e7 报名信息增加创建人字段返回 2021-05-05 11:41:49 +08:00
wans
cdd8af5854 添加报备申请的逻辑 2021-05-04 18:46:39 +08:00
wans
600b0567e1 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-04 18:10:13 +08:00
wans
8ee5e653bf 计划关联课程关联讲师 2021-05-04 18:10:04 +08:00
ly19960718
d202b4c297 1 2021-05-04 15:41:39 +08:00
ly19960718
ab59e5fcbd 1、工种增加编码唯一判断
2、报名修改报名错误返回提示
2021-05-04 15:21:53 +08:00
Renpc-kilig
dfff74bdd4 Merge remote-tracking branch 'origin/master' 2021-05-04 15:06:22 +08:00
Renpc-kilig
51a788d82a 考试申请审核功能新增。 2021-05-04 15:06:01 +08:00
ly19960718
3e8e7eba2e Merge remote-tracking branch 'origin/master' 2021-05-04 15:00:25 +08:00
ly19960718
130306caa0 报名审核逻辑修改,新增获取报名计划接口 2021-05-04 15:00:10 +08:00
Renpc-kilig
c526f838d8 Merge remote-tracking branch 'origin/master' 2021-05-04 14:55:12 +08:00
Renpc-kilig
10b39103d2 考试申请审核功能新增。 2021-05-04 14:55:03 +08:00
wans
c267a60482 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-04 14:25:56 +08:00
wans
a6e0f471a6 添加工种选择树 2021-05-04 14:25:41 +08:00
Renpc-kilig
e4f019a6a1 Merge remote-tracking branch 'origin/master' 2021-05-04 14:23:16 +08:00
Renpc-kilig
09284bd69e 考试申请对接。 2021-05-04 14:23:04 +08:00
wans
418a4975e2 静态文件 2021-05-04 14:02:58 +08:00
wans
0fed8573bf 工种选择 2021-05-04 14:00:54 +08:00
cuibaocheng
d9d45b69f9 Merge remote-tracking branch 'origin/master' 2021-05-04 13:15:29 +08:00
cuibaocheng
dca5112abe 图片套版生成模块 2021-05-04 13:15:07 +08:00
wans
2f85d34cc3 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-04 13:03:59 +08:00
wans
048d149fb0 计划添加Id值返回 2021-05-04 13:03:46 +08:00
ly19960718
5f4bf1f454 修改报名审核逻辑 2021-05-03 18:34:54 +08:00
cuibaocheng
4d1d919d42 考场分配功能 , 准考证生成功能 2021-05-03 18:23:45 +08:00
ly19960718
f6a6d6b3c6 修改页面图片绑 2021-05-03 18:13:08 +08:00
wans
efe94a4b20 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-03 18:08:50 +08:00
wans
8e80f7d8a2 添加培训计划的代码 2021-05-03 18:08:21 +08:00
Renpc-kilig
97c1ce7944 Merge remote-tracking branch 'origin/master' 2021-05-03 17:41:24 +08:00
Renpc-kilig
9cbea10156 考试申请功能新增。 2021-05-03 17:41:12 +08:00
wans
d49c8d604d 讲师包整合 2021-05-03 15:02:09 +08:00
wans
75bf76981e 修改讲师 2021-05-03 12:02:09 +08:00
wans
1f4c618e71 Merge branch 'master' of e.coding.net:tsteam/btsaqscksfwpt/system-examination-signup 2021-05-03 11:59:41 +08:00
wans
3cd279b715 课程mapper.xml修改 2021-05-03 11:57:41 +08:00
cuibaocheng
823b1298ef Merge remote-tracking branch 'origin/master' 2021-05-02 18:23:47 +08:00
cuibaocheng
a849dff02f 考点分配功能, 考场信息功能 2021-05-02 18:23:26 +08:00
Renpc-kilig
5a99f0275e Merge remote-tracking branch 'origin/master' 2021-05-02 18:21:54 +08:00
Renpc-kilig
0dfbd33805 考务人员管理
监考人员分配
2021-05-02 18:20:07 +08:00