Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
device-back
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
device-back
Commits
e2051d39
提交
e2051d39
authored
10月 29, 2021
作者:
zjm
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(培训模块): 修改了培训试卷查询不出的bug
修改了培训试卷查询不出的bug
上级
0b70a385
显示空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
13 行增加
和
6 行删除
+13
-6
TrainThemeDao.java
...ain/java/com/tykj/dev/device/train/dao/TrainThemeDao.java
+3
-0
TrainThemeService.java
.../com/tykj/dev/device/train/service/TrainThemeService.java
+1
-0
TestPaperServiceImpl.java
...j/dev/device/train/service/impl/TestPaperServiceImpl.java
+4
-6
TrainThemeServiceImpl.java
.../dev/device/train/service/impl/TrainThemeServiceImpl.java
+5
-0
没有找到文件。
dev-train/src/main/java/com/tykj/dev/device/train/dao/TrainThemeDao.java
浏览文件 @
e2051d39
...
@@ -18,4 +18,7 @@ public interface TrainThemeDao extends JpaRepository<TrainTheme, Integer>, JpaSp
...
@@ -18,4 +18,7 @@ public interface TrainThemeDao extends JpaRepository<TrainTheme, Integer>, JpaSp
List
<
TrainTheme
>
findAllByTrainStatus
(
Integer
status
);
List
<
TrainTheme
>
findAllByTrainStatus
(
Integer
status
);
List
<
TrainTheme
>
findAllByUnitsIdAndIsNotExamines
(
Integer
unitId
,
Integer
isNotExamines
);
List
<
TrainTheme
>
findAllByUnitsIdAndIsNotExamines
(
Integer
unitId
,
Integer
isNotExamines
);
List
<
TrainTheme
>
findAllByUnitsId
(
Integer
unitId
);
}
}
dev-train/src/main/java/com/tykj/dev/device/train/service/TrainThemeService.java
浏览文件 @
e2051d39
...
@@ -48,6 +48,7 @@ public interface TrainThemeService {
...
@@ -48,6 +48,7 @@ public interface TrainThemeService {
List
<
TrainTheme
>
findByUnitIdAndisNotExamines
(
Integer
isNotExamines
,
Integer
unitId
);
List
<
TrainTheme
>
findByUnitIdAndisNotExamines
(
Integer
isNotExamines
,
Integer
unitId
);
List
<
TrainTheme
>
findByUnitId
(
Integer
unitId
);
WaitExaminesVo
findWaitExaminesVo
(
Integer
trainId
);
WaitExaminesVo
findWaitExaminesVo
(
Integer
trainId
);
}
}
dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TestPaperServiceImpl.java
浏览文件 @
e2051d39
...
@@ -187,17 +187,14 @@ public class TestPaperServiceImpl implements TestPaperService {
...
@@ -187,17 +187,14 @@ public class TestPaperServiceImpl implements TestPaperService {
@Override
@Override
public
List
<
TestPaperManagementListVo
>
TEST_PAPER_MANAGEMENT_LIST_VOS
(
Integer
unitId
,
Integer
status
)
{
public
List
<
TestPaperManagementListVo
>
TEST_PAPER_MANAGEMENT_LIST_VOS
(
Integer
unitId
,
Integer
status
)
{
Integer
trainStatus
;
int
testPaperStatus
;
Integer
testPaperStatus
;
if
(
status
==
0
){
if
(
status
==
0
){
trainStatus
=
0
;
testPaperStatus
=
0
;
testPaperStatus
=
0
;
}
else
{
}
else
{
trainStatus
=
2
;
testPaperStatus
=
1
;
testPaperStatus
=
1
;
}
}
List
<
TestPaperManagementListVo
>
testPaperManagementListVos
=
new
ArrayList
<>();
List
<
TestPaperManagementListVo
>
testPaperManagementListVos
=
new
ArrayList
<>();
trainThemeService
.
findByUnitId
AndisNotExamines
(
trainStatus
,
unitId
).
forEach
(
trainThemeService
.
findByUnitId
(
unitId
).
forEach
(
trainTheme
->
{
trainTheme
->
{
TestPaperManagementListVo
testPaperManagementListVo
=
new
TestPaperManagementListVo
();
TestPaperManagementListVo
testPaperManagementListVo
=
new
TestPaperManagementListVo
();
testPaperManagementListVo
.
setTrainId
(
trainTheme
.
getTrainId
());
testPaperManagementListVo
.
setTrainId
(
trainTheme
.
getTrainId
());
...
@@ -206,7 +203,8 @@ public class TestPaperServiceImpl implements TestPaperService {
...
@@ -206,7 +203,8 @@ public class TestPaperServiceImpl implements TestPaperService {
testPaperManagementListVos
.
add
(
testPaperManagementListVo
);
testPaperManagementListVos
.
add
(
testPaperManagementListVo
);
}
}
);
);
return
testPaperManagementListVos
;
return
testPaperManagementListVos
.
stream
().
filter
(
testPaperManagementListVo
->
testPaperManagementListVo
.
getCount
()!=
0
).
collect
(
Collectors
.
toList
());
}
}
@Override
@Override
...
...
dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java
浏览文件 @
e2051d39
...
@@ -328,6 +328,11 @@ public class TrainThemeServiceImpl implements TrainThemeService {
...
@@ -328,6 +328,11 @@ public class TrainThemeServiceImpl implements TrainThemeService {
return
trainThemeDao
.
findAllByUnitsIdAndIsNotExamines
(
unitId
,
isNotExamines
);
return
trainThemeDao
.
findAllByUnitsIdAndIsNotExamines
(
unitId
,
isNotExamines
);
}
}
@Override
public
List
<
TrainTheme
>
findByUnitId
(
Integer
unitId
)
{
return
trainThemeDao
.
findAllByUnitsId
(
unitId
);
}
@Override
@Override
public
WaitExaminesVo
findWaitExaminesVo
(
Integer
trainId
)
{
public
WaitExaminesVo
findWaitExaminesVo
(
Integer
trainId
)
{
TrainTheme
trainTheme
=
trainThemeDao
.
findById
(
trainId
).
get
();
TrainTheme
trainTheme
=
trainThemeDao
.
findById
(
trainId
).
get
();
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论