Commit c266a189 authored by 陈立彬's avatar 陈立彬

bugfix

parent 650a62b8
...@@ -28,7 +28,7 @@ public class ExamineSceneCategorySaveDto implements Serializable { ...@@ -28,7 +28,7 @@ public class ExamineSceneCategorySaveDto implements Serializable {
private Integer sceneId; private Integer sceneId;
@Schema(description = "可见角色列表") @Schema(description = "可见角色列表")
@JsonProperty("visible_role_list") @JsonProperty("visible_role_ids")
private List<String> visibleRoleList; private List<String> visibleRoleList;
/** /**
......
...@@ -33,11 +33,11 @@ public class QaAssistantSaveDto implements Serializable { ...@@ -33,11 +33,11 @@ public class QaAssistantSaveDto implements Serializable {
private String iconUrl; private String iconUrl;
@Schema(description = "知识库分类ID列表") @Schema(description = "知识库分类ID列表")
@JsonProperty("category_id_list") @JsonProperty("category_ids")
private List<String> categoryIdList; private List<String> categoryIdList;
@Schema(description = "可见角色列表") @Schema(description = "可见角色列表")
@JsonProperty("visible_role_list") @JsonProperty("visible_role_ids")
private List<String> visibleRoleList; private List<String> visibleRoleList;
} }
...@@ -41,6 +41,10 @@ public class ExamineDto implements Serializable { ...@@ -41,6 +41,10 @@ public class ExamineDto implements Serializable {
@JsonProperty("scene_id") @JsonProperty("scene_id")
private Integer sceneId; private Integer sceneId;
@Schema(description = "对练场景名称")
@JsonProperty("scene_name")
private String sceneName;
/** /**
* 对练分类ID * 对练分类ID
*/ */
...@@ -75,6 +79,10 @@ public class ExamineDto implements Serializable { ...@@ -75,6 +79,10 @@ public class ExamineDto implements Serializable {
@JsonProperty("qa_num") @JsonProperty("qa_num")
private Integer qaNum; private Integer qaNum;
@Schema(description = "更新时间")
@JsonProperty("update_time")
private Date updateTime;
/** /**
* 关联题目列表 * 关联题目列表
*/ */
......
...@@ -36,7 +36,7 @@ public class ExamineSceneCategoryDto implements Serializable { ...@@ -36,7 +36,7 @@ public class ExamineSceneCategoryDto implements Serializable {
private String sceneName; private String sceneName;
@Schema(description = "可见角色列表") @Schema(description = "可见角色列表")
@JsonProperty("visible_role_list") @JsonProperty("visible_role_ids")
private List<String> visibleRoleList; private List<String> visibleRoleList;
/** /**
......
...@@ -34,11 +34,11 @@ public class QaAssistantDto implements Serializable { ...@@ -34,11 +34,11 @@ public class QaAssistantDto implements Serializable {
private String iconUrl; private String iconUrl;
@Schema(description = "知识库分类ID列表") @Schema(description = "知识库分类ID列表")
@JsonProperty("category_id_list") @JsonProperty("category_ids")
private List<String> categoryIdList; private List<String> categoryIdList;
@Schema(description = "可见角色列表") @Schema(description = "可见角色列表")
@JsonProperty("visible_role_list") @JsonProperty("visible_role_ids")
private List<String> visibleRoleList; private List<String> visibleRoleList;
/** /**
......
...@@ -630,6 +630,11 @@ public class AppExamineService { ...@@ -630,6 +630,11 @@ public class AppExamineService {
dto.setStartTime(v.getStartTime().getTime()); dto.setStartTime(v.getStartTime().getTime());
dto.setEndTime(v.getEndTime().getTime()); dto.setEndTime(v.getEndTime().getTime());
ExamineSceneResponseModel scene = examineService.sceneDetail(dto.getSceneId());
if(Objects.nonNull(scene)) {
dto.setSceneName(scene.getName());
}
return dto; return dto;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
......
...@@ -146,10 +146,10 @@ public class ExamineMobileController { ...@@ -146,10 +146,10 @@ public class ExamineMobileController {
@Operation(summary = "退出考试,清除考试记录") @Operation(summary = "退出考试,清除考试记录")
@PostMapping(value = "/exit_examine") @PostMapping(value = "/exit_examine")
public ApiResponse<String> exitExam(@Parameter(hidden = true) UserPrincipal userPrincipal, public ApiResponse<String> exitExam(@Parameter(hidden = true) UserPrincipal userPrincipal,
@Schema(description = "对练ID") @RequestParam("examaine_id") Integer examineId, @Schema(description = "对练ID") @RequestParam("examine_id") Integer examineId,
@Schema(description = "考试流水号") @RequestParam("business_no") String businessNo) { @Schema(description = "考试流水号") @RequestParam("business_no") String businessNo) {
// examineService.exitExamine(userPrincipal, examineId, businessNo); examineService.exitExamine(userPrincipal, examineId, businessNo);
return ApiResponse.ok("SUCCESS"); return ApiResponse.ok("SUCCESS");
} }
......
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