add train

src/main/java/com/cnooc/expert/controller/expert/ExpertController.java

@@ -7,11 +7,14 @@ import com.cnooc.expert.controller.expert.model.request.CommonFuJianListReq;
 import com.cnooc.expert.controller.expert.model.request.DictNofilterListReq;
 import com.cnooc.expert.controller.expert.model.request.DongJieGetReq;
 import com.cnooc.expert.controller.expert.model.request.DongJiePageReq;
+import com.cnooc.expert.controller.expert.model.request.ExamPaperGetReq;
+import com.cnooc.expert.controller.expert.model.request.ExamQuestionListReq;
+import com.cnooc.expert.controller.expert.model.request.ExamQuestionXiaoTiListReq;
+import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
 import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianGetReq;
 import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianListReq;
 import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieGetReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
@@ -28,7 +31,6 @@ import com.cnooc.expert.controller.expert.model.request.WeiGuiJiLuPageReq;
 import com.cnooc.expert.controller.expert.model.request.ZhuanJiaShenQingJiLuPageReq;
 import com.cnooc.expert.controller.expert.model.response.ApproveBusinessIdGetResp;
 import com.cnooc.expert.controller.expert.model.response.KaoShiPageResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianGetResp;
 import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianListResp;
 import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetResp;
 import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp;
@@ -41,12 +43,16 @@ import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiR
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaApplyApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaPageApiResp;
 import com.cnooc.expert.external.expert.model.response.JinJiQingJiaApplyApiResp;
 import com.cnooc.expert.external.expert.model.response.JinJiQingJiaPageApiResp;
 import com.cnooc.expert.external.expert.model.response.TainLessonProgressUpdateApiResp;
+import com.cnooc.expert.external.expert.model.response.TempExamPaperGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonPageApiResp;
@@ -318,12 +324,39 @@ public class ExpertController extends AbstractBaseController {
         return ApiResult.successWithResult(apiResp);
     }
 
+    // 查询试卷信息
+    @PostMapping("/train/exam/paper/get")
+    public ApiResult<TempExamPaperGetApiResp> examPaperGet(@RequestBody @Validated ExamPaperGetReq req) {
+        TempExamPaperGetApiResp apiResp = expertService.getTempExamPaper(req.getExamPaperGuid());
+        return ApiResult.successWithResult(apiResp);
+    }
 
+    // 获取系统时间
+    @PostMapping("/common/systemtime/get")
+    public ApiResult<Long> commonSystemtimeGet() {
+        return ApiResult.successWithResult(expertService.getSystemTime());
+    }
 
+    // 保存考试记录
+    @PostMapping("/train/exam/record/save")
+    public ApiResult<ExamRecordSaveApiResp> examRecordSave(@RequestBody @Validated ExamRecordSaveReq req) {
+        ExamRecordSaveApiResp apiResp = expertService.saveExamRecord(req);
+        return ApiResult.successWithResult(apiResp);
+    }
 
+    // 考试试题列表
+    @PostMapping("/train/exam/question/list")
+    public ApiResult<List<ExamQuestionListApiResp>> examQuestionList(@RequestBody @Validated ExamQuestionListReq req) {
+        List<ExamQuestionListApiResp> apiResp = expertService.listExamQuestion(req.getExamPaperGuid());
+        return ApiResult.successWithResult(apiResp);
+    }
 
-
-
+    // 考试试题小题列表
+    @PostMapping("/train/exam/question/xiaoti/list")
+    public ApiResult<List<ExamQuestionXiaoTiListApiResp>> examQuestionXiaoTiList(@RequestBody @Validated ExamQuestionXiaoTiListReq req) {
+        List<ExamQuestionXiaoTiListApiResp> apiResp = expertService.listExamQuestionXiaoTi(req);
+        return ApiResult.successWithResult(apiResp);
+    }
 
 
     // 课程详情 课节 详情
@@ -338,13 +371,5 @@ public class ExpertController extends AbstractBaseController {
         return ApiResult.successWithResult(expertService.listPeiXunKeChengKeJieFuJian(req));
     }
 
-    // 课程详情 课节 附件 详情
-    @PostMapping("/peiXun/kecheng/kejie/fujian/get")
-    public ApiResult<PeiXunKeChengKeJieFuJianGetResp> getPeiXunKeChengKeJieFuJian(@RequestBody @Validated PeiXunKeChengKeJieFuJianGetReq req) {
-        return ApiResult.successWithResult(expertService.getPeiXunKeChengKeJieFuJian(req));
-    }
-
-
-
 
 }

src/main/java/com/cnooc/expert/controller/expert/ExpertMockController.java

@@ -7,12 +7,15 @@ import com.cnooc.expert.controller.expert.model.request.CommonFuJianListReq;
 import com.cnooc.expert.controller.expert.model.request.DictNofilterListReq;
 import com.cnooc.expert.controller.expert.model.request.DongJieGetReq;
 import com.cnooc.expert.controller.expert.model.request.DongJiePageReq;
+import com.cnooc.expert.controller.expert.model.request.ExamPaperGetReq;
+import com.cnooc.expert.controller.expert.model.request.ExamQuestionListReq;
+import com.cnooc.expert.controller.expert.model.request.ExamQuestionXiaoTiListReq;
+import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
 import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq;
 import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianGetReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianListReq;
 import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieGetReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
@@ -32,12 +35,14 @@ import com.cnooc.expert.controller.expert.model.response.CityTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
 import com.cnooc.expert.controller.expert.model.response.DongJieGetResp;
 import com.cnooc.expert.controller.expert.model.response.DongJiePageResp;
+import com.cnooc.expert.controller.expert.model.response.ExamQuestionListResp;
+import com.cnooc.expert.controller.expert.model.response.ExamQuestionXiaoTiListResp;
+import com.cnooc.expert.controller.expert.model.response.ExamRecordSaveResp;
 import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
 import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
 import com.cnooc.expert.controller.expert.model.response.KaoShiPageResp;
 import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
 import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianGetResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianListResp;
 import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetResp;
 import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJiePageResp;
 import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
@@ -46,14 +51,17 @@ import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuPageResp
 import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.QingJiaJinJiApplyResp;
 import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp;
+import com.cnooc.expert.controller.expert.model.response.TempExamPaperGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiPageResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
 import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.TainLessonProgressUpdateApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonGetApiResp;
-import com.cnooc.expert.external.expert.model.response.TrainCourseLessonPageApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainExamPageApiResp;
 import com.cnooc.expert.service.ExpertMockService;
 import lombok.AllArgsConstructor;
@@ -339,6 +347,57 @@ public class ExpertMockController extends AbstractBaseController {
         return ApiResult.successWithResult(apiResp);
     }
 
+    // 查询试卷信息
+    @PostMapping("/train/exam/paper/get")
+    public ApiResult<TempExamPaperGetResp> examPaperGet(@RequestBody @Validated ExamPaperGetReq req) {
+        TempExamPaperGetResp apiResp = expertMockService.getTempExamPaper(req.getExamPaperGuid());
+        return ApiResult.successWithResult(apiResp);
+    }
+
+    // 获取系统时间
+    @PostMapping("/common/systemtime/get")
+    public ApiResult<Long> getCommonSystemtime() {
+        return ApiResult.successWithResult(expertMockService.getSystemTime());
+    }
+
+    // 保存考试记录
+    @PostMapping("/train/exam/record/save")
+    public ApiResult<ExamRecordSaveResp> examRecordSave(@RequestBody @Validated ExamRecordSaveReq req) {
+        ExamRecordSaveResp apiResp = expertMockService.saveExamRecord(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
+    // 考试试题列表
+    @PostMapping("/train/exam/question/list")
+    public ApiResult<List<ExamQuestionListResp>> examQuestionList(@RequestBody @Validated ExamQuestionListReq req) {
+        List<ExamQuestionListResp> apiResp = expertMockService.listExamQuestion(req.getExamPaperGuid());
+        return ApiResult.successWithResult(apiResp);
+    }
+
+    // 考试试题小题列表
+    @PostMapping("/train/exam/question/xiaoti/list")
+    public ApiResult<List<ExamQuestionXiaoTiListResp>> examQuestionXiaoTiList(@RequestBody @Validated ExamQuestionXiaoTiListReq req) {
+        List<ExamQuestionXiaoTiListResp> apiResp = expertMockService.listExamQuestionXiaoTi(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -359,7 +418,6 @@ public class ExpertMockController extends AbstractBaseController {
     }
 
 
-
     // 课程详情 课节 附件 详情
     @PostMapping("/peiXun/kecheng/kejie/fujian/get")
     public ApiResult<PeiXunKeChengKeJieFuJianGetResp> getPeiXunKeChengKeJieFuJian(@RequestBody @Validated PeiXunKeChengKeJieFuJianGetReq req) {

src/main/java/com/cnooc/expert/controller/expert/model/request/ExamPaperGetReq.java

+package com.cnooc.expert.controller.expert.model.request;
+
+import lombok.Data;
+
+@Data
+public class ExamPaperGetReq {
+
+    private String examPaperGuid;
+
+}

src/main/java/com/cnooc/expert/controller/expert/model/request/ExamQuestionListReq.java

+package com.cnooc.expert.controller.expert.model.request;
+
+import lombok.Data;
+
+@Data
+public class ExamQuestionListReq {
+
+    private String examPaperGuid;
+
+}

src/main/java/com/cnooc/expert/controller/expert/model/request/ExamQuestionXiaoTiListReq.java

+package com.cnooc.expert.controller.expert.model.request;
+
+import lombok.Data;
+
+@Data
+public class ExamQuestionXiaoTiListReq {
+
+    /**
+     *  试卷guid
+     */
+    private String shiJuanGuid;
+
+    /**
+     *  大题guid
+     */
+    private String daTiGuid;
+}

src/main/java/com/cnooc/expert/controller/expert/model/request/ExamRecordSaveReq.java

+package com.cnooc.expert.controller.expert.model.request;
+
+import lombok.Data;
+
+@Data
+public class ExamRecordSaveReq {
+
+
+    private String zhuanJiaGuid;
+
+    /** 课程Guid*/
+    private String courseGuid;
+
+    /** 试卷Guid*/
+    private String shiJuanGuid;
+
+    /** 考试类型枚举*/
+    private Integer examType;
+
+    /** 课节Guid*/
+    private String lessonGuid;
+
+    /** 课节Guid*/
+    private String businessExamGuid;
+
+}

src/main/java/com/cnooc/expert/controller/expert/model/request/ExpertInfoUpdateApiReq.java

 package com.cnooc.expert.controller.expert.model.request;
 
-import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
 import lombok.Builder;
 import lombok.Data;
 
@@ -521,9 +520,13 @@ public class ExpertInfoUpdateApiReq {
         private String fuJianGuid;
         private Boolean isRenew;
         private Short zhuanJiaQinRenQi;
-        /** 解聘原因，10:专家主动退库,20:到期清退,30:到龄清退,40:管理员清退 */
+        /**
+         * 解聘原因，10:专家主动退库,20:到期清退,30:到龄清退,40:管理员清退
+         */
         private Short jiePinYuanYinType;
-        /** 续期原因类型,0:其他;1:聘任到期; */
+        /**
+         * 续期原因类型,0:其他;1:聘任到期;
+         */
         private Short renewYuanyinType;
         private String renewJutiYuanyin;
     }

src/main/java/com/cnooc/expert/controller/expert/model/response/ExamQuestionListResp.java

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ExamQuestionListResp {
+
+    // 试题大题Guid
+    private String shiTiDaTiGuid;
+
+    // 试卷Guid
+    private String shiJuanGuid;
+
+    // 试题管理大题Guid
+    private String shiTiManagerDaTiGuid;
+
+    // 大题名称
+    private String daTiName;
+
+    // 小题数量
+    private Integer xiaoTiNum;
+
+    // 大题分数
+    private Double score;
+
+    // 小题分数
+    private Double xiaoTiScore;
+
+    // 是否已删除
+    private Boolean isDeleted;
+
+    // 题目类型
+    private Integer tiMuType;//临时字段  来自 ShiTiManagerDaTi对象
+
+}

src/main/java/com/cnooc/expert/controller/expert/model/response/ExamQuestionXiaoTiListResp.java

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@Builder
+public class ExamQuestionXiaoTiListResp {
+
+    private String shiTiManagerXiaoTiGuid;//主键
+
+    private String xiaoTiName;//小题题目名称
+
+    private Long createTime;//创建时间
+
+    private String createTimeText;//修改时间
+
+    private String creatorGuid;//创建人Guid
+
+    private String creatorName;//创建人名称
+
+    private Long modifyTime;//修改时间
+
+    private String modifyTimeText;//修改时间
+
+    private String modifierGuid;//修改人Guid
+
+    private String modifierName;//修改人名称
+
+    private String shiTiManagerDaTiGuid;//题目所属大题的Guid
+
+    private List<ShiTiManagerDaAn> daAnList;//小题对应的答案集合（oneToMany）
+
+    private BigDecimal xiaoTiScore;//小题分值
+
+    private String remark;//备注
+
+    private ShiTiManagerDaTi daTi;//小题所属的大题（ManyToOne）
+
+    private String userDaAnGuid;//专家考试时选中的答案Guid。  瞬时变量
+
+    @Data
+    @Builder
+    public static class ShiTiManagerDaAn {
+
+        private String shiTiManagerDaAnGuid;//主键
+
+        private String daAnName;//答案名称
+
+        private String isDaAn;//easyui BUG 须用字符串
+
+        private Long createTime;
+
+        private String createTimeText;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private Long modifyTime;
+
+        private String modifyTimeText;
+
+        private String modifierGuid;
+
+        private String modifierName;
+
+        private String shiTiManagerXiaoTiGuid;//答案对应的题目Guid
+
+        private Integer sort; //排序
+    }
+
+    @Data
+    @Builder
+    public static class ShiTiManagerDaTi {
+
+        private String shiTiManagerDaTiGuid;//主键
+
+        private String daTiName;//大题名称
+
+        private BigDecimal xiaoTiScore;//大题下面每个小题的分数
+
+        private String xiaoTiScoreText;
+
+        private Integer tiMuType;//题目类型  对应枚举TiMuType
+
+        private String tiMuTypeText;
+
+        private String remark;//备注
+
+        private Long createTime;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private Long modifyTime;
+
+        private String modifierGuid;
+
+        private String modifierName;
+
+        private BigDecimal daTiScore;//大题总分值
+    }
+
+}

src/main/java/com/cnooc/expert/controller/expert/model/response/ExamRecordSaveResp.java

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ExamRecordSaveResp {
+
+    private String kaoShiJiLuGuid;
+
+    private String zhuanJiaGuid;
+
+    private Long kaoShiStartTime;
+
+    private Long kaoShiEndTime;
+
+    /** 试卷Guid*/
+    private String shiJuanGuid;
+
+    /** 课节Guid*/
+    private String lessonGuid;
+
+    /** 考试结果*/
+    private Integer examResult;
+
+    /** 考试交卷时间*/
+    private Long examSubmitTimestamp;
+
+    /** 考试类型 课后考试 10，业务考试 20*/
+    private Integer examType;
+
+}

src/main/java/com/cnooc/expert/controller/expert/model/response/TempExamPaperGetResp.java

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class TempExamPaperGetResp {
+
+    private Long time;
+
+    private ShiTiShiJuan shiJuans;
+
+    private Long examTime;
+
+    private ShiTiExam exam;
+
+    @Data
+    @Builder
+    public static class ShiTiShiJuan {
+
+        /**
+         * 试卷Guid
+         */
+        private String shiJuanGuid;
+
+        /**
+         * 试卷名称
+         */
+        private String shiJuanName;
+
+        /**
+         * 试卷满分
+         */
+        private Double score;
+
+        /**
+         * 及格分
+         */
+        private Double jiGeScore;
+
+        /**
+         * 试卷类型
+         */
+        private Integer shiJuanType;
+
+        /**
+         * 发布状态
+         */
+        private Boolean faBuZhuangTai;
+
+        /**
+         * 考试时间
+         */
+        private Long kaoShiTime;
+
+        /**
+         * 课程Guid
+         */
+        private String beiZhu;
+
+        /**
+         * 课程Guid
+         */
+        private String shiTiManagerXiaoTiGuids;
+
+        /**
+         * 课程Guid
+         */
+        private String shiJuanShuoMing;
+    }
+
+    @Data
+    @Builder
+    public static class ShiTiExam {
+
+        private String shiTiExamGuid;
+
+        private Long shiTiExamStartTime;
+
+        private Long shiTiExamOverPlusTime;
+
+        private String shiTiManagerXiaoTiGuids;
+
+        private String shiTiManagerDaTiGuids;
+
+        private String shiJuanGuid;
+
+        private String creatorGuid;
+
+        private Long modifyTime;
+
+        private String modifilyGuid;
+    }
+
+}

src/main/java/com/cnooc/expert/external/expert/api/ExpertServiceApi.java

 package com.cnooc.expert.external.expert.api;
 
+import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
 import com.cnooc.expert.external.expert.model.request.CityTreeApiReq;
@@ -10,12 +12,15 @@ import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiRe
 import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieGetApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamQuestionListApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamRecordSaveApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
 import com.cnooc.expert.external.expert.model.request.GeRenXiuJiaApplyApiReq;
 import com.cnooc.expert.external.expert.model.request.GeRenXiuJiaPageApiReq;
 import com.cnooc.expert.external.expert.model.request.JinJiQingJiaApplyApiReq;
 import com.cnooc.expert.external.expert.model.request.JinJiQingJiaPageApiReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
+import com.cnooc.expert.external.expert.model.request.TempExamPaperGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseLessonGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseLessonPageApiReq;
@@ -31,12 +36,15 @@ import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiR
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaApplyApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaPageApiResp;
 import com.cnooc.expert.external.expert.model.response.JinJiQingJiaApplyApiResp;
 import com.cnooc.expert.external.expert.model.response.JinJiQingJiaPageApiResp;
 import com.cnooc.expert.external.expert.model.response.TainLessonProgressUpdateApiResp;
+import com.cnooc.expert.external.expert.model.response.TempExamPaperGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonPageApiResp;
@@ -67,9 +75,12 @@ public interface ExpertServiceApi {
     Call<ApiBaseResult<ExpertInfoGetApiResp>> updateExpertInfoApi(@HeaderMap Map<String, Object> headers, @Body ExpertInfoUpdateApiReq req);
 
     /* 字典、枚举 */
-    @POST("/api/mini/common/nofilter/getEnum")
+    @POST("/api/saas-expert/mini/common/nofilter/getEnum")
     Call<ApiBaseResult<List<CommonNofilterEnumGetApiResp>>> getCommonNofilterEnumApi(@HeaderMap Map<String, Object> headers, @Body CommonNofilterEnumGetApiReq req);
 
+    @POST("/api/saas-expert/mini/common/nofilter/getSystemTime")
+    Call<ApiBaseResult<Long>> getCommonNofilterSystemTimeApi(@HeaderMap Map<String, Object> headers);
+
     /* 字典、枚举 */
     @POST("/api/mini/common/listJiTuanErJiDanWei")
     Call<ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>>> listCommonJiTuanErJiDanWeiApi(@HeaderMap Map<String, Object> headers, @Body CommonJiTuanErJiDanWeiListApiReq req);
@@ -156,6 +167,24 @@ public interface ExpertServiceApi {
     @POST("/api/saas-expert/mini/train/expert/updateTrainLessonProgress")
     Call<ApiBaseResult<TainLessonProgressUpdateApiResp>> updateTainLessonProgressApi(@HeaderMap Map<String, Object> headers, @Body TainLessonProgressUpdateApiReq req);
 
+    // 课后考试列表
     @POST("/api/saas-expert/mini/train/exam/pageExpertLessonExamRecord")
     Call<ApiBaseResult<ApiBasePageResp<TrainExamPageApiResp>>> pageTrainExamApi(@HeaderMap Map<String, Object> headers, @Body TrainExamPageApiReq req);
+
+    // 考试试卷信息
+    @POST("/api/saas-expert/mini/train/exam/queryTempExamPaper")
+    Call<ApiBaseResult<TempExamPaperGetApiResp>> getTempExamPaperApi(@HeaderMap Map<String, Object> headers, @Body TempExamPaperGetApiReq req);
+
+    // 保存考试记录
+    @POST("/api/saas-expert/mini/train/exam/saveExpertExamRecord")
+    Call<ApiBaseResult<ExamRecordSaveApiResp>> saveExamRecordApi(@HeaderMap Map<String, Object> headers, @Body ExamRecordSaveApiReq req);
+
+    // 考试试题列表
+    @POST("/api/saas-expert/mini/train/exam/listExamMainQuestion")
+    Call<ApiBaseResult<List<ExamQuestionListApiResp>>> listExamQuestionApi(@HeaderMap Map<String, Object> headers, @Body ExamQuestionListApiReq req);
+
+    // 考试试题小题列表
+    @POST("/api/saas-expert/mini/zjfw/PXXX/queryXiaoTiList")
+    Call<ApiBaseResult<List<ExamQuestionXiaoTiListApiResp>>> listExamQuestionXiaoTiApi(@HeaderMap Map<String, Object> headers, @Body ExamQuestionXiaoTiListApiReq req);
+
 }

src/main/java/com/cnooc/expert/external/expert/model/request/ExamQuestionListApiReq.java

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ExamQuestionListApiReq {
+
+    /** 课程Guid*/
+    private String examPaperGuid;
+
+}

src/main/java/com/cnooc/expert/external/expert/model/request/ExamQuestionXiaoTiListApiReq.java

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ExamQuestionXiaoTiListApiReq {
+
+    /**
+     *  试卷guid
+     */
+    private String shiJuanGuid;
+
+    /**
+     *  大题guid
+     */
+    private String daTiGuid;
+
+}

src/main/java/com/cnooc/expert/external/expert/model/request/ExamRecordSaveApiReq.java

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ExamRecordSaveApiReq {
+
+    /** 课节Guid*/
+    private String zhuanJiaGuid;
+
+    /** 试卷Guid*/
+    private String shiJuanGuid;
+
+    /** 课节Guid*/
+    private String lessonGuid;
+
+    /** 课程Guid*/
+    private String courseGuid;
+
+    /** 课节Guid*/
+    private String businessExamGuid;
+
+    /** 考试类型枚举*/
+    private Integer examType;
+
+}

src/main/java/com/cnooc/expert/external/expert/model/request/TempExamPaperGetApiReq.java

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class TempExamPaperGetApiReq {
+
+    private String examPaperGuid;
+
+}

src/main/java/com/cnooc/expert/external/expert/model/response/ExamQuestionListApiResp.java

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class ExamQuestionListApiResp {
+
+    // 试题大题Guid
+    private String shiTiDaTiGuid;
+
+    // 试卷Guid
+    private String shiJuanGuid;
+
+    // 试题管理大题Guid
+    private String shiTiManagerDaTiGuid;
+
+    // 大题名称
+    private String daTiName;
+
+    // 小题数量
+    private Integer xiaoTiNum;
+
+    // 大题分数
+    private Double score;
+
+    // 小题分数
+    private Double xiaoTiScore;
+
+    // 是否已删除
+    private Boolean isDeleted;
+
+    // 题目类型
+    private Integer tiMuType;//临时字段  来自 ShiTiManagerDaTi对象
+    
+}

src/main/java/com/cnooc/expert/external/expert/model/response/ExamQuestionXiaoTiListApiResp.java

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ExamQuestionXiaoTiListApiResp {
+
+    private String shiTiManagerXiaoTiGuid;//主键
+
+    private String xiaoTiName;//小题题目名称
+
+    private Long createTime;//创建时间
+
+    private String creatorGuid;//创建人Guid
+
+    private String creatorName;//创建人名称
+
+    private Long modifyTime;//修改时间
+
+    private String modifierGuid;//修改人Guid
+
+    private String modifierName;//修改人名称
+
+    private String shiTiManagerDaTiGuid;//题目所属大题的Guid
+
+    private List<ShiTiManagerDaAn> daAnList;//小题对应的答案集合（oneToMany）
+
+    private BigDecimal xiaoTiScore;//小题分值
+
+    private String remark;//备注
+
+    private ShiTiManagerDaTi daTi;//小题所属的大题（ManyToOne）
+
+    private String userDaAnGuid;//专家考试时选中的答案Guid。  瞬时变量
+
+    @Data
+    public static class ShiTiManagerDaAn {
+
+        private String shiTiManagerDaAnGuid;//主键
+
+        private String daAnName;//答案名称
+
+        private String isDaAn;//easyui BUG 须用字符串
+
+        private Long createTime;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private Long modifyTime;
+
+        private String modifierGuid;
+
+        private String modifierName;
+
+        private String shiTiManagerXiaoTiGuid;//答案对应的题目Guid
+
+        private Short sort; //排序
+    }
+
+    @Data
+    public static class ShiTiManagerDaTi {
+
+        private String shiTiManagerDaTiGuid;//主键
+
+        private String daTiName;//大题名称
+
+        private BigDecimal xiaoTiScore;//大题下面每个小题的分数
+
+        private Short tiMuType;//题目类型  对应枚举TiMuType
+
+        private String remark;//备注
+
+        private Long createTime;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private Long modifyTime;
+
+        private String modifierGuid;
+
+        private String modifierName;
+
+        private BigDecimal daTiScore;//大题总分值
+    }
+
+}

src/main/java/com/cnooc/expert/external/expert/model/response/ExamRecordSaveApiResp.java

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class ExamRecordSaveApiResp {
+
+    private String kaoShiJiLuGuid;
+
+    private String zhuanJiaGuid;
+
+    private Long kaoShiStartTime;
+
+    private Long kaoShiEndTime;
+
+    /** 试卷Guid*/
+    private String shiJuanGuid;
+
+    /** 课节Guid*/
+    private String lessonGuid;
+
+    /** 考试结果*/
+    private Integer examResult;
+
+    /** 考试交卷时间*/
+    private Long examSubmitTimestamp;
+
+    /** 考试类型 课后考试 10，业务考试 20*/
+    private Integer examType;
+
+}

src/main/java/com/cnooc/expert/external/expert/model/response/TempExamPaperGetApiResp.java

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class TempExamPaperGetApiResp {
+
+    private Long time;
+
+    private ShiTiShiJuan shiJuans;
+
+    private Long examTime;
+
+    private ShiTiExam exam;
+
+    @Data
+    public class ShiTiShiJuan {
+
+        /** 试卷Guid*/
+        private String shiJuanGuid;
+
+        /** 试卷名称*/
+        private String shiJuanName;
+
+        /** 试卷满分*/
+        private Double score;
+
+        /** 及格分*/
+        private Double jiGeScore;
+
+        /** 试卷类型*/
+        private Short shiJuanType;
+
+        /** 发布状态*/
+        private Boolean faBuZhuangTai;
+
+        /** 考试时间*/
+        private Long kaoShiTime;
+
+        /** 课程Guid*/
+        private String beiZhu;
+
+        /** 课程Guid*/
+        private String shiTiManagerXiaoTiGuids;
+
+        /** 课程Guid*/
+        private String shiJuanShuoMing;
+
+    }
+
+    @Data
+    public class ShiTiExam {
+
+        private String shiTiExamGuid;
+
+        private Long shiTiExamStartTime;
+
+        private Long shiTiExamOverPlusTime;
+
+        private String shiTiManagerXiaoTiGuids;
+
+        private String shiTiManagerDaTiGuids;
+
+        private String shiJuanGuid;
+
+        private String creatorGuid;
+
+        private Long modifyTime;
+
+        private String modifilyGuid;
+    }
+
+}

src/main/java/com/cnooc/expert/external/expert/service/ExpertServiceClient.java

 package com.cnooc.expert.external.expert.service;
 
+import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.common.AbstractRetrofitManager;
 import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
@@ -12,12 +14,15 @@ import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiRe
 import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieGetApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamQuestionListApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamRecordSaveApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
 import com.cnooc.expert.external.expert.model.request.GeRenXiuJiaApplyApiReq;
 import com.cnooc.expert.external.expert.model.request.GeRenXiuJiaPageApiReq;
 import com.cnooc.expert.external.expert.model.request.JinJiQingJiaApplyApiReq;
 import com.cnooc.expert.external.expert.model.request.JinJiQingJiaPageApiReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
+import com.cnooc.expert.external.expert.model.request.TempExamPaperGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseLessonGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseLessonPageApiReq;
@@ -33,12 +38,15 @@ import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiR
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaApplyApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaPageApiResp;
 import com.cnooc.expert.external.expert.model.response.JinJiQingJiaApplyApiResp;
 import com.cnooc.expert.external.expert.model.response.JinJiQingJiaPageApiResp;
 import com.cnooc.expert.external.expert.model.response.TainLessonProgressUpdateApiResp;
+import com.cnooc.expert.external.expert.model.response.TempExamPaperGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonPageApiResp;
@@ -94,6 +102,12 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         return this.getResponseBody(call, "getCommonNofilterEnum");
     }
 
+    public ApiBaseResult<Long> getCommonNofilterSystemTime() {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<Long>> call = expertServiceApi.getCommonNofilterSystemTimeApi(headers);
+        return this.getResponseBody(call, "getCommonNofilterSystemTime");
+    }
+
     public ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>> listCommonJiTuanErJiDanWei(CommonJiTuanErJiDanWeiListApiReq req) {
         Map<String, Object> headers = super.getHeaders();
         Call<ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>>> call = expertServiceApi.listCommonJiTuanErJiDanWeiApi(headers, req);
@@ -241,4 +255,33 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         return this.getResponseBody(call, "pageTrainExam");
     }
 
+    // 考试试卷信息
+    public ApiBaseResult<TempExamPaperGetApiResp> getTempExamPaper(TempExamPaperGetApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<TempExamPaperGetApiResp>> call = expertServiceApi.getTempExamPaperApi(headers, req);
+        return this.getResponseBody(call, "getTempExamPaper");
+    }
+
+    // 保存考试记录
+    public ApiBaseResult<ExamRecordSaveApiResp> saveExamRecord(ExamRecordSaveApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ExamRecordSaveApiResp>> call = expertServiceApi.saveExamRecordApi(headers, req);
+        return this.getResponseBody(call, "saveExamRecord");
+    }
+
+    // 题库试题列表
+    public ApiBaseResult<List<ExamQuestionListApiResp>> listExamQuestion(ExamQuestionListApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<List<ExamQuestionListApiResp>>> call = expertServiceApi.listExamQuestionApi(headers, req);
+        return this.getResponseBody(call, "listExamQuestion");
+    }
+
+    // 题库试题小题列表
+    public ApiBaseResult<List<ExamQuestionXiaoTiListApiResp>> listExamQuestionXiaoTi(ExamQuestionXiaoTiListApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<List<ExamQuestionXiaoTiListApiResp>>> call = expertServiceApi.listExamQuestionXiaoTiApi(headers, req);
+        return this.getResponseBody(call, "listExamQuestionXiaoTi");
+    }
+
+
 }

src/main/java/com/cnooc/expert/service/ExpertService.java

@@ -5,6 +5,9 @@ import com.cnooc.expert.controller.expert.model.request.CommonFuJianListReq;
 import com.cnooc.expert.controller.expert.model.request.DictNofilterListReq;
 import com.cnooc.expert.controller.expert.model.request.DongJieGetReq;
 import com.cnooc.expert.controller.expert.model.request.DongJiePageReq;
+
+import com.cnooc.expert.controller.expert.model.request.ExamQuestionXiaoTiListReq;
+import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
@@ -39,6 +42,9 @@ import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiRe
 import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieGetApiReq;
 import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamQuestionListApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
+import com.cnooc.expert.external.expert.model.request.ExamRecordSaveApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
 import com.cnooc.expert.external.expert.model.request.GeRenXiuJiaApplyApiReq;
@@ -46,6 +52,7 @@ import com.cnooc.expert.external.expert.model.request.GeRenXiuJiaPageApiReq;
 import com.cnooc.expert.external.expert.model.request.JinJiQingJiaApplyApiReq;
 import com.cnooc.expert.external.expert.model.request.JinJiQingJiaPageApiReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
+import com.cnooc.expert.external.expert.model.request.TempExamPaperGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseLessonGetApiReq;
 import com.cnooc.expert.external.expert.model.request.TrainCourseLessonPageApiReq;
@@ -61,12 +68,16 @@ import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiR
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
+import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaApplyApiResp;
 import com.cnooc.expert.external.expert.model.response.GeRenXiuJiaPageApiResp;
 import com.cnooc.expert.external.expert.model.response.JinJiQingJiaApplyApiResp;
 import com.cnooc.expert.external.expert.model.response.JinJiQingJiaPageApiResp;
 import com.cnooc.expert.external.expert.model.response.TainLessonProgressUpdateApiResp;
+import com.cnooc.expert.external.expert.model.response.TempExamPaperGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonGetApiResp;
 import com.cnooc.expert.external.expert.model.response.TrainCourseLessonPageApiResp;
@@ -107,6 +118,15 @@ public class ExpertService {
         return apiResp.getData();
     }
 
+    public Long getSystemTime() {
+        CommonNofilterEnumGetApiReq apiReq = CommonNofilterEnumGetApiReq.builder()
+                .name("MinZu")
+                .build();
+        ApiBaseResult<Long> apiResp = expertServiceClient.getCommonNofilterSystemTime();
+
+        return apiResp.getData();
+    }
+
     public List<CommonJiTuanErJiDanWeiListApiResp> listSecondaryUnit() {
         CommonJiTuanErJiDanWeiListApiReq apiReq = CommonJiTuanErJiDanWeiListApiReq.builder()
                 .tenantId(UserInfoUtils.TENANT_ID)
@@ -500,6 +520,51 @@ public class ExpertService {
                 .build();
     }
 
+    // 考试试卷信息
+    public TempExamPaperGetApiResp getTempExamPaper(String examPaperGuid) {
+        TempExamPaperGetApiReq apiReq = TempExamPaperGetApiReq.builder()
+                .examPaperGuid(examPaperGuid)
+                .build();
+        ApiBaseResult<TempExamPaperGetApiResp> apiResp = expertServiceClient.getTempExamPaper(apiReq);
+
+        return apiResp.getData();
+    }
+
+    // 保存考试记录
+    public ExamRecordSaveApiResp saveExamRecord(ExamRecordSaveReq req) {
+        ExamRecordSaveApiReq apiReq = ExamRecordSaveApiReq.builder()
+                .zhuanJiaGuid(req.getZhuanJiaGuid())
+                .shiJuanGuid(req.getShiJuanGuid())
+                .lessonGuid(req.getLessonGuid())
+                .courseGuid(req.getCourseGuid())
+                .businessExamGuid(req.getBusinessExamGuid())
+                .examType(req.getExamType())
+                .build();
+        ApiBaseResult<ExamRecordSaveApiResp> apiResp = expertServiceClient.saveExamRecord(apiReq);
+
+        return apiResp.getData();
+    }
+
+    // 考试试题列表
+    public List<ExamQuestionListApiResp> listExamQuestion(String examPaperGuid) {
+        ExamQuestionListApiReq apiReq = ExamQuestionListApiReq.builder()
+                .examPaperGuid(examPaperGuid)
+                .build();
+        ApiBaseResult<List<ExamQuestionListApiResp>> apiResp = expertServiceClient.listExamQuestion(apiReq);
+
+        return apiResp.getData();
+    }
+
+    // 考试试题小题列表
+    public List<ExamQuestionXiaoTiListApiResp> listExamQuestionXiaoTi(ExamQuestionXiaoTiListReq req) {
+        ExamQuestionXiaoTiListApiReq apiReq = ExamQuestionXiaoTiListApiReq.builder()
+                .shiJuanGuid(req.getShiJuanGuid())
+                .daTiGuid(req.getDaTiGuid())
+                .build();
+        ApiBaseResult<List<ExamQuestionXiaoTiListApiResp>> apiResp = expertServiceClient.listExamQuestionXiaoTi(apiReq);
+
+        return apiResp.getData();
+    }
 
     public List<PeiXunKeChengKeJieFuJianListResp> listPeiXunKeChengKeJieFuJian(PeiXunKeChengKeJieFuJianListReq req) {
         ArrayList<PeiXunKeChengKeJieFuJianListResp> result = Lists.newArrayList(
@@ -523,7 +588,6 @@ public class ExpertService {
         return result;
     }
 
-
     public BasePageResp<KaoShiPageResp> pageKaoShi(KaoShiPageReq req) {
         List<KaoShiPageResp> list = Arrays.asList(
                 KaoShiPageResp.builder()
@@ -691,5 +755,4 @@ public class ExpertService {
                 .build();
     }
 
-
 }