Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
600b5538
提交
600b5538
authored
11月 22, 2021
作者:
zjm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(培训模块): 修改培训报名报500的错误(专管员是新添加的 再去报名,就会报错)
修改培训报名报500的错误(专管员是新添加的 再去报名,就会报错)
上级
be9081ed
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
6 行增加
和
7 行删除
+6
-7
TrainJobController.java
.../tykj/dev/device/train/controller/TrainJobController.java
+2
-2
TrainThemeService.java
.../com/tykj/dev/device/train/service/TrainThemeService.java
+1
-1
TrainThemeServiceImpl.java
.../dev/device/train/service/impl/TrainThemeServiceImpl.java
+3
-4
没有找到文件。
dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java
浏览文件 @
600b5538
...
@@ -681,13 +681,13 @@ public class TrainJobController {
...
@@ -681,13 +681,13 @@ public class TrainJobController {
@ApiOperation
(
value
=
"报名页面和确认页面接口,查看成绩页面接口"
)
@ApiOperation
(
value
=
"报名页面和确认页面接口,查看成绩页面接口"
)
@GetMapping
(
"/train/{trainId}"
)
@GetMapping
(
"/train/{trainId}"
)
public
ResponseEntity
resultsConfirm
(
@ApiIgnore
@AuthenticationPrincipal
SecurityUser
securityUser
,
@PathVariable
Integer
trainId
)
{
public
ResponseEntity
resultsConfirm
(
@ApiIgnore
@AuthenticationPrincipal
SecurityUser
securityUser
,
@PathVariable
Integer
trainId
)
{
return
ResponseEntity
.
ok
(
trainThemeService
.
findByTrainingPeople
(
trainId
,
securityUser
.
getCurrentUserInfo
().
getU
ser
Id
()));
return
ResponseEntity
.
ok
(
trainThemeService
.
findByTrainingPeople
(
trainId
,
securityUser
.
getCurrentUserInfo
().
getU
nits
Id
()));
}
}
@ApiOperation
(
value
=
"成绩确认页面接口,查看成绩页面接口"
)
@ApiOperation
(
value
=
"成绩确认页面接口,查看成绩页面接口"
)
@GetMapping
(
"/train/check/{trainId}"
)
@GetMapping
(
"/train/check/{trainId}"
)
public
ResponseEntity
resultsConfirmCheck
(
@ApiIgnore
@AuthenticationPrincipal
SecurityUser
securityUser
,
@PathVariable
Integer
trainId
)
{
public
ResponseEntity
resultsConfirmCheck
(
@ApiIgnore
@AuthenticationPrincipal
SecurityUser
securityUser
,
@PathVariable
Integer
trainId
)
{
return
ResponseEntity
.
ok
(
trainThemeService
.
findByTrainingPeople
(
trainId
,
securityUser
.
getCurrentUserInfo
().
getU
ser
Id
()));
return
ResponseEntity
.
ok
(
trainThemeService
.
findByTrainingPeople
(
trainId
,
securityUser
.
getCurrentUserInfo
().
getU
nits
Id
()));
}
}
@ApiOperation
(
value
=
"报名中请求的详情接口"
)
@ApiOperation
(
value
=
"报名中请求的详情接口"
)
...
...
dev-train/src/main/java/com/tykj/dev/device/train/service/TrainThemeService.java
浏览文件 @
600b5538
...
@@ -26,7 +26,7 @@ public interface TrainThemeService {
...
@@ -26,7 +26,7 @@ public interface TrainThemeService {
List
<
TrainTheme
>
findAllStatus
(
Integer
status
);
List
<
TrainTheme
>
findAllStatus
(
Integer
status
);
ByTrainingPeople
findByTrainingPeople
(
Integer
trainThemeId
,
Integer
u
ser
Id
);
ByTrainingPeople
findByTrainingPeople
(
Integer
trainThemeId
,
Integer
u
nit
Id
);
ByTrainingPeopleCheck
findByTrainingPeopleCheck
(
Integer
trainThemeId
,
Integer
userId
);
ByTrainingPeopleCheck
findByTrainingPeopleCheck
(
Integer
trainThemeId
,
Integer
userId
);
...
...
dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java
浏览文件 @
600b5538
...
@@ -134,12 +134,11 @@ public class TrainThemeServiceImpl implements TrainThemeService {
...
@@ -134,12 +134,11 @@ public class TrainThemeServiceImpl implements TrainThemeService {
}
}
@Override
@Override
public
ByTrainingPeople
findByTrainingPeople
(
Integer
trainThemeId
,
Integer
u
ser
Id
)
{
public
ByTrainingPeople
findByTrainingPeople
(
Integer
trainThemeId
,
Integer
u
nit
Id
)
{
TrainTheme
trainTheme
=
trainThemeDao
.
findById
(
trainThemeId
).
get
();
TrainTheme
trainTheme
=
trainThemeDao
.
findById
(
trainThemeId
).
get
();
ByTrainingPeople
byTrainingPeople
=
trainTheme
.
toByTrainingPeople
();
ByTrainingPeople
byTrainingPeople
=
trainTheme
.
toByTrainingPeople
();
TrainUser
trainUser
=
trainUserDao
.
findByUserIdAndTrainId
(
userId
,
trainThemeId
);
List
<
TrainUser
>
trainUsers
=
trainUserDao
.
findAllByUnitsIdAndTrainId
(
unitId
,
trainThemeId
);
List
<
TrainUser
>
trainUsers
=
trainUserDao
.
findAllByUnitsIdAndTrainId
(
trainUser
.
getUnitsId
(),
trainThemeId
);
Units
units
=
unitsCache
.
findById
(
unitId
);
Units
units
=
unitsCache
.
findById
(
trainUser
.
getUnitsId
());
Map
<
Integer
,
User
>
map
=
userService
.
findAllByUnite
(
units
.
getUnitId
()).
stream
().
collect
(
Collectors
.
toMap
(
User:
:
getUserId
,
Function
.
identity
()));
Map
<
Integer
,
User
>
map
=
userService
.
findAllByUnite
(
units
.
getUnitId
()).
stream
().
collect
(
Collectors
.
toMap
(
User:
:
getUserId
,
Function
.
identity
()));
Set
<
Integer
>
ids
=
map
.
keySet
();
Set
<
Integer
>
ids
=
map
.
keySet
();
ids
.
removeAll
(
trainUsers
.
stream
().
map
(
TrainUser:
:
getUserId
).
collect
(
Collectors
.
toList
()));
ids
.
removeAll
(
trainUsers
.
stream
().
map
(
TrainUser:
:
getUserId
).
collect
(
Collectors
.
toList
()));
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论