Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elleai
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
E
ellehuis-group
backend
elleai
Commits
5b89bf05
Commit
5b89bf05
authored
Dec 02, 2024
by
陈立彬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.对练新增status,用于完成考试和数据过滤
parent
daf78dda
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
6 deletions
+24
-6
AppExamineService.java
.../breeze/elleai/application/service/AppExamineService.java
+6
-4
ExamineRecordSaveModel.java
...domain/sparring/model/request/ExamineRecordSaveModel.java
+5
-0
ExamineServiceImpl.java
...ze/elleai/domain/sparring/service/ExamineServiceImpl.java
+1
-0
UserExamineRecordEntity.java
...n/breeze/elleai/infra/entity/UserExamineRecordEntity.java
+5
-0
UserExamineRecordTableDef.java
.../elleai/infra/entity/table/UserExamineRecordTableDef.java
+7
-2
No files found.
src/main/java/cn/breeze/elleai/application/service/AppExamineService.java
View file @
5b89bf05
...
@@ -813,10 +813,6 @@ public class AppExamineService {
...
@@ -813,10 +813,6 @@ public class AppExamineService {
ExamineRecordRequestModel
requestModel
=
BeanUtil
.
copyProperties
(
request
,
ExamineRecordRequestModel
.
class
);
ExamineRecordRequestModel
requestModel
=
BeanUtil
.
copyProperties
(
request
,
ExamineRecordRequestModel
.
class
);
ExamineRequestModel
rm
=
new
ExamineRequestModel
();
rm
.
setName
(
request
.
getUserName
());
examineService
.
examineList
(
rm
);
Page
<
ExamineRecordResponseModel
>
page
=
examineService
.
examineRecordPaginQuery
(
requestModel
);
Page
<
ExamineRecordResponseModel
>
page
=
examineService
.
examineRecordPaginQuery
(
requestModel
);
PageResult
<
ExamineRecordDto
>
pageResult
=
PageResult
.
of
(
request
.
getPageNo
(),
request
.
getPageSize
(),
(
int
)
page
.
getTotalRow
(),
null
);
PageResult
<
ExamineRecordDto
>
pageResult
=
PageResult
.
of
(
request
.
getPageNo
(),
request
.
getPageSize
(),
(
int
)
page
.
getTotalRow
(),
null
);
...
@@ -1348,8 +1344,14 @@ public class AppExamineService {
...
@@ -1348,8 +1344,14 @@ public class AppExamineService {
if
(
Objects
.
isNull
(
businessCache
))
{
if
(
Objects
.
isNull
(
businessCache
))
{
throw
new
InternalException
(-
1
,
"获取不到对练信息"
);
throw
new
InternalException
(-
1
,
"获取不到对练信息"
);
}
}
// 更新考试记录状态
Integer
recordId
=
businessCache
.
getRecordId
();
Integer
recordId
=
businessCache
.
getRecordId
();
ExamineRecordSaveModel
saveModel
=
new
ExamineRecordSaveModel
();
saveModel
.
setId
(
recordId
);
saveModel
.
setStatus
(
1
);
examineService
.
saveExamineRecord
(
saveModel
);
// 保存定时任务
ExamineEvaluateJobResponseModel
evaluateJob
=
commonService
.
getEvaluateJob
(
1
,
recordId
);
ExamineEvaluateJobResponseModel
evaluateJob
=
commonService
.
getEvaluateJob
(
1
,
recordId
);
if
(
Objects
.
isNull
(
evaluateJob
))
{
if
(
Objects
.
isNull
(
evaluateJob
))
{
ExamineEvaluateJobSaveModel
model
=
new
ExamineEvaluateJobSaveModel
();
ExamineEvaluateJobSaveModel
model
=
new
ExamineEvaluateJobSaveModel
();
...
...
src/main/java/cn/breeze/elleai/domain/sparring/model/request/ExamineRecordSaveModel.java
View file @
5b89bf05
...
@@ -81,4 +81,9 @@ public class ExamineRecordSaveModel implements Serializable {
...
@@ -81,4 +81,9 @@ public class ExamineRecordSaveModel implements Serializable {
* 是否删除
* 是否删除
*/
*/
private
Integer
deleted
;
private
Integer
deleted
;
/**
* 状态(0进行中 1已完成)
*/
private
Integer
status
;
}
}
src/main/java/cn/breeze/elleai/domain/sparring/service/ExamineServiceImpl.java
View file @
5b89bf05
...
@@ -430,6 +430,7 @@ public class ExamineServiceImpl implements ExamineService {
...
@@ -430,6 +430,7 @@ public class ExamineServiceImpl implements ExamineService {
QueryWrapper
queryWrapper
=
QueryWrapper
.
create
();
QueryWrapper
queryWrapper
=
QueryWrapper
.
create
();
queryWrapper
.
where
(
USER_EXAMINE_RECORD_ENTITY
.
DELETED
.
eq
(
0
));
queryWrapper
.
where
(
USER_EXAMINE_RECORD_ENTITY
.
DELETED
.
eq
(
0
));
queryWrapper
.
and
(
USER_EXAMINE_RECORD_ENTITY
.
STATUS
.
eq
(
1
));
if
(
StrUtil
.
isNotEmpty
(
request
.
getUserId
()))
{
if
(
StrUtil
.
isNotEmpty
(
request
.
getUserId
()))
{
queryWrapper
.
and
(
USER_EXAMINE_RECORD_ENTITY
.
USER_ID
.
eq
(
request
.
getUserId
()));
queryWrapper
.
and
(
USER_EXAMINE_RECORD_ENTITY
.
USER_ID
.
eq
(
request
.
getUserId
()));
}
}
...
...
src/main/java/cn/breeze/elleai/infra/entity/UserExamineRecordEntity.java
View file @
5b89bf05
...
@@ -102,4 +102,9 @@ public class UserExamineRecordEntity implements Serializable {
...
@@ -102,4 +102,9 @@ public class UserExamineRecordEntity implements Serializable {
*/
*/
private
Integer
deleted
;
private
Integer
deleted
;
/**
* 状态(0进行中 1已完成)
*/
private
Integer
status
;
}
}
src/main/java/cn/breeze/elleai/infra/entity/table/UserExamineRecordTableDef.java
View file @
5b89bf05
...
@@ -91,10 +91,15 @@ public class UserExamineRecordTableDef extends TableDef {
...
@@ -91,10 +91,15 @@ public class UserExamineRecordTableDef extends TableDef {
public
final
QueryColumn
OVERALL_EVALUATION
=
new
QueryColumn
(
this
,
"overall_evaluation"
);
public
final
QueryColumn
OVERALL_EVALUATION
=
new
QueryColumn
(
this
,
"overall_evaluation"
);
/**
/**
*
综合评价
*
是否删除
*/
*/
public
final
QueryColumn
DELETED
=
new
QueryColumn
(
this
,
"deleted"
);
public
final
QueryColumn
DELETED
=
new
QueryColumn
(
this
,
"deleted"
);
/**
* 状态(0进行中 1已完成)
*/
public
final
QueryColumn
STATUS
=
new
QueryColumn
(
this
,
"status"
);
/**
/**
* 所有字段。
* 所有字段。
*/
*/
...
@@ -103,7 +108,7 @@ public class UserExamineRecordTableDef extends TableDef {
...
@@ -103,7 +108,7 @@ public class UserExamineRecordTableDef extends TableDef {
/**
/**
* 默认字段,不包含逻辑删除或者 large 等字段。
* 默认字段,不包含逻辑删除或者 large 等字段。
*/
*/
public
final
QueryColumn
[]
DEFAULT_COLUMNS
=
new
QueryColumn
[]{
ID
,
USER_ID
,
USER_NAME
,
BUSINESS_NO
,
SHOP_ID
,
SHOP_NAME
,
SESSION_ID
,
EXAMINE_ID
,
EXAMINE_MODE
,
ANSWERED_NUM
,
OVERALL_SCORE
,
OVERALL_EVALUATION
,
CREATE_TIME
,
UPDATE_TIME
,
DELETED
};
public
final
QueryColumn
[]
DEFAULT_COLUMNS
=
new
QueryColumn
[]{
ID
,
USER_ID
,
USER_NAME
,
BUSINESS_NO
,
SHOP_ID
,
SHOP_NAME
,
SESSION_ID
,
EXAMINE_ID
,
EXAMINE_MODE
,
ANSWERED_NUM
,
OVERALL_SCORE
,
OVERALL_EVALUATION
,
CREATE_TIME
,
UPDATE_TIME
,
DELETED
,
STATUS
};
public
UserExamineRecordTableDef
()
{
public
UserExamineRecordTableDef
()
{
super
(
""
,
"ai_user_examine_record"
);
super
(
""
,
"ai_user_examine_record"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment