Commit 5b89bf05 authored by 陈立彬's avatar 陈立彬

1.对练新增status,用于完成考试和数据过滤

parent daf78dda
...@@ -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();
......
...@@ -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;
} }
...@@ -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()));
} }
......
...@@ -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;
} }
...@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment