add train exam

src/main/java/com/cnooc/expert/config/RetrofitDevConfiguration.java

@@ -23,7 +23,7 @@ public class RetrofitDevConfiguration {
     @Bean("retrofitExpert")
     @Primary
     public Retrofit RetrofitExpert(Gson gson) {
-        return createRetrofit("https://dev.randomuser.me/", gson);
+        return createRetrofit("https://purb.d-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -33,7 +33,7 @@ public class RetrofitDevConfiguration {
      */
     @Bean("retrofitWorkflow")
     public Retrofit RetrofitWorkflow(Gson gson) {
-        return createRetrofit("https://dev.randomuser.com/", gson);
+        return createRetrofit("https://purb.d-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -43,7 +43,7 @@ public class RetrofitDevConfiguration {
      */
     @Bean("retrofitPortal")
     public Retrofit RetrofitPortal(Gson gson) {
-        return createRetrofit("https://dev.randomuser.cn/", gson);
+        return createRetrofit("https://ex.d-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -53,7 +53,17 @@ public class RetrofitDevConfiguration {
      */
     @Bean("retrofitSubject")
     public Retrofit RetrofitSubject(Gson gson) {
-        return createRetrofit("https://dev.randomuser.cn.com/", gson);
+        return createRetrofit("https://purb.d-bid.cnooc.com.cn/", gson);
+    }
+
+    /**
+     * 文件服务
+     * @param gson
+     * @return
+     */
+    @Bean("retrofitFile")
+    public Retrofit RetrofitFile(Gson gson) {
+        return createRetrofit("https://purb.d-bid.cnooc.com.cn/", gson);
     }
 
     private Retrofit createRetrofit(String baseUrl, Gson gson) {

src/main/java/com/cnooc/expert/config/RetrofitPreConfiguration.java

@@ -23,7 +23,7 @@ public class RetrofitPreConfiguration {
     @Bean("retrofitExpert")
     @Primary
     public Retrofit RetrofitExpert(Gson gson) {
-        return createRetrofit("https://pre.randomuser.me/", gson);
+        return createRetrofit("https://purb.m-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -33,7 +33,7 @@ public class RetrofitPreConfiguration {
      */
     @Bean("retrofitWorkflow")
     public Retrofit RetrofitWorkflow(Gson gson) {
-        return createRetrofit("https://pre.randomuser.com/", gson);
+        return createRetrofit("https://purb.m-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -43,7 +43,7 @@ public class RetrofitPreConfiguration {
      */
     @Bean("retrofitPortal")
     public Retrofit RetrofitPortal(Gson gson) {
-        return createRetrofit("https://pre.randomuser.cn/", gson);
+        return createRetrofit("https://ex.m-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -53,7 +53,17 @@ public class RetrofitPreConfiguration {
      */
     @Bean("retrofitSubject")
     public Retrofit RetrofitSubject(Gson gson) {
-        return createRetrofit("https://pre.randomuser.cn.com/", gson);
+        return createRetrofit("https://purb.m-bid.cnooc.com.cn/", gson);
+    }
+
+    /**
+     * 文件服务
+     * @param gson
+     * @return
+     */
+    @Bean("retrofitFile")
+    public Retrofit RetrofitFile(Gson gson) {
+        return createRetrofit("https://purb.m-bid.cnooc.com.cn/", gson);
     }
 
     private Retrofit createRetrofit(String baseUrl, Gson gson) {

src/main/java/com/cnooc/expert/config/RetrofitProdConfiguration.java

@@ -23,7 +23,7 @@ public class RetrofitProdConfiguration {
     @Bean("retrofitExpert")
     @Primary
     public Retrofit RetrofitExpert(Gson gson) {
-        return createRetrofit("https://prod.randomuser.me/", gson);
+        return createRetrofit("https://purb.bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -33,7 +33,7 @@ public class RetrofitProdConfiguration {
      */
     @Bean("retrofitWorkflow")
     public Retrofit RetrofitWorkflow(Gson gson) {
-        return createRetrofit("https://prod.randomuser.com/", gson);
+        return createRetrofit("https://purb.bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -43,7 +43,7 @@ public class RetrofitProdConfiguration {
      */
     @Bean("retrofitPortal")
     public Retrofit RetrofitPortal(Gson gson) {
-        return createRetrofit("https://prod.randomuser.cn/", gson);
+        return createRetrofit("https://ex.bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -53,7 +53,17 @@ public class RetrofitProdConfiguration {
      */
     @Bean("retrofitSubject")
     public Retrofit RetrofitSubject(Gson gson) {
-        return createRetrofit("https://prod.randomuser.cn.com/", gson);
+        return createRetrofit("https://purb.bid.cnooc.com.cn/", gson);
+    }
+
+    /**
+     * 文件服务
+     * @param gson
+     * @return
+     */
+    @Bean("retrofitFile")
+    public Retrofit RetrofitFile(Gson gson) {
+        return createRetrofit("https://purb.bid.cnooc.com.cn/", gson);
     }
 
     private Retrofit createRetrofit(String baseUrl, Gson gson) {

src/main/java/com/cnooc/expert/config/RetrofitTestConfiguration.java

@@ -23,7 +23,7 @@ public class RetrofitTestConfiguration {
     @Bean("retrofitExpert")
     @Primary
     public Retrofit RetrofitExpert(Gson gson) {
-        return createRetrofit("https://test.randomuser.me/", gson);
+        return createRetrofit("https://purb.t-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -33,7 +33,7 @@ public class RetrofitTestConfiguration {
      */
     @Bean("retrofitWorkflow")
     public Retrofit RetrofitWorkflow(Gson gson) {
-        return createRetrofit("https://test.randomuser.com/", gson);
+        return createRetrofit("https://purb.t-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -43,7 +43,7 @@ public class RetrofitTestConfiguration {
      */
     @Bean("retrofitPortal")
     public Retrofit RetrofitPortal(Gson gson) {
-        return createRetrofit("https://test.randomuser.cn/", gson);
+        return createRetrofit("https://ex.t-bid.cnooc.com.cn/", gson);
     }
 
     /**
@@ -53,7 +53,17 @@ public class RetrofitTestConfiguration {
      */
     @Bean("retrofitSubject")
     public Retrofit RetrofitSubject(Gson gson) {
-        return createRetrofit("https://test.randomuser.cn.com/", gson);
+        return createRetrofit("https://purb.t-bid.cnooc.com.cn/", gson);
+    }
+
+    /**
+     * 文件服务
+     * @param gson
+     * @return
+     */
+    @Bean("retrofitFile")
+    public Retrofit RetrofitFile(Gson gson) {
+        return createRetrofit("https://purb.t-bid.cnooc.com.cn/", gson);
     }
 
     private Retrofit createRetrofit(String baseUrl, Gson gson) {

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

@@ -3,6 +3,7 @@ package com.cnooc.expert.controller.expert;
 import com.cnooc.expert.common.response.ApiResult;
 import com.cnooc.expert.common.response.BasePageResp;
 import com.cnooc.expert.controller.common.AbstractBaseController;
+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;
@@ -13,42 +14,48 @@ 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.PeiXunKeChengKeJiePageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
-import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuPageReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiApplyReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiPageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseGetInfoReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonGetReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonPageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCoursePageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainExamPageReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiGetReq;
 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.DongJieGetResp;
-import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
-import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaPageResp;
 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.PeiXunKeChengKeJiePageResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
-import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuByOwnerPageResp;
-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.QingJiaJinJiPageResp;
-import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp;
 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.CityTreeApiResp;
+import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonJiTuanErJiDanWeiListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiResp;
 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.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.TrainCourseGetApiResp;
+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.TrainCoursePageApiResp;
+import com.cnooc.expert.external.expert.model.response.TrainExamPageApiResp;
+import com.cnooc.expert.external.expert.model.response.ViolationExpertGetApiResp;
 import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
 import com.cnooc.expert.external.expert.model.response.XiangMuInfoByChouQuNumGetApiResp;
+import com.cnooc.expert.external.expert.model.response.ZhuanJiaPingBiaoXiangMuRenWuPageApiResp;
 import com.cnooc.expert.service.ExpertService;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -66,228 +73,180 @@ public class ExpertController extends AbstractBaseController {
 
     private final ExpertService expertService;
 
+    // 获取 工作流业务id
     @PostMapping("/approve/getBusinessId")
     public ApiResult<ApproveBusinessIdGetResp> approveBusinessIdGet() {
-        return ApiResult.successWithResult(expertService.getApproveBusinessId());
+        String approveBusinessId = expertService.getApproveBusinessId();
+
+        return ApiResult.successWithResult(
+                ApproveBusinessIdGetResp.builder()
+                        .businessId(approveBusinessId)
+                        .build()
+        );
     }
 
-    // *** 数据字典 ***
+    // *** 个人信息 ***
 
-    /**
-     * 民族查询列表
-     *
-     * @param req
-     * @return
-     */
+    // 民族列表
     @PostMapping("/nofilter/list")
     public ApiResult<List<CommonNofilterEnumGetApiResp>> dictNofilterList(@RequestBody @Validated DictNofilterListReq req) {
         List<CommonNofilterEnumGetApiResp> apiResp = expertService.listDictNofilter(req);
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 集团二级单位列表
-     *
-     * @return
-     */
+    // 集团二级单位列表
     @PostMapping("/secondary-unit/list")
     public ApiResult<List<CommonJiTuanErJiDanWeiListApiResp>> secondaryUnitList() {
         List<CommonJiTuanErJiDanWeiListApiResp> apiResp = expertService.listSecondaryUnit();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 执业资格列表
-     *
-     * @return
-     */
+    // 职称列表
     @PostMapping("/dict/guid3/list")
     public ApiResult<List<DictByParentListApiResp>> dictGuiud3List() {
         List<DictByParentListApiResp> apiResp = expertService.listDict3();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 执业资格
-     *
-     * @return
-     */
+    // 执业资格列表
     @PostMapping("/dict/guid4/list")
     public ApiResult<List<DictByParentListApiResp>> dictGuiud4List() {
         List<DictByParentListApiResp> apiResp = expertService.listDict4();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 学历列表
-     *
-     * @return
-     */
+    // 学历列表
     @PostMapping("/dict/guid5/list")
     public ApiResult<List<DictByParentListApiResp>> dictGuiud5List() {
         List<DictByParentListApiResp> apiResp = expertService.listDict5();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 学位列表
-     *
-     * @return
-     */
+    // 学位列表
     @PostMapping("/dict/guid6/list")
     public ApiResult<List<DictByParentListApiResp>> dictGuiud6List() {
         List<DictByParentListApiResp> apiResp = expertService.listDict6();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 语种
-     *
-     * @return
-     */
+    // 语种列表
     @PostMapping("/dict/guid11/list")
     public ApiResult<List<DictByParentListApiResp>> dictGuiud11List() {
         List<DictByParentListApiResp> apiResp = expertService.listDict11();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 熟练程度
-     *
-     * @return
-     */
+    // 熟练程度列表
     @PostMapping("/dict/guid12/list")
     public ApiResult<List<DictByParentListApiResp>> dictGuiud12List() {
         List<DictByParentListApiResp> apiResp = expertService.listDict12();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 评标专业树
-     *
-     * @return
-     */
+    // 评标专业树
     @PostMapping("/ping-biao-zhuan-ye/tree")
     public ApiResult<List<PingBiaoZhuanYeTreeNodeResp>> PingBiaoZhuanYeTree() {
         List<PingBiaoZhuanYeTreeNodeResp> apiResp = expertService.treePingBiaoZhuanYe();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 省市区树
-     *
-     * @return
-     */
+    // 省市区树
     @PostMapping("/city/tree")
     public ApiResult<List<CityTreeApiResp>> CityTree() {
         List<CityTreeApiResp> apiResp = expertService.treeCity();
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 专家个人信息
-     *
-     * @return
-     */
+    // 专家个人信息详情
     @PostMapping("/info")
     public ApiResult<ExpertInfoGetApiResp> ExpertInfoGet() {
         ExpertInfoGetApiResp apiResp = expertService.getExpertInfo(null);
         return ApiResult.successWithResult(apiResp);
     }
 
+    // 专家个人信息修改
     @PostMapping("/updateAllInfo")
     public ApiResult<ExpertInfoGetApiResp> ExpertInfoUpdate(@RequestBody @Validated ExpertInfoUpdateApiReq req) {
         ExpertInfoGetApiResp apiResp = expertService.updateExpetInfo(req);
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 抽取码详情
-     *
-     * @param req
-     * @return
-     */
+    // 专家个人的申请列表
+    @PostMapping("/zhuan-jia/shen-qing-ji-lu/page")
+    public ApiResult<BasePageResp<ZhuanJiaShenQingJiLuPageResp>> zhuanJiaShenQingJiLuPage(@RequestBody @Validated ZhuanJiaShenQingJiLuPageReq req) {
+        BasePageResp<ZhuanJiaShenQingJiLuPageResp> apiResp = expertService.pageZhuanJiaShenQingJiLu(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
+    // *** 请假/休假 ***
+
+    // 根据抽取码获取评标项目
     @PostMapping("/pingBiaoXiangMu/info-by-chouqunum")
     public ApiResult<XiangMuInfoByChouQuNumGetApiResp> pingBiaoXiangMuInfoGetByChouQuMa(@RequestBody @Validated PingBiaoXiangMuInfoGetByChouQuMaReq req) {
         XiangMuInfoByChouQuNumGetApiResp apiResp = expertService.getPingBiaoXiangMuInfoByChouQuMa(req);
         return ApiResult.successWithResult(apiResp);
     }
 
+    // 专家所属评标项目分页
     @PostMapping("/pingBiaoXiangMu/page")
-    public ApiResult<BasePageResp<PingBiaoXiangMuPageResp>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuPageReq req) {
-        BasePageResp<PingBiaoXiangMuPageResp> apiResp = expertService.pagePingBiaoXiangMu(req);
+    public ApiResult<BasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuByOwnerPageReq req) {
+        BasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp> apiResp = expertService.pagePingBiaoXiangmuByOwner(req);
         return ApiResult.successWithResult(apiResp);
     }
 
-    // *** 请假/休假 ***
-
     // 紧急请假分页列表
     @PostMapping("/qing-jia/page")
-    public ApiResult<BasePageResp<QingJiaJinJiPageResp>> qingJiaJinJiPage(@RequestBody @Validated QingJiaJinJiPageReq req) {
-        BasePageResp<QingJiaJinJiPageResp> apiResp = expertService.pageJinJiQingJia(req);
+    public ApiResult<BasePageResp<JinJiQingJiaPageApiResp>> qingJiaJinJiPage(@RequestBody @Validated QingJiaJinJiPageReq req) {
+        BasePageResp<JinJiQingJiaPageApiResp> apiResp = expertService.pageJinJiQingJia(req);
         return ApiResult.successWithResult(apiResp);
     }
 
     // 紧急请假申请
     @PostMapping("/qing-jia/apply")
-    public ApiResult<QingJiaJinJiApplyResp> qingJiaJinJiApply(@RequestBody @Validated QingJiaJinJiApplyReq req) {
-        QingJiaJinJiApplyResp apiResp = expertService.applyJinJiQingJia(req);
+    public ApiResult<JinJiQingJiaApplyApiResp> qingJiaJinJiApply(@RequestBody @Validated QingJiaJinJiApplyReq req) {
+        JinJiQingJiaApplyApiResp apiResp = expertService.applyJinJiQingJia(req);
         return ApiResult.successWithResult(apiResp);
     }
 
-
     // 个人休假分页列表
     @PostMapping("/xiu-jia/page")
-    public ApiResult<BasePageResp<GeRenXiuJiaPageResp>> geRenXiuJiaPage(@RequestBody @Validated GeRenXiuJiaPageReq req) {
-        BasePageResp<GeRenXiuJiaPageResp> apiResp = expertService.pageGeRenXiuJia(req);
+    public ApiResult<BasePageResp<GeRenXiuJiaPageApiResp>> geRenXiuJiaPage(@RequestBody @Validated GeRenXiuJiaPageReq req) {
+        BasePageResp<GeRenXiuJiaPageApiResp> apiResp = expertService.pageGeRenXiuJia(req);
         return ApiResult.successWithResult(apiResp);
     }
 
     // 个人休假申请
     @PostMapping("/xiu-jia/apply")
-    public ApiResult<GeRenXiuJiaApplyResp> geRenXiuJiaApply(@RequestBody @Validated GeRenXiuJiaApplyReq req) {
-        GeRenXiuJiaApplyResp apiResp = expertService.applyGeRenXiuJia(req);
+    public ApiResult<GeRenXiuJiaApplyApiResp> geRenXiuJiaApply(@RequestBody @Validated GeRenXiuJiaApplyReq req) {
+        GeRenXiuJiaApplyApiResp apiResp = expertService.applyGeRenXiuJia(req);
         return ApiResult.successWithResult(apiResp);
     }
 
     // *** 评标项目 ***
 
-    // 专家的评标项目分页列表
+    // 专家所属评标项目分页（请假状态）
     @PostMapping("/ping-biao-xiang-mu/by-owner/page")
-    public ApiResult<BasePageResp<PingBiaoXiangMuByOwnerPageResp>> pingBiaoXiangMuByOwnerPage(@RequestBody @Validated PingBiaoXiangMuByOwnerPageReq req) {
-        BasePageResp<PingBiaoXiangMuByOwnerPageResp> apiResp = expertService.pagePingBiaoXiangmuByOwner(req);
+    public ApiResult<BasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp>> pingBiaoXiangMuByOwnerPage(@RequestBody @Validated PingBiaoXiangMuByOwnerPageReq req) {
+        BasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp> apiResp = expertService.pagePingBiaoXiangmuByOwner(req);
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 专家个人的申请列表
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("/zhuan-jia/shen-qing-ji-lu/page")
-    public ApiResult<BasePageResp<ZhuanJiaShenQingJiLuPageResp>> zhuanJiaShenQingJiLuPage(@RequestBody @Validated ZhuanJiaShenQingJiLuPageReq req) {
-        BasePageResp<ZhuanJiaShenQingJiLuPageResp> apiResp = expertService.pageZhuanJiaShenQingJiLu(req);
-        return ApiResult.successWithResult(apiResp);
-    }
-
-    // *** 违规信息/冻结信息 ***
+    // *** 违规/冻结 ***
 
-    // 专家冻结信息分页列表
+    // 专家冻结分页
     @PostMapping("/dong-jie/page")
     public ApiResult<BasePageResp<DongJieZhuanYePageApiResp>> dongJiePage(@RequestBody @Validated DongJiePageReq req) {
         BasePageResp<DongJieZhuanYePageApiResp> apiResp = expertService.pageDongJie(req);
         return ApiResult.successWithResult(apiResp);
     }
 
-    // 专家冻结信息详情
+    // 专家冻结详情
     @PostMapping("/dong-jie/get")
-    public ApiResult<DongJieGetResp> dongjieGet(@RequestBody @Validated DongJieGetReq req) {
-        DongJieGetResp apiResp = expertService.getDongJie(req);
+    public ApiResult<DongJieGetApiResp> dongJieGet(@RequestBody @Validated DongJieGetReq req) {
+        DongJieGetApiResp apiResp = expertService.getDongJie(req);
         return ApiResult.successWithResult(apiResp);
     }
 
-
     // 专家违规分页列表
     @PostMapping("/wei-gui/page")
     public ApiResult<BasePageResp<ViolationExpertPageApiResp>> weiGuiJiLuPage(@RequestBody @Validated WeiGuiJiLuPageReq req) {
@@ -295,64 +254,80 @@ public class ExpertController extends AbstractBaseController {
         return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 专家违规处理信息详情
-     *
-     * @param req
-     * @return
-     */
+    // 专家违规详情
     @PostMapping("/wei-gui/get")
-    public ApiResult<WeiGuiGetResp> weiGuiGet(@RequestBody @Validated WeiGuiGetReq req) {
-        return ApiResult.successWithResult(expertService.getWeiGui(req));
+    public ApiResult<ViolationExpertGetApiResp> weiGuiGet(@RequestBody @Validated WeiGuiGetReq req) {
+        ViolationExpertGetApiResp apiResp = expertService.getWeiGui(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
-    // *** 课程培训  和  课后考试
-    // 课后考试
+    // *** 培训 / 考试 ***
 
-    /**
-     * 课后考试列表查询
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("/kaoShi/getKaoShiPage")
-    public ApiResult<BasePageResp<KaoShiPageResp>> getKaoShiPage(@RequestBody @Validated KaoShiPageReq req) {
-        return ApiResult.successWithResult(expertService.pageKaoShi(req));
+    // 培训课程分页
+    @PostMapping("/train/course/page")
+    public ApiResult<BasePageResp<TrainCoursePageApiResp>> pageTrainCourse(@RequestBody @Validated TrainCoursePageReq req) {
+        BasePageResp<TrainCoursePageApiResp> apiResp = expertService.pageTrainCourse(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
+    // 培训课程详情
+    @PostMapping("/train/course/get")
+    public ApiResult<TrainCourseGetApiResp> getTrainCourseInfo(@RequestBody @Validated TrainCourseGetInfoReq req) {
+        TrainCourseGetApiResp apiResp = expertService.getTrainCourse(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
+    // 培训课程课节分页
+    @PostMapping("/train/course/lesson/page")
+    public ApiResult<BasePageResp<TrainCourseLessonPageApiResp>> pageTrainCourseLesson(@RequestBody @Validated TrainCourseLessonPageReq req) {
+        BasePageResp<TrainCourseLessonPageApiResp> apiResp = expertService.pageTrainCourseLesson(req);
+        return ApiResult.successWithResult(apiResp);
+    }
 
-    // 课程培训
+    // 培训课程课节详情
+    @PostMapping("/train/course/lesson/get")
+    public ApiResult<TrainCourseLessonGetApiResp> getTrainCourseLesson(@RequestBody @Validated TrainCourseLessonGetReq req) {
+        TrainCourseLessonGetApiResp apiResp = expertService.getTrainCourseLesson(req);
+        return ApiResult.successWithResult(apiResp);
+    }
 
-    /**
-     * 培训课程列表查询
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("/peiXun/getPeiXunPage")
-    public ApiResult<BasePageResp<PeiXunPageResp>> getPeiXunPage(@RequestBody @Validated PeiXunPageReq req) {
-        return ApiResult.successWithResult(expertService.pagePeiXunKeCheng(req));
+    // 附件列表
+    @PostMapping("/common/fu-jian/list")
+    public ApiResult<List<CommonFuJianListApiResp>> listCommonFuJian(@RequestBody @Validated CommonFuJianListReq req) {
+        List<CommonFuJianListApiResp> apiResp = expertService.listCommonFuJian(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 培训课程详情查询
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("/peiXun/getPeiXunInfo")
-    public ApiResult<Object> getPeiXunInfo(@RequestBody @Validated PeiXunKeChengReq req) {
-        return ApiResult.successWithResult(expertService.getPeiXunInfo(req));
+    // 更新培训课节学习进度
+    @PostMapping("/train/lesson-progress/update")
+    public ApiResult<TainLessonProgressUpdateApiResp> updateTainLessonProgress(@RequestBody TainLessonProgressUpdateApiReq req) {
+        TainLessonProgressUpdateApiResp apiResp = expertService.updateTainLessonProgress(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
-    // 课程详情 课节列表 分页列表
-    @PostMapping("/peiXun/kecheng/kejie/page")
-    public ApiResult<BasePageResp<PeiXunKeChengKeJiePageResp>> pagePeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJiePageReq req) {
-        return ApiResult.successWithResult(expertService.pagePeiXunKeChengKeJie(req));
+    // 课后考试列表查询
+    @PostMapping("/kaoShi/getKaoShiPage")
+    public ApiResult<BasePageResp<KaoShiPageResp>> getKaoShiPage(@RequestBody @Validated KaoShiPageReq req) {
+        return ApiResult.successWithResult(expertService.pageKaoShi(req));
     }
 
+    // 考试分页
+    @PostMapping("/train/exam/page")
+    public ApiResult<BasePageResp<TrainExamPageApiResp>> trainExamPage(@RequestBody @Validated TrainExamPageReq req) {
+        BasePageResp<TrainExamPageApiResp> apiResp = expertService.pageTrainExam(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
+
+
+
+
+
+
+
+
     // 课程详情 课节 详情
-    @PostMapping("/peiXun/kecheng/kejie/get")
+    @PostMapping("/peiXun/kecheng/kejie/detail/get")
     public ApiResult<PeiXunKeChengKeJieGetResp> getPeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJieGetReq req) {
         return ApiResult.successWithResult(expertService.getPeiXunKeChengKeJie(req));
     }
@@ -369,4 +344,7 @@ public class ExpertController extends AbstractBaseController {
         return ApiResult.successWithResult(expertService.getPeiXunKeChengKeJieFuJian(req));
     }
 
+
+
+
 }

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

@@ -3,7 +3,7 @@ package com.cnooc.expert.controller.expert;
 import com.cnooc.expert.common.response.ApiResult;
 import com.cnooc.expert.common.response.BasePageResp;
 import com.cnooc.expert.controller.common.AbstractBaseController;
-import com.cnooc.expert.controller.expert.model.request.CompanyPageReq;
+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;
@@ -14,14 +14,16 @@ 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.PeiXunKeChengKeJiePageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuPageReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiApplyReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiPageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseGetInfoReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonGetReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonPageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCoursePageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainExamPageReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiGetReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiJiLuPageReq;
 import com.cnooc.expert.controller.expert.model.request.ZhuanJiaShenQingJiLuPageReq;
@@ -40,12 +42,19 @@ import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetRe
 import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJiePageResp;
 import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
 import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuInfoGetByChouQuMaResp;
+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.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.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;
 import org.springframework.validation.annotation.Validated;
@@ -92,7 +101,7 @@ public class ExpertMockController extends AbstractBaseController {
     }
 
     /**
-     * 执业资格列表
+     * 职称列表
      *
      * @return
      */
@@ -198,7 +207,7 @@ public class ExpertMockController extends AbstractBaseController {
     }
 
     @PostMapping("/pingBiaoXiangMu/page")
-    public ApiResult<BasePageResp<Object>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuPageReq req) {
+    public ApiResult<BasePageResp<PingBiaoXiangMuPageResp>> pingBiaoXiangMuPage(@RequestBody @Validated PingBiaoXiangMuPageReq req) {
         return ApiResult.successWithResult(expertMockService.pagePingBiaoXiangMu(req));
     }
 
@@ -280,62 +289,76 @@ public class ExpertMockController extends AbstractBaseController {
         return ApiResult.successWithResult(expertMockService.getWeiGui(req));
     }
 
-    // *** 课程培训  和  课后考试
-    // 课后考试
+    // *** 培训 / 考试 ***
 
-    /**
-     * 课后考试列表查询
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("/kaoShi/getKaoShiPage")
-    public ApiResult<BasePageResp<KaoShiPageResp>> getKaoShiPage(@RequestBody @Validated KaoShiPageReq req) {
-        return ApiResult.successWithResult(expertMockService.pageKaoShi(req));
+    // 课程培训
+
+    // 培训课程分页
+    @PostMapping("/train/course/page")
+    public ApiResult<BasePageResp<PeiXunPageResp>> pageTrainCourse(@RequestBody @Validated TrainCoursePageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageTrainCourse(req));
     }
 
+    // 培训课程详情
+    @PostMapping("/train/course/get")
+    public ApiResult<Object> getTrainCourseInfo(@RequestBody @Validated TrainCourseGetInfoReq req) {
+        return ApiResult.successWithResult(expertMockService.getTrainCourse(req));
+    }
 
-    // 课程培训
+    // 培训课程课节分页
+    @PostMapping("/train/course/lesson/page")
+    public ApiResult<BasePageResp<PeiXunKeChengKeJiePageResp>> pageTrainCourseLesson(@RequestBody @Validated TrainCourseLessonPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageTrainCourseLesson(req));
+    }
 
-    /**
-     * 培训课程列表查询
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("/peiXun/getPeiXunPage")
-    public ApiResult<BasePageResp<PeiXunPageResp>> getPeiXunPage(@RequestBody @Validated PeiXunPageReq req) {
-        return ApiResult.successWithResult(expertMockService.pagePeiXunKeCheng(req));
+    // 培训课程课节详情
+    @PostMapping("/train/course/lesson/get")
+    public ApiResult<TrainCourseLessonGetApiResp> getTrainCourseLesson(@RequestBody @Validated TrainCourseLessonGetReq req) {
+        TrainCourseLessonGetApiResp apiResp = expertMockService.getTrainCourseLesson(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
-    /**
-     * 培训课程详情查询
-     *
-     * @param req
-     * @return
-     */
-    @PostMapping("/peiXun/getPeiXunInfo")
-    public ApiResult<Object> getPeiXunInfo(@RequestBody @Validated PeiXunKeChengReq req) {
-        return ApiResult.successWithResult(expertMockService.getPeiXunInfo(req));
+    // 附件列表
+    @PostMapping("/common/fu-jian/list")
+    public ApiResult<List<CommonFuJianListApiResp>> listCommonFuJian(@RequestBody @Validated CommonFuJianListReq req) {
+        List<CommonFuJianListApiResp> apiResp = expertMockService.listCommonFuJian(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
-    // 课程详情 课节列表 分页列表
-    @PostMapping("/peiXun/kecheng/kejie/page")
-    public ApiResult<BasePageResp<PeiXunKeChengKeJiePageResp>> pagePeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJiePageReq req) {
-        return ApiResult.successWithResult(expertMockService.pagePeiXunKeChengKeJie(req));
+    // 更新培训课节学习进度
+    @PostMapping("/train/lesson-progress/update")
+    public ApiResult<TainLessonProgressUpdateApiResp> updateTainLessonProgress(@RequestBody TainLessonProgressUpdateApiReq req) {
+        TainLessonProgressUpdateApiResp apiResp = expertMockService.updateTainLessonProgress(req);
+        return ApiResult.successWithResult(apiResp);
     }
 
+    // 考试分页
+    @PostMapping("/train/exam/page")
+    public ApiResult<BasePageResp<TrainExamPageApiResp>> trainExamPage(@RequestBody @Validated TrainExamPageReq req) {
+        BasePageResp<TrainExamPageApiResp> apiResp = expertMockService.pageTrainExam(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     // 课程详情 课节 详情
-    @PostMapping("/peiXun/kecheng/kejie/get")
+    @PostMapping("/peiXun/kecheng/kejie/detail/get")
     public ApiResult<PeiXunKeChengKeJieGetResp> getPeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJieGetReq req) {
         return ApiResult.successWithResult(expertMockService.getPeiXunKeChengKeJie(req));
     }
 
-    // 课程详情 课节 附件 列表
-    @PostMapping("/peiXun/kecheng/kejie/fujian/list")
-    public ApiResult<List<PeiXunKeChengKeJieFuJianListResp>> listPeiXunKeChengKeJieFuJian(@RequestBody @Validated PeiXunKeChengKeJieFuJianListReq req) {
-        return ApiResult.successWithResult(expertMockService.listPeiXunKeChengKeJieFuJian(req));
-    }
+
 
     // 课程详情 课节 附件 详情
     @PostMapping("/peiXun/kecheng/kejie/fujian/get")
@@ -343,4 +366,11 @@ public class ExpertMockController extends AbstractBaseController {
         return ApiResult.successWithResult(expertMockService.getPeiXunKeChengKeJieFuJian(req));
     }
 
+    // 培训课程分页
+    @PostMapping("/kaoShi/getKaoShiPage")
+    public ApiResult<BasePageResp<KaoShiPageResp>> getKaoShiPage(@RequestBody @Validated KaoShiPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageKaoShi(req));
+    }
+
+
 }

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

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

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

 package com.cnooc.expert.controller.expert.model.request;
 
+import lombok.Data;
+
+@Data
 public class DongJieGetReq {
 
-    private String dongJieGuid;
+    private String pingBiaoZhuanYeGuid;
 }

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

@@ -10,4 +10,8 @@ public class PingBiaoXiangMuByOwnerPageReq extends BasePageRequest {
 
     private String zhuanJiaGuid;
 
+    private Long pingBiaoStartTime;
+
+    private Long pingBiaoEndTime;
+
 }

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

@@ -9,4 +9,8 @@ import lombok.EqualsAndHashCode;
 public class PingBiaoXiangMuPageReq extends BasePageRequest {
 
     private String zhuanJiaGuid;
+
+    private Long pingBiaoStartTime;
+
+    private Long pingBiaoEndTime;
 }

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

@@ -11,6 +11,6 @@ public class QingJiaJinJiApplyReq {
 
     private String jinJiQingJiaReason;
 
-    private String qingJiaTime;
+    private Long qingJiaTime;
 
 }

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

@@ -10,4 +10,8 @@ public class QingJiaJinJiPageReq extends BasePageRequest {
 
     private String zhuanJiaGuid;
 
+    private Long qingJiaStartTime;
+
+    private Long qingJiaEndTime;
+
 }

src/main/java/com/cnooc/expert/controller/expert/model/request/PeiXunKeChengReq.java → src/main/java/com/cnooc/expert/controller/expert/model/request/TrainCourseGetInfoReq.java

@@ -2,22 +2,12 @@ package com.cnooc.expert.controller.expert.model.request;
 
 import lombok.Data;
 
-/**
- * @author: FuHongZhang
- * @date 2025-11-15 14:46
- */
 @Data
-public class PeiXunKeChengReq {
+public class TrainCourseGetInfoReq {
 
     /**
      * 课程Guid
      */
     private String courseGuid;
 
-
-
-    //  -------查询课程详情下课节信息入参----------
-    private String userId;  // 从服务上获取
-//    必传
-//    private String courseGuid;
 }

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

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

src/main/java/com/cnooc/expert/controller/expert/model/request/PeiXunKeChengKeJiePageReq.java → src/main/java/com/cnooc/expert/controller/expert/model/request/TrainCourseLessonPageReq.java

@@ -6,7 +6,9 @@ import lombok.EqualsAndHashCode;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class PeiXunKeChengKeJiePageReq extends BasePageRequest {
+public class TrainCourseLessonPageReq extends BasePageRequest {
+
+    private String zhuanJiaGuid;
 
     private String courseGuid;
 

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

+package com.cnooc.expert.controller.expert.model.request;
+
+import com.cnooc.expert.common.request.BasePageRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TrainCoursePageReq extends BasePageRequest {
+
+    // 课程名称
+    private String courseName;
+
+    // 课程类型Guid
+    private String courseTypeGuid;
+
+    // 课程类型名称
+    private String courseTypeName;
+
+    // 课程发布时间查询开始时间
+    private Long courseReleaseStartTimestamp;
+
+    // 课程发布时间查询结束时间
+    private Long courseReleaseEndTimestamp;
+
+    // 学习进度状态（10：未完成；20：已完成）
+    private Short progressStatus;
+
+    // 专家guid
+    private String zhuanJiaGuid;
+
+}

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

+package com.cnooc.expert.controller.expert.model.request;
+
+import com.cnooc.expert.common.request.BasePageRequest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class TrainExamPageReq extends BasePageRequest {
+
+    private String zhuanJiaGuid;
+}

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

@@ -5,6 +5,8 @@ import lombok.Data;
 @Data
 public class WeiGuiGetReq {
 
+    private String zhuanJiaGuid;
+
     private String guid;
 
 }

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

@@ -8,9 +8,7 @@ import lombok.Data;
 public class WeiGuiGetResp {
 
     private String applyBusinessId;
-
     private Integer applyshenheStatus;
-
     private String businessId;
     private String chouquRenwuGuid;
     private Long chuliEndTime;

src/main/java/com/cnooc/expert/controller/file/FileController.java

+package com.cnooc.expert.controller.file;
+
+import com.cnooc.expert.common.response.ApiResult;
+import com.cnooc.expert.controller.common.AbstractBaseController;
+import com.cnooc.expert.controller.file.model.request.DownloadInfoReq;
+import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
+import com.cnooc.expert.service.FileService;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/file")
+public class FileController extends AbstractBaseController {
+
+    private final FileService fileService;
+
+    @PostMapping("/generatorDownloadInfo")
+    public ApiResult<List<DownLoadInfoDTO>> downloadInfo(@RequestBody @Validated DownloadInfoReq req) {
+        List<DownLoadInfoDTO> apiResp = fileService.downloadInfo(req.getPathId());
+        return ApiResult.successWithResult(apiResp);
+    }
+
+}

src/main/java/com/cnooc/expert/controller/file/FileMockController.java

+package com.cnooc.expert.controller.file;
+
+import com.cnooc.expert.common.response.ApiResult;
+import com.cnooc.expert.controller.common.AbstractBaseController;
+import com.cnooc.expert.controller.file.model.request.DownloadInfoReq;
+import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
+import com.cnooc.expert.service.FileMockService;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/mock/file")
+public class FileMockController extends AbstractBaseController {
+
+    private final FileMockService fileMockService;
+
+    @PostMapping("/generatorDownloadInfo")
+    public ApiResult<List<DownLoadInfoDTO>> downloadInfo(@RequestBody @Validated DownloadInfoReq req) {
+        List<DownLoadInfoDTO> apiResp = fileMockService.downloadInfo(req.getPathId());
+        return ApiResult.successWithResult(apiResp);
+    }
+
+}

src/main/java/com/cnooc/expert/controller/file/model/request/DownloadInfoReq.java

+package com.cnooc.expert.controller.file.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class DownloadInfoReq {
+
+    @NotBlank
+    private String pathId;
+}

src/main/java/com/cnooc/expert/controller/subject/SubjectController.java

 package com.cnooc.expert.controller.subject;
 
 import com.cnooc.expert.common.response.ApiResult;
-import com.cnooc.expert.common.response.BasePageResp;
 import com.cnooc.expert.controller.common.AbstractBaseController;
 import com.cnooc.expert.controller.subject.model.request.CompanyPageReq;
-import com.cnooc.expert.controller.subject.model.response.CompanyPageResp;
+import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
+import com.cnooc.expert.external.subject.model.response.PlatformCompanyPageApiResp;
 import com.cnooc.expert.service.SubjectService;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -21,14 +21,13 @@ public class SubjectController extends AbstractBaseController {
     private final SubjectService subjectService;
 
     /**
-     * 公司列表
+     * 公司列表 / 回避单位
      *
      * @return
      */
     @PostMapping("/company/page")
-    public ApiResult<BasePageResp<CompanyPageResp>> companyPage(@RequestBody @Validated CompanyPageReq req) {
-        BasePageResp<CompanyPageResp> apiResp = subjectService.pageCompany(req);
-
+    public ApiResult<ApiBasePageResp<PlatformCompanyPageApiResp>> companyPage(@RequestBody @Validated CompanyPageReq req) {
+        ApiBasePageResp<PlatformCompanyPageApiResp> apiResp = subjectService.pageCompany(req);
         return ApiResult.successWithResult(apiResp);
     }
 

src/main/java/com/cnooc/expert/controller/subject/model/request/CompanyPageReq.java

@@ -7,4 +7,19 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class CompanyPageReq extends BasePageRequest {
+
+    // 业务类型 集合 4 申请成为供应商 5 申请成为平台采购商 6 申请成为招标代理 7 申请成为企业专属供应商 8自然人供应商 -1 运营平台 12 企业专属招标代理
+    private Integer businessType;
+
+    // 是否有效 0 无效; 1 有效
+    private Boolean validStatus;
+
+    // 租户ID
+    private Integer tenantId;
+
+    // 单位名称
+    private String subjectName;
+
+    // 企业代码
+    private String creditCode;
 }

src/main/java/com/cnooc/expert/controller/workflow/model/response/ApprovePathSettingPageResp.java

@@ -11,6 +11,7 @@ public class ApprovePathSettingPageResp {
 
      private String defId;
      private String defName;
+     private String defPath;
      private String opinion;
      private String pathId;
      private Boolean useIfream;

src/main/java/com/cnooc/expert/external/common/model/response/ApiBasePageResp.java

@@ -9,26 +9,12 @@ import java.util.List;
 @Builder
 public class ApiBasePageResp<T> {
 
-    private Integer totalCount;
+    private Integer pages;
 
-    private Integer pageSize;
+    private Integer total;
 
-    private Integer pageNum;
+    private Integer current;
 
-    private Integer firstResult;
-
-    private Integer pageNo;
-
-    private Boolean firstPage;
-
-    private Integer totalPage;
-
-    private Boolean lastPage;
-
-    private Integer nextPage;
-
-    private Integer prePage;
-
-    private List<T> list;
+    private List<T> data;
 
 }

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

@@ -4,21 +4,49 @@ import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
 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;
+import com.cnooc.expert.external.expert.model.request.CommonFuJianListApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonJiTuanErJiDanWeiListApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiReq;
 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.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.TrainCourseGetApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainCourseLessonGetApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainCourseLessonPageApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainExamPageApiReq;
+import com.cnooc.expert.external.expert.model.request.ViolationExpertGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ViolationExpertPageApiReq;
 import com.cnooc.expert.external.expert.model.request.XiangMuInfoByChouQuNumGetApiReq;
+import com.cnooc.expert.external.expert.model.request.ZhuanJiaPingBiaoXiangMuRenWuPageApiReq;
 import com.cnooc.expert.external.expert.model.response.CityTreeApiResp;
+import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonJiTuanErJiDanWeiListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiResp;
 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.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.TrainCourseGetApiResp;
+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.TrainCoursePageApiReq;
+import com.cnooc.expert.external.expert.model.response.TrainCoursePageApiResp;
+import com.cnooc.expert.external.expert.model.response.TrainExamPageApiResp;
+import com.cnooc.expert.external.expert.model.response.ViolationExpertGetApiResp;
 import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
 import com.cnooc.expert.external.expert.model.response.XiangMuInfoByChouQuNumGetApiResp;
+import com.cnooc.expert.external.expert.model.response.ZhuanJiaPingBiaoXiangMuRenWuPageApiResp;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.HeaderMap;
@@ -29,6 +57,9 @@ import java.util.Map;
 
 public interface ExpertServiceApi {
 
+    @POST("/api/mini/expertManage/approve/getBusinessId")
+    Call<ApiBaseResult<String>> getBusinessIdApi(@HeaderMap Map<String, Object> headers);
+
     @POST("/api/mini/zjfw/zggrxxgl/queryInfoForEdit")
     Call<ApiBaseResult<ExpertInfoGetApiResp>> getExpertInfo(@HeaderMap Map<String, Object> headers, @Body ExpertInfoGetApiReq req);
 
@@ -37,34 +68,94 @@ public interface ExpertServiceApi {
 
     /* 字典、枚举 */
     @POST("/api/mini/common/nofilter/getEnum")
-    Call<ApiBaseResult<List<CommonNofilterEnumGetApiResp>>> getCommonNofilterEnum(@HeaderMap Map<String, Object> headers, @Body CommonNofilterEnumGetApiReq req);
+    Call<ApiBaseResult<List<CommonNofilterEnumGetApiResp>>> getCommonNofilterEnumApi(@HeaderMap Map<String, Object> headers, @Body CommonNofilterEnumGetApiReq req);
 
     /* 字典、枚举 */
     @POST("/api/mini/common/listJiTuanErJiDanWei")
-    Call<ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>>> listCommonJiTuanErJiDanWei(@HeaderMap Map<String, Object> headers, @Body CommonJiTuanErJiDanWeiListApiReq req);
+    Call<ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>>> listCommonJiTuanErJiDanWeiApi(@HeaderMap Map<String, Object> headers, @Body CommonJiTuanErJiDanWeiListApiReq req);
 
     // 3职称 4职业资格信息 11 语种 12 熟练程度
     @POST("/api/mini/zjcq/ChouQuShenQing/queryDictByParent")
-    Call<ApiBaseResult<List<DictByParentListApiResp>>> listDictByParent(@HeaderMap Map<String, Object> headers, @Body DictByParentListApiReq req);
+    Call<ApiBaseResult<List<DictByParentListApiResp>>> listDictByParentApi(@HeaderMap Map<String, Object> headers, @Body DictByParentListApiReq req);
 
     // 5学历   6学位
     @POST("/api/mini/xitongguanli/queryDictsByParentGuid")
-    Call<ApiBaseResult<List<DictByParentListApiResp>>> listDictByParentGuid(@HeaderMap Map<String, Object> headers, @Body DictByParentListApiReq req);
+    Call<ApiBaseResult<List<DictByParentListApiResp>>> listDictByParentGuidApi(@HeaderMap Map<String, Object> headers, @Body DictByParentListApiReq req);
 
+    // 省市县树
     @POST("/api/mini/zjcq/ChouQuShenQing/queryCityTreeContainPartArea")
-    Call<ApiBaseResult<List<CityTreeApiResp>>> cityTree(@HeaderMap Map<String, Object> headers, @Body CityTreeApiReq req);
+    Call<ApiBaseResult<List<CityTreeApiResp>>> cityTreeApi(@HeaderMap Map<String, Object> headers, @Body CityTreeApiReq req);
 
+    // 根据抽取码获取项目信息
     @POST("/api/mini/zjcq/quailfication/queryInfoByChouQuNum")
     Call<ApiBaseResult<XiangMuInfoByChouQuNumGetApiResp>> xiangMuInfoByChouQuNumGetApi(@HeaderMap Map<String, Object> headers, @Body XiangMuInfoByChouQuNumGetApiReq req);
 
-    /* 冻结、违规 */
+    // 专家评标项目分页
+    @POST("/mini/zjfw/zggrxxgl/queryZhuanJiaPingBiaoXiangMuRenWuList")
+    Call<ApiBaseResult<ApiBasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp>>> pageZhuanJiaPingBiaoXiangMuRenWuApi(@HeaderMap Map<String, Object> headers, @Body ZhuanJiaPingBiaoXiangMuRenWuPageApiReq req);
 
-    // 冻结
-    @POST("/api/mini/zjgl/zhuanJiaPingBiaoZhuanYe/queryDongJieZhuanYeList")
-    Call<ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>>> pageDongJieZhuanYeApi(@HeaderMap Map<String, Object> headers, @Body DongJieZhuanYePageApiReq req);
+    /* 请假、休假 */
+
+    // 请假分页
+    @POST("/api/mini/zjfw/zggrxxgl/queryJinJiQingJiaPagination")
+    Call<ApiBaseResult<ApiBasePageResp<JinJiQingJiaPageApiResp>>> pageJinJiQingJiaApi(@HeaderMap Map<String, Object> headers, @Body JinJiQingJiaPageApiReq req);
+
+    // 紧急请假申请
+    @POST("/api/mini/zjgl/crkgl/saveSystemJinJiQingJia")
+    Call<ApiBaseResult<JinJiQingJiaApplyApiResp>> applyJinJiQingJiaApi(@HeaderMap Map<String, Object> headers, @Body JinJiQingJiaApplyApiReq req);
+
+    // 个人休假分页
+    @POST("/api/mini/zjfw/zggrxxgl/queryZhuanJiaQingJia")
+    Call<ApiBaseResult<ApiBasePageResp<GeRenXiuJiaPageApiResp>>> pageGeRenXiuJiaApi(@HeaderMap Map<String, Object> headers, @Body GeRenXiuJiaPageApiReq req);
 
-    // 违规
+    // 个人休假申请
+    @POST("/api/mini/zjfw/zggrxxgl/saveZhuanJiaQingJia")
+    Call<ApiBaseResult<GeRenXiuJiaApplyApiResp>> applyGeRenXiuJiaApi(@HeaderMap Map<String, Object> headers, @Body GeRenXiuJiaApplyApiReq req);
+
+    /* 违规、冻结 */
+
+    // 专家违规分页
     @POST("/api/mini/zjgl/zjwg/pageViolationExpert")
     Call<ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>>> pageViolationExpertApi(@HeaderMap Map<String, Object> headers, @Body ViolationExpertPageApiReq req);
 
+    // 专家违规详情
+    @POST("/api/mini/zjgl/zjwg/queryZhuanJiaWeiGuiRecordById")
+    Call<ApiBaseResult<ViolationExpertGetApiResp>> getViolationExpertApi(@HeaderMap Map<String, Object> headers, @Body ViolationExpertGetApiReq req);
+
+    // 专家冻结分页
+    @POST("/api/mini/zjgl/zhuanJiaPingBiaoZhuanYe/queryDongJieZhuanYeList")
+    Call<ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>>> pageDongJieZhuanYeApi(@HeaderMap Map<String, Object> headers, @Body DongJieZhuanYePageApiReq req);
+
+    // 专家冻结详情
+    @POST("/api/mini/zjgl/zhuanJiaPingBiaoZhuanYe/queryZhuanYeChangeRecordList")
+    Call<ApiBaseResult<DongJieGetApiResp>> getDongJieApi(@HeaderMap Map<String, Object> headers, @Body DongJieGetApiReq req);
+
+    /* 培训、考试 */
+
+    // 培训课程分页
+    @POST("/api/mini/train/expert/pageExpertCourseProgress")
+    Call<ApiBaseResult<ApiBasePageResp<TrainCoursePageApiResp>>> pageTrainCourseApi(@HeaderMap Map<String, Object> headers, @Body TrainCoursePageApiReq req);
+
+    // 培训课程详情
+    @POST("/api/mini/train/expert/queryTrainCourse")
+    Call<ApiBaseResult<TrainCourseGetApiResp>> getTrainCourseApi(@HeaderMap Map<String, Object> headers, @Body TrainCourseGetApiReq req);
+
+    // 培训课程的课节分页
+    @POST("/api/mini/train/expert/pageExpertStudyLesson")
+    Call<ApiBaseResult<ApiBasePageResp<TrainCourseLessonPageApiResp>>> pageTrainCourseLessonApi(@HeaderMap Map<String, Object> headers, @Body TrainCourseLessonPageApiReq req);
+
+
+    @POST("/api/saas-expert/mini/train/expert/queryTrainLesson")
+    Call<ApiBaseResult<TrainCourseLessonGetApiResp>> getTrainCourseLessonApi(@HeaderMap Map<String, Object> headers, @Body TrainCourseLessonGetApiReq req);
+
+    // 培训课程附件列表
+    @POST("/api/mini/common/queryFuJianList")
+    Call<ApiBaseResult<List<CommonFuJianListApiResp>>> listCommonFuJianApi(@HeaderMap Map<String, Object> headers, @Body CommonFuJianListApiReq req);
+
+    // 更新培训课节学习进度
+    @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);
 }

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

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

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

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

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

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class GeRenXiuJiaApplyApiReq {
+
+    private String zhuanJiaGuid;
+
+    private Long startTime;
+
+    private Long endTime;
+
+    private String qingJiaYuanYin;
+
+    private Integer qingJiaDays;
+
+}

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

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class GeRenXiuJiaPageApiReq {
+
+    private Integer page;
+
+    private Integer rows;
+
+    private Long qingJiaStartTime;
+
+    private Long qingJiaEndTime;
+
+    private String zhuanJiaGuid;
+
+}

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

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class JinJiQingJiaApplyApiReq {
+
+   private String chouQuQingKuangGuid;
+
+   private String chouQuRenWuGuid;
+
+   private String jinJiQingJiaReason;
+
+   private Long qingJiaTime;
+
+}

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

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+public class JinJiQingJiaPageApiReq {
+
+     private Integer page;
+
+     private Integer rows;
+
+     private JinJiQingJiaVo jinJiQingJiaVO;
+
+     @Data
+     @Builder
+     @NoArgsConstructor
+     @AllArgsConstructor
+     public static class JinJiQingJiaVo {
+
+          private String zhuanJiaGuid;
+
+          private Long qingJiaStartTime;
+
+          private Long qingJiaEndTime;
+     }
+}

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

+package com.cnooc.expert.external.expert.model.request;
+
+import java.math.BigDecimal;
+
+public class TainLessonProgressUpdateApiReq {
+
+    /**
+     * courseGuid 课程Guid
+     */
+    private String courseGuid;
+
+    /**
+     * lessonGuid 课节Guid
+     */
+    private String lessonGuid;
+
+    /**
+     * 学习进度
+     */
+    private BigDecimal studyProgress;
+
+    /**
+     * 进度详情，存储视频进度关系及浏览文档进度关系（数据仅供前端使用）
+     */
+    private String progressDetails;
+
+    /**
+     * 当前用户guid
+     */
+    private String userGuid;
+    /**
+     * 当前用户名称
+     */
+    private String userName;
+    /**
+     * 学习完成时间
+     */
+    private Long finishTimestamp;
+    /**
+     * 进度状态
+     */
+    private Short progressStatus;
+
+    /**
+     * 学习时长
+     * @date: 2023-8-15 11:32
+     **/
+    private Long leiJiXueXiShiChang;
+
+}

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

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

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

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

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

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class TrainCourseLessonPageApiReq {
+
+    private Integer page;
+
+    private Integer rows;
+
+    // 课程Guid
+    private String courseGuid;
+
+    // 当前用户guid
+    private String userGuid;
+}

src/main/java/com/cnooc/expert/controller/expert/model/request/PeiXunPageReq.java → src/main/java/com/cnooc/expert/external/expert/model/request/TrainExamPageApiReq.java

-package com.cnooc.expert.controller.expert.model.request;
+package com.cnooc.expert.external.expert.model.request;
 
-import com.cnooc.expert.common.request.BasePageRequest;
+import lombok.Builder;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
-/**
- * @author: FuHongZhang
- * @date 2025-11-15 14:25
- */
-@EqualsAndHashCode(callSuper = true)
 @Data
-public class PeiXunPageReq extends BasePageRequest {
+@Builder
+public class TrainExamPageApiReq {
+
+    private Integer page;
+
+    private Integer rows;
 
     /**
-     * courseName 课程名称
+     * 课程名称
      */
     private String courseName;
 
     /**
-     * courseTypeGuid 课程类型Guid
+     * 课程类型Guid
      */
     private String courseTypeGuid;
 
     /**
-     * courseTypeName 课程类型名称
+     * 课节名称
      */
-    private String courseTypeName;
+    private String lessonName;
 
     /**
-     * courseReleaseStartTimestamp 课程发布时间查询开始时间
+     * 课程发布时间查询开始时间
      */
     private Long courseReleaseStartTimestamp;
 
     /**
-     * courseReleaseEndTimestamp 课程发布时间查询结束时间
+     * 课程发布时间查询结束时间
      */
     private Long courseReleaseEndTimestamp;
 
     /**
-     * 学习进度状态（10：未完成；20：已完成）
+     * 考试状态
      */
-    private Short progressStatus;
+    private Short examStatus;
 
-    /**
-     * 当前用户guid
-     */
-    private String userGuid;
-
-    /**
-     * 当前用户guid
-     */
     private String expertGuid;
 
+    private String courseTypeName;
+
     /**
-     * 二开 - 排除的课程类型列表 （续期考试，续期培训）
+     * 二开 - 排除的课程类型列表
      */
     private List<String> excludeCourseTypeList;
 

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

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

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

@@ -6,4 +6,19 @@ import lombok.Data;
 @Data
 @Builder
 public class ViolationExpertPageApiReq {
+
+    private Integer page;
+
+    private Integer rows;
+
+    private String zhuanJiaGuid;
+
+    private String shenheStatus;
+
+    private String zhuanJiaZhuangTai;
+
+    private String chuliEndTime;
+
+    private String chuliStartTime;
+
 }

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

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ZhuanJiaPingBiaoXiangMuRenWuPageApiReq {
+
+    private Integer page;
+
+    private Integer rows;
+
+    private String zhuanJiaGuid;
+
+    private Long pingBiaoStartTime;
+
+    private Long pingBiaoEndTime;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class CommonFuJianListApiResp {
+
+    private Long createTime;
+
+    private String creatorGuid;
+
+    private String creatorName;
+
+    private String fileGroupGuid;
+
+    private String fileGuid;
+
+    private String fileMD5;
+
+    private String fileName;
+
+    private Integer fileType;
+
+    private String groupGuid;
+
+    private String otherInfo;
+
+    private String sysFile;
+
+    private Long uploadTime;
+
+    private String uploadTimeText;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class DongJieGetApiResp {
+
+    private String changeRecordGuid;
+
+    private String shiXiangGuid;
+
+    private Integer shiXiangType;
+
+    private String oldValue;
+
+    private String newValue;
+
+    private Long createTime;
+
+    private String creatorGuid;
+
+    private String creatorName;
+
+    private Long modifyTime;
+
+    private String modifierGuid;
+
+    private String modifierName;
+
+    private String jieDongReason;
+
+    private String jieDongFuJianGuid;
+
+    private String dongJieReason;
+
+    private String dongJieFuJianGuid;
+
+    private Long dongJieSatrtTime;
+
+    private Long dongJieEndTime;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class GeRenXiuJiaApplyApiResp {
+
+    private String qingJiaGuid;
+
+    private String zhuanJiaGuid;
+
+    private Short leiXing;
+
+    private Long startTime;
+
+    private Long endTime;
+
+    private Long xiaoJiaTime;
+
+    private Float qingJiaDays;
+
+    private String qingJiaYuanYin;
+
+    private Long tiJiaoTime;
+
+    private Long shenPiTime;
+
+    private String shenPiYiJian;
+
+    private Short shenPiZhuangTai;
+
+    private Long createTime;
+
+    private String creatorName;
+
+    private Long modifyTime;
+
+    private String modifierName;
+
+    private Boolean isDeleted;
+
+    private Long qingJiaStartTime;
+
+    private Long qingJiaEndTime;
+
+    private String zhuanJiaName;
+
+    private String shenFenZheng;
+
+    private Boolean isHaveChanged;
+
+    private Boolean isXiTongQj;//是否是系统请假
+
+    private String remark;//备注
+
+    private String zhuanJiaCode;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class GeRenXiuJiaPageApiResp {
+
+    private Long createTime;
+
+    private String createTimeText;
+
+    private String creatorName;
+
+    private Long endTime;
+
+    private String endTimeText;
+
+    private Boolean isHaveChanged;
+
+    private Boolean isXiTongQj;
+
+    private Integer leiXing;
+
+    private String modifierName;
+
+    private Long modifyTime;
+
+    private String modifyTimeText;
+
+    private String qingJiaDays;
+
+    private String qingJiaGuid;
+
+    private String qingJiaYuanYin;
+
+    private String remark;
+
+    private String shenFenZheng;
+
+    private String shenPiTimeText;
+
+    private String shenPiYiJian;
+
+    private Long startTime;
+
+    private String startTimeText;
+
+    private String tiJiaoTimeText;
+
+    private Long xiaoJiaTime;
+
+    private String xiaoJiaTimeText;
+
+    private String zhuanJiaCode;
+
+    private String zhuanJiaGuid;
+
+    private String zhuanJiaName;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class JinJiQingJiaApplyApiResp {
+
+    private String jinJiQingJiaGuid;
+
+    private String chouQuQingKuangGuid;
+
+    private Long qingJiaTime;
+
+    private String jinJiQingJiaReason;
+
+    private Short shenHeStatus;
+
+    private Long createTime;
+
+    private String creatorName;
+
+    private String creatorGuid;
+
+    private String chouQuRenWuGuid;
+
+    private Integer qingJiaSource;//请假来源
+
+    private Integer qingJiaTimeNode;//请假时间节点
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class JinJiQingJiaPageApiResp {
+
+    private String chouQuNum;
+
+    private String jinJiQingJiaGuid;
+
+    private String chouQuQingKuangGuid;
+
+    private String xiangMuNo;
+
+    private String xiangMuName;
+
+    private String jinJiQingJiaReason;
+
+    private Long qingJiaTime;
+
+    private Long pingBiaoStartTime;
+
+    private Integer shenHeStatus;
+
+    private Long pingBiaoEndTime;
+
+    private Boolean qingJia;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class TainLessonProgressUpdateApiResp {
+
+    private String lessonProgressGuid;
+
+    private String expertGuid;
+
+    private String courseGuid;
+
+    private String lessonGuid;
+
+    private String studyProgress;
+
+    private Long finishTimestamp;
+
+    private String progressDetails;
+
+    private String expertTestGuid;
+
+    private Integer progressStatus;
+
+    private String creatorName;
+
+    private Long createTime;
+
+    private String creatorGuid;
+
+    private String modifierName;
+
+    private Long modifyTime;
+
+    private String modifierGuid;
+
+    private Long leiJiXueXiShiChang;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class TrainCourseGetApiResp {
+
+    /**
+     * 课程Guid
+     */
+    private String courseGuid;
+
+    /**
+     * 课程名称
+     */
+    private String courseName;
+
+    /**
+     * 课程类型Guid
+     */
+    private String courseTypeGuid;
+
+    /**
+     * 课程类型名称
+     */
+    private String courseTypeName;
+
+    /**
+     * 课程发布状态
+     */
+    private Short courseReleaseStatus;
+
+    /**
+     * 发布时间
+     */
+    private Long courseReleaseTimestamp;
+
+    /**
+     * 课程简介
+     */
+    private String courseIntroduction;
+
+    /**
+     * lessonCount 课节数量
+     */
+    private Integer lessonCount;
+
+    /**
+     * 是否课后考试
+     * @author: yangfan
+     **/
+    private Boolean isTestAfterLearn;
+
+    /**
+     * 试卷guid
+     * @date: 2023-8-15 11:36
+     **/
+    private String testPaperGuid;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class TrainCourseLessonGetApiResp {
+
+    /**
+     * lessonGuid 课节Guid
+     */
+    private String lessonGuid;
+
+    /**
+     * courseGuid 课程Guid
+     */
+    private String courseGuid;
+
+    /**
+     * testPaperGuid 试卷Guid
+     */
+    private String testPaperGuid;
+
+    /**
+     * lessonName 课节名称
+     */
+    private String lessonName;
+
+    /**
+     * learnFileGroupGuid 学习内容附件-文件组ID
+     */
+    private String learnFileGroupGuid;
+
+    /**
+     * learnContent 学习内容-文件名逗号分隔拼接
+     */
+    private String learnContent;
+
+    /**
+     * isTestAfterLearn 是否课后考试
+     */
+    private Boolean isTestAfterLearn;
+
+    /**
+     * 课节进度Guid
+     */
+    private String lessonProgressGuid;
+
+    /**
+     * 课节学习进度
+     */
+    private BigDecimal studyProgress;
+
+    /**
+     * 进度详情，存储视频进度关系及浏览文档进度关系（数据仅供前端使用）
+     */
+    private String progressDetails;
+
+    /**
+     * 学习时长
+     * @date: 2023-8-15 11:32
+     **/
+    private int xueXiShiChang;
+
+    /**
+     * 累计学习时长
+     * @date: 2023-8-15 11:32
+     **/
+    private Long leiJiXueXiShiChang;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class TrainCourseLessonPageApiResp {
+
+    private Long finishTimestamp;
+
+    private String learnFileGroupGuid;
+
+    private String lessonGuid;
+
+    private String lessonName;
+
+    private String studyContent;
+
+    private BigDecimal studyProgress;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class TrainCoursePageApiReq {
+
+    private Integer page;
+
+    private Integer rows;
+
+    private String userGuid;
+
+    private List<String> excludeCourseTypeList;
+
+    // 学习进度状态（10：未完成；20：已完成）
+    private Integer progressStatus;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class TrainCoursePageApiResp {
+
+    // 课程Guid
+    private String courseGuid;
+
+    // 课程名称
+    private String courseName;
+
+    // 课程类型名称
+    private String courseTypeName;
+
+    // 课节数量
+    private Integer lessonCount;
+
+    // 发布时间
+    private Long courseReleaseTimestamp;
+
+    // 学习进度
+    private BigDecimal studyProgress;
+
+    // 学习进度状态（10：未完成；20：已完成）
+    private Integer progressStatus;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@Builder
+public class TrainExamPageApiResp {
+
+	private String courseGuid;
+
+    private String courseName;
+
+    private Long courseReleaseTimestamp;
+
+    private String courseTypeName;
+
+    private Long examPassTimestamp;
+
+    private Integer examResult;
+
+    private BigDecimal jiGeScore;
+
+    private String lessonGuid;
+
+    private String lessonName;
+
+    private BigDecimal score;
+
+    private BigDecimal studyProgress;
+
+    private String testPaperGuid;
+
+    private BigDecimal zuiGaoScore;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+public class ViolationExpertGetApiResp {
+
+    private String applyBusinessId;
+
+    private Integer applyshenheStatus;
+
+    private String businessId;
+
+    private String chouquRenwuGuid;
+
+    private Long chuliEndTime;
+
+    private Long chuliStartTime;
+
+    private String fujianGuid;
+
+    private String shenheRen;
+
+    private Integer shenheStatus;
+
+    private Long shenheTime;
+
+    private Long submitTime;
+
+    private String submiter;
+
+    private String submiterGuid;
+
+    private String submiterPersonId;
+
+    private String tijiaorenEmail;
+
+    private String tijiaorenPhone;
+
+    private Integer weiguiChuliShichang;
+
+    private String weiguiReason;
+
+    private String weiguiReasonName;
+
+    private String weiguiXiangxiMiaoshu;
+
+    private String zhuanJiaAdAccount;
+
+    private String zhuanJiaCode;
+
+    private String zhuanJiaZhuangTai;
+
+    private String zhuanjiaGuid;
+
+    private String zhuanjiaName;
+
+    private String zhuanjiaWeiguiGuid;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+public class ZhuanJiaPingBiaoXiangMuRenWuPageApiResp {
+
+    private Integer chouQuFangShi; // 抽取方式 10:随机抽取 ，20:直接抽取
+
+    private String chouQuRenDanWei; // 抽取人单位
+
+    private String chouQuRenName; // 抽取人姓名
+
+    private String chouQuRenPhone; // 抽取人电话
+
+    private String chouQuZhuanTai; // 抽取的状态
+
+    private Long createTime;
+
+    private String createTimeText;
+
+    private String creatorGuid;
+
+    private String creatorName;
+
+    private String fanKuiYiJian; // 反馈意见
+
+    private Boolean isCQDHuanZhuanYe; // 是否抽取换专业
+
+    private Boolean isSubmit; // 是否提交 0是已提交 1是未提交
+
+    private String jianDuRenDanWei; // 监督人单位
+
+    private String jianDuRenName; // 监督人姓名
+
+    private String jingBanRen; // 项目经理
+
+    private String jingBanRenPhone; // 项目经理联系电话
+
+    private String keywords; // 关键字
+
+    private String messageContent; // 短信补充内容
+
+    private String modifierGuid; //修改人Guid
+
+    private String modifierName;
+
+    private Long modifyTime;
+
+    private String modifyTimeText;
+
+    private Integer pingJiaStatus; // 评价情况
+
+    private Integer pingShenType; // 评审类型 10 评标; 20 审标; 30 资格评审;
+
+    private String projectId; // 组建评标委员会项目ID
+
+    private Boolean reevaluation; // 是否复议
+
+    private String reevaluationName; // 复议名称
+
+    private Integer shuJuLaiYuan; // 数据来源 0-采购管理  1-采购需求
+
+    private Long submitTime;
+
+    private String submitTimeText;
+
+    private Long tenantId; // 租户id
+
+    private String tenantName; // 租户名称
+
+    private Long tiJiaoEndTime; // 提交结束时间
+
+    private String tiJiaoEndTimeText;
+
+    private Long tiJiaoStartTime; // 提交开始时间
+
+    private String tiJiaoStartTimeText;
+
+    private Integer tongZhiFangShi; //通知方式 10:语音通知 , 20:人工通知
+
+    private String workFlowBusinessIdNew; // 工作量业务id（新）
+
+    private String xiangMuApplyName; // 组建申请名称
+
+    private String xiangMuApplyNo; // 组建申请编号
+
+    private Integer xiangMuAttr; // 项目属性 1 法定 0 非法定
+
+    private String xiangMuCaiGouDanWei; // 组建采购单位
+
+    private String xiangMuDaiMa; // 项目代码
+
+    private String xiangMuGuid; // 项目Guid
+
+    private Integer xiangMuLaiYuan; // 项目来源
+
+    private String xiangMuName; // 项目名称
+
+    private String xiangMuNo; // 项目编号
+
+    private Integer xiangMuType; // 项目类型
+
+    private Integer xiangMuWho; // 项目类型（0：交易系统创建的项目，1：招商专家系统创建的项目）
+
+    private String zhaoBiaoFangShi; // 招标方式
+
+    private Integer zjcqXiangMuStatus; // 项目状态
+
+    private ZjcqChouQuQingKuang cqqk;
+
+    private DictPingBiaoZhuanYe dictPingBiaoZhuanYe;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class ZjcqChouQuQingKuang {
+
+        private String adAccount; // AD域账号
+
+        private String bankCard; // 银行卡号
+
+        private String bankName; // 银行名称
+
+        private String bidSectionId; // 标段id
+
+        private String buChouReason; // 补抽原因
+
+        private Integer chongXinTongZhiStatus; // 重新通知状态
+
+        private Integer chouQuCiShu; // 抽取次数
+
+        private String chouQuNum; // 抽取码
+
+        private String chouQuQingKuangGuid; // 出去情况guid
+
+        private String chouQuRenWuGuid; // 抽取任务guid
+
+        private Integer chouQuType; // 抽取类型 10:正选 , 20:副选 , 30:应急专家
+
+        private String chouQuZhuanYeGuid; // 抽取专业guid
+
+        private Long createTime;
+
+        private String createTimeText;
+
+        private String creatorGuid;
+
+        private String creatorName;
+
+        private String danWeiBH; // 单位编号
+
+        private String danWeiName; //单位名称
+
+        private String diQu; //评标地区guid  评标地区表ZJCQ_PINGBIAO_DIQU主键
+
+        private String email;
+
+        private String erJiKuName; // 二级库名称
+
+        private Boolean haveChengFa; // 是否被惩罚
+
+        private Boolean isBuChou; // 是否补抽
+
+        private Boolean isCancel; // 是否取消
+
+        private Boolean isDuanXinQueRen; // 是否短信确认
+
+        private Boolean isFeiQi; // 是否废弃
+
+        private String isFeiQiText;
+
+        private Boolean isHuLue; // 是否忽略专家签到
+
+        private Boolean isNewChouQu; // 是否是最新抽取专家
+
+        private Boolean isSuoDing; // 是否锁定
+
+        private Boolean isTuiSongSJTJ; // 是否已推送到数据统计平台
+
+        private Boolean isXiuGaiRenGongTongZhi; // 是否可以修改人工通知
+
+        private String jianKuangBaoFuJianGuid; // 健康宝截图附件guid
+
+        private String jinJiQingJiaGuid; // 紧急专家guid
+
+        private Long jinJiQingJiaTime; // 紧急请假时间
+
+        private String meetingId; // 会议id
+
+        private String meetingPassWord; // 会议密码
+
+        private String mobile;
+
+        private String modifierName;
+
+        private Long modifyTime;
+
+        private String modifyTimeText;
+
+        private String pingBiaoAddress; // 详细评标地址
+
+        private String pingBiaoDiQuGuid; // 评标地区编号
+
+        private Long pingBiaoEndTime; // 评标结束时间
+
+        private String pingBiaoEndTimeText;
+
+        private String pingBiaoFenZhongXin; // 评标分中心的名称
+
+        private Long pingBiaoStartTime; // 评标开始时间
+
+        private String pingBiaoStartTimeText;
+
+        private String pingShenDiDian; // 评审地点
+
+        private Integer professionLevel; // 专业等级
+
+        private Long qianDaoTime; // 签到时间
+
+        private String qingJiaCreatorName; // 请假创建人名称
+
+        private Integer qingJiaSource; // 请假来源
+
+        private Long qingJiaTime; // 请假时间
+
+        private Integer qingJiaTimeNode; // 请假时间节点
+
+        private String reason; // 缺席原因
+
+        private Long sealValidTime; // 签章有效期
+
+        private Boolean sendHealthStatus; // 是否发送健康宝或行程码提醒信息
+
+        private String shenFenZheng; // 身份证
+
+        private Integer shenHeStatus; // 审核状态
+
+        private Integer status; // 专业的抽取状态
+
+        private String tag; // 标签
+
+        private Long tenantId; // 租户id
+
+        private String tenantName; // 租户名称
+
+        private Integer tongZhiCiShu; // 通知次数
+
+        private Integer tongZhiFangShi; // 通知方式 10:语音通知 , 20:人工通知
+
+        private Integer tongZhiJieGuo; // 通知结果
+
+        private Integer tuiSongShiBaiCiShuSJTJ; // 推送到数据统计平台失败次数
+
+        private String xiangMuGuid; // 项目GUID
+
+        private String xiangMuName; // 项目名称
+
+        private String xiangMuNo; // 项目编号
+
+        private String xingChengMaFuJianGuid; // 行程码截图附件guid
+
+        private String zhiChengName; // 职称
+
+        private Integer zhiDingZhuanJiaType; // 指定专家类型
+
+        private String zhuanJiaCode; // 专家编号
+
+        private Integer zhuanJiaDengJi; // 专家级别
+
+        private String zhuanJiaGuid; // 专家guid
+
+        private String zhuanJiaName; // 专家姓名
+
+        private String zhuanJiaShuXing; // 专家属性
+
+        private String zhuanJiaSuoZaiDiCode; // 专家所在地编码
+
+        private String zhuanJiaSuoZaiDiGuids; // 专家所在地GUIDS
+
+        private String zhuanJiaSuoZaiDiName; // 专家所在地名称
+
+        private String zhuanYeCode; // 专业编号
+
+        private String zhuanYeGuid; // 专业guid
+
+        private String zhuanYeGuidPri; // 专业guid
+
+        private String zhuanYeName; // 专业名称
+    }
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class DictPingBiaoZhuanYe {
+        private Boolean checked; // 是否已校验
+
+        private Long createTime;
+
+        private String createTimeText;
+
+        private String creatorName;
+
+        private String excelForLevel; // 专门为excel导入标识用的级别
+
+        private String excelForNumber; // 专门为excel导入标识用的级别序号
+
+        private String excelForNumberParent; // 专门为excel导入标识用的父级别
+
+        private Integer excelIsChecked; // 专门为excel导入标识用的是否检测  0是未检测  1是已检测
+
+        private Boolean hasLastChildZY; // 是否有叶子专业（是否有最后一级子专业）
+
+        private Boolean isHide; // 对交易系统是否隐藏是否隐藏（1：隐藏 0：不隐藏）
+
+        private Boolean isScarce; // 是否稀缺专业
+
+        private Boolean lastLevel; // 是否最后等级
+
+        private Integer level; // 级别
+
+        private String lsChildren;
+
+        private String miaoShu; // 描述
+
+        private String modifierName;
+
+        private Long modifyTime;
+
+        private String modifyTimeText;
+
+        private Boolean oldScarce; // 专业在增加子专业时自身当时的“是否稀缺专业”属性
+
+        private Integer paiXuHao; // 排序号
+
+        private String parentGuid; // 父级guid
+
+        private String path; // 记录子父级关系路径
+
+        private Integer professionLevel; // 专业等级
+
+        private Boolean scarce; // 是否稀缺专业
+
+        private String state; // 状态
+
+        private String suoShuZhaoBiaoDaiLi; // 所属招标代理
+
+        private Integer xiaquCode; // 辖区code
+
+        private Integer yingJiKuKeChouNum; // 可抽应急专家数量
+
+        private Integer yingJiKuNum; // 应急专家数量
+
+        private Integer zhengChangKuKeChouNum; // 可抽正常专家数量
+
+        private Integer zhengChangKuNum; // 正常专家数量
+
+        private Integer zhuKuNum; // 主库人数
+
+        private Integer zhuanJiaLeiBie; // 专家类别
+
+        private String zhuanYeBH; // 专业编号
+
+        private String zhuanYeGuid; // 专业guid
+
+        private String zhuanYeName; // 专业名称
+
+        private Integer zhuanYeShuXing; // 专业属性 1:经济类,2:技术类
+    }
+
+}

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

@@ -6,21 +6,49 @@ import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
 import com.cnooc.expert.external.expert.api.ExpertServiceApi;
 import com.cnooc.expert.external.expert.model.request.CityTreeApiReq;
+import com.cnooc.expert.external.expert.model.request.CommonFuJianListApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonJiTuanErJiDanWeiListApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiReq;
 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.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.TrainCourseGetApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainCourseLessonGetApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainCourseLessonPageApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainExamPageApiReq;
+import com.cnooc.expert.external.expert.model.request.ViolationExpertGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ViolationExpertPageApiReq;
 import com.cnooc.expert.external.expert.model.request.XiangMuInfoByChouQuNumGetApiReq;
+import com.cnooc.expert.external.expert.model.request.ZhuanJiaPingBiaoXiangMuRenWuPageApiReq;
 import com.cnooc.expert.external.expert.model.response.CityTreeApiResp;
+import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonJiTuanErJiDanWeiListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiResp;
 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.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.TrainCourseGetApiResp;
+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.TrainCoursePageApiReq;
+import com.cnooc.expert.external.expert.model.response.TrainCoursePageApiResp;
+import com.cnooc.expert.external.expert.model.response.TrainExamPageApiResp;
+import com.cnooc.expert.external.expert.model.response.ViolationExpertGetApiResp;
 import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
 import com.cnooc.expert.external.expert.model.response.XiangMuInfoByChouQuNumGetApiResp;
+import com.cnooc.expert.external.expert.model.response.ZhuanJiaPingBiaoXiangMuRenWuPageApiResp;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import retrofit2.Call;
@@ -38,6 +66,16 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         this.expertServiceApi = retrofit.create(ExpertServiceApi.class);
     }
 
+    // ****** 工作流配置 *****
+
+    public ApiBaseResult<String> getBusinessId() {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<String>> call = expertServiceApi.getBusinessIdApi(headers);
+        return this.getResponseBody(call, "getBusinessId");
+    }
+
+    // ****** 专家 ******
+
     public ApiBaseResult<ExpertInfoGetApiResp> getExpertInfo(ExpertInfoGetApiReq req) {
         Map<String, Object> headers = super.getHeaders();
         Call<ApiBaseResult<ExpertInfoGetApiResp>> call = expertServiceApi.getExpertInfo(headers, req);
@@ -52,31 +90,31 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
 
     public ApiBaseResult<List<CommonNofilterEnumGetApiResp>> getCommonNofilterEnum(CommonNofilterEnumGetApiReq req) {
         Map<String, Object> headers = super.getHeaders();
-        Call<ApiBaseResult<List<CommonNofilterEnumGetApiResp>>> call = expertServiceApi.getCommonNofilterEnum(headers, req);
+        Call<ApiBaseResult<List<CommonNofilterEnumGetApiResp>>> call = expertServiceApi.getCommonNofilterEnumApi(headers, req);
         return this.getResponseBody(call, "getCommonNofilterEnum");
     }
 
     public ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>> listCommonJiTuanErJiDanWei(CommonJiTuanErJiDanWeiListApiReq req) {
         Map<String, Object> headers = super.getHeaders();
-        Call<ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>>> call = expertServiceApi.listCommonJiTuanErJiDanWei(headers, req);
+        Call<ApiBaseResult<List<CommonJiTuanErJiDanWeiListApiResp>>> call = expertServiceApi.listCommonJiTuanErJiDanWeiApi(headers, req);
         return this.getResponseBody(call, "listCommonJiTuanErJiDanWei");
     }
 
     public ApiBaseResult<List<DictByParentListApiResp>> listDictByParent(DictByParentListApiReq req) {
         Map<String, Object> headers = super.getHeaders();
-        Call<ApiBaseResult<List<DictByParentListApiResp>>> call = expertServiceApi.listDictByParent(headers, req);
+        Call<ApiBaseResult<List<DictByParentListApiResp>>> call = expertServiceApi.listDictByParentApi(headers, req);
         return this.getResponseBody(call, "listDictByParent");
     }
 
     public ApiBaseResult<List<DictByParentListApiResp>> listDictByParentGuid(DictByParentListApiReq req) {
         Map<String, Object> headers = super.getHeaders();
-        Call<ApiBaseResult<List<DictByParentListApiResp>>> call = expertServiceApi.listDictByParentGuid(headers, req);
+        Call<ApiBaseResult<List<DictByParentListApiResp>>> call = expertServiceApi.listDictByParentGuidApi(headers, req);
         return this.getResponseBody(call, "listDictByParentGuid");
     }
 
     public ApiBaseResult<List<CityTreeApiResp>> treeCity(CityTreeApiReq req) {
         Map<String, Object> headers = super.getHeaders();
-        Call<ApiBaseResult<List<CityTreeApiResp>>> call = expertServiceApi.cityTree(headers, req);
+        Call<ApiBaseResult<List<CityTreeApiResp>>> call = expertServiceApi.cityTreeApi(headers, req);
         return this.getResponseBody(call, "treeCity");
     }
 
@@ -86,16 +124,121 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         return this.getResponseBody(call, "getXiangMuInfoByChouQuNum");
     }
 
-    public ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>> pageDongJieZhuanYeApi(DongJieZhuanYePageApiReq req) {
+    public ApiBaseResult<ApiBasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp>> pageZhuanJiaPingBiaoXiangMuRenWu(ZhuanJiaPingBiaoXiangMuRenWuPageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp>>> call = expertServiceApi.pageZhuanJiaPingBiaoXiangMuRenWuApi(headers, req);
+        return this.getResponseBody(call, "pageZhuanJiaPingBiaoXiangMuRenWu");
+    }
+
+    /* 请假、休假 */
+
+    // 紧急请假分页
+    public ApiBaseResult<ApiBasePageResp<JinJiQingJiaPageApiResp>> pageJinJiQingJia(JinJiQingJiaPageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<JinJiQingJiaPageApiResp>>> call = expertServiceApi.pageJinJiQingJiaApi(headers, req);
+        return this.getResponseBody(call, "pageJinJiQingJia");
+    }
+
+    // 紧急请假申请
+    public ApiBaseResult<JinJiQingJiaApplyApiResp> applyJinJiQingJia(JinJiQingJiaApplyApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<JinJiQingJiaApplyApiResp>> call = expertServiceApi.applyJinJiQingJiaApi(headers, req);
+        return this.getResponseBody(call, "applyJinJiQingJia");
+    }
+
+    // 个人休假分页
+    public ApiBaseResult<ApiBasePageResp<GeRenXiuJiaPageApiResp>> pageGeRenXiuJia(GeRenXiuJiaPageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<GeRenXiuJiaPageApiResp>>> call = expertServiceApi.pageGeRenXiuJiaApi(headers, req);
+        return this.getResponseBody(call, "pageGeRenXiuJia");
+    }
+
+    // 个人休假申请
+    public ApiBaseResult<GeRenXiuJiaApplyApiResp> applyGeRenXiuJia(GeRenXiuJiaApplyApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<GeRenXiuJiaApplyApiResp>> call = expertServiceApi.applyGeRenXiuJiaApi(headers, req);
+        return this.getResponseBody(call, "applyJinJiQingJia");
+    }
+
+    // *** 违规、冻结 ***
+
+    // 专家冻结分页
+    public ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>> pageDongJieZhuanYe(DongJieZhuanYePageApiReq req) {
         Map<String, Object> headers = super.getHeaders();
         Call<ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>>> call = expertServiceApi.pageDongJieZhuanYeApi(headers, req);
-        return this.getResponseBody(call, "pageDongJieZhuanYeApi");
+        return this.getResponseBody(call, "pageDongJieZhuanYe");
+    }
+
+    // 专家冻结详情
+    public ApiBaseResult<DongJieGetApiResp> getDongJieExpert(DongJieGetApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<DongJieGetApiResp>> call = expertServiceApi.getDongJieApi(headers, req);
+        return this.getResponseBody(call, "getDongJie");
     }
 
+    // 专家违规分页
     public ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>> pageViolationExpert(ViolationExpertPageApiReq req) {
         Map<String, Object> headers = super.getHeaders();
         Call<ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>>> call = expertServiceApi.pageViolationExpertApi(headers, req);
         return this.getResponseBody(call, "pageViolationExpert");
     }
 
+    // 专家违规详情
+    public ApiBaseResult<ViolationExpertGetApiResp> getViolationExpert(ViolationExpertGetApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ViolationExpertGetApiResp>> call = expertServiceApi.getViolationExpertApi(headers, req);
+        return this.getResponseBody(call, "getViolationExpert");
+    }
+
+    // *** 培训、考试 ***
+
+    // 培训课程分页
+    public ApiBaseResult<ApiBasePageResp<TrainCoursePageApiResp>> pageTrainCourse(TrainCoursePageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<TrainCoursePageApiResp>>> call = expertServiceApi.pageTrainCourseApi(headers, req);
+        return this.getResponseBody(call, "pageTrainCourse");
+    }
+
+    // 培训课程详情
+    public ApiBaseResult<TrainCourseGetApiResp> getTrainCourse(TrainCourseGetApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<TrainCourseGetApiResp>> call = expertServiceApi.getTrainCourseApi(headers, req);
+        return this.getResponseBody(call, "getTrainCourse");
+    }
+
+    // 培训课程课节分页
+    public ApiBaseResult<ApiBasePageResp<TrainCourseLessonPageApiResp>> pageTrainCourseLesson(TrainCourseLessonPageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<TrainCourseLessonPageApiResp>>> call = expertServiceApi.pageTrainCourseLessonApi(headers, req);
+        return this.getResponseBody(call, "pageTrainCourseLesson");
+    }
+
+    // 培训课程课节详情
+    public ApiBaseResult<TrainCourseLessonGetApiResp> getTrainCourseLesson(TrainCourseLessonGetApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<TrainCourseLessonGetApiResp>> call = expertServiceApi.getTrainCourseLessonApi(headers, req);
+        return this.getResponseBody(call, "getTrainCourseLesson");
+    }
+
+    // 培训课程课节详情
+    public ApiBaseResult<List<CommonFuJianListApiResp>> listCommonFuJian(CommonFuJianListApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<List<CommonFuJianListApiResp>>> call = expertServiceApi.listCommonFuJianApi(headers, req);
+        return this.getResponseBody(call, "listCommonFuJian");
+    }
+
+    // 更新培训课节学习进度
+    public ApiBaseResult<TainLessonProgressUpdateApiResp> updateTainLessonProgress(TainLessonProgressUpdateApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<TainLessonProgressUpdateApiResp>> call = expertServiceApi.updateTainLessonProgressApi(headers, req);
+        return this.getResponseBody(call, "updateTainLessonProgress");
+    }
+
+    // 培训考试分页
+    public ApiBaseResult<ApiBasePageResp<TrainExamPageApiResp>> pageTrainExam(TrainExamPageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<TrainExamPageApiResp>>> call = expertServiceApi.pageTrainExamApi(headers, req);
+        return this.getResponseBody(call, "pageTrainExam");
+    }
+
 }

src/main/java/com/cnooc/expert/external/file/api/FileServiceApi.java

+package com.cnooc.expert.external.file.api;
+
+import com.cnooc.expert.external.common.model.response.ApiBaseResult;
+import com.cnooc.expert.external.file.model.request.GeneratorDownloadInfoApiReq;
+import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+import java.util.List;
+
+public interface FileServiceApi {
+
+    @POST("/api/file/generatorDownloadInfo")
+    Call<ApiBaseResult<List<DownLoadInfoDTO>>> generatorDownloadInfoApi(@Body GeneratorDownloadInfoApiReq req);
+
+}

src/main/java/com/cnooc/expert/external/file/model/request/GeneratorDownloadInfoApiReq.java

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

src/main/java/com/cnooc/expert/external/file/model/response/DownLoadInfoDTO.java

+package com.cnooc.expert.external.file.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class DownLoadInfoDTO {
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 预览地址
+     */
+    private String downLoadUrl;
+
+    /**
+     * 下载地址
+     */
+    private String directDownLoadUrl;
+
+    /**
+     * 创建时间
+     */
+    private Long createTime;
+
+    private Long fileSize;
+
+}

src/main/java/com/cnooc/expert/external/file/sevice/FileServiceClient.java

+package com.cnooc.expert.external.file.sevice;
+
+import com.cnooc.expert.external.common.AbstractRetrofitManager;
+import com.cnooc.expert.external.common.model.response.ApiBaseResult;
+import com.cnooc.expert.external.file.api.FileServiceApi;
+import com.cnooc.expert.external.file.model.request.GeneratorDownloadInfoApiReq;
+import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Service;
+import retrofit2.Call;
+import retrofit2.Retrofit;
+
+import java.util.List;
+
+@Service
+public class FileServiceClient extends AbstractRetrofitManager {
+
+    private final FileServiceApi fileServiceApi;
+
+    public FileServiceClient(@Qualifier("retrofitFile") Retrofit retrofit) {
+        this.fileServiceApi = retrofit.create(FileServiceApi.class);
+    }
+
+    public ApiBaseResult<List<DownLoadInfoDTO>> generatorDownloadInfo(String pathId) {
+        GeneratorDownloadInfoApiReq apiReq = GeneratorDownloadInfoApiReq.builder()
+                .pathId(pathId)
+                .build();
+        Call<ApiBaseResult<List<DownLoadInfoDTO>>> call = fileServiceApi.generatorDownloadInfoApi(apiReq);
+        return this.getResponseBody(call, "generatorDownloadInfo");
+    }
+
+}

src/main/java/com/cnooc/expert/external/subject/model/request/PlatformCompanyPageApiReq.java

@@ -18,7 +18,7 @@ public class PlatformCompanyPageApiReq {
     private Boolean validStatus;
 
     // 租户ID
-    private Integer tenantId;
+    private Long tenantId;
 
     // 单位名称
     private String subjectName;

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

 package com.cnooc.expert.service;
 
 import com.cnooc.expert.common.response.BasePageResp;
+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;
@@ -11,14 +12,16 @@ 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.PeiXunKeChengKeJiePageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuPageReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiApplyReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiPageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseGetInfoReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonGetReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonPageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCoursePageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainExamPageReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiGetReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiJiLuPageReq;
 import com.cnooc.expert.controller.expert.model.request.ZhuanJiaShenQingJiLuPageReq;
@@ -48,6 +51,11 @@ 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.ExpertInfoGetReq;
+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.TainLessonProgressUpdateApiResp;
+import com.cnooc.expert.external.expert.model.response.TrainCourseLessonGetApiResp;
+import com.cnooc.expert.external.expert.model.response.TrainExamPageApiResp;
 import com.cnooc.expert.external.expert.service.ExpertServiceClient;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
@@ -1338,7 +1346,7 @@ public class ExpertMockService {
                 .build();
     }
 
-    public BasePageResp<Object> pagePingBiaoXiangMu(PingBiaoXiangMuPageReq req) {
+    public BasePageResp<PingBiaoXiangMuPageResp> pagePingBiaoXiangMu(PingBiaoXiangMuPageReq req) {
 
         PingBiaoXiangMuPageResp.ZjcqChouQuQingKuang cqqk = PingBiaoXiangMuPageResp.ZjcqChouQuQingKuang.builder()
                 .adAccount("")
@@ -1521,9 +1529,9 @@ public class ExpertMockService {
                 .dictPingBiaoZhuanYe(dictPingBiaoZhuanYe)
                 .build();
 
-        List<Object> data = Lists.newArrayList(item);
+        List<PingBiaoXiangMuPageResp> data = Lists.newArrayList(item);
 
-        return BasePageResp.builder()
+        return BasePageResp.<PingBiaoXiangMuPageResp>builder()
                 .current(1)
                 .pages(1)
                 .total(1)
@@ -2384,7 +2392,34 @@ public class ExpertMockService {
                 .build();
     }
 
-    public BasePageResp<PeiXunPageResp> pagePeiXunKeCheng(PeiXunPageReq req) {
+    public DongJieGetResp getDongJie(DongJieGetReq req) {
+        DongJieGetResp result = DongJieGetResp.builder()
+                .changeRecordGuid("f47ac10b-58cc-4372-a567-0e02b2c3d479")
+                .shiXiangGuid("a1b2c3d4-e5f6-4a5b-9c8d-7e6f5a4b3c2d")
+                .shiXiangType(1)
+                .oldValue("评标专业状态：正常（可参与评标）")
+                .newValue("评标专业状态：已冻结（暂停参与评标）")
+                .createTime(1762857600000L)
+                .creatorGuid("c1d2e3f4-a5b6-4c5d-6e7f-8a9b0c1d2e3f")
+                .creatorName("张三")
+                .modifyTime(1762857600000L)
+                .modifierGuid(null)
+                .modifierName(null)
+                .jieDongReason(null)
+                .jieDongFuJianGuid(null)
+                .dongJieReason("因系统数据校验发现该评标专业存在信息异常，需临时冻结核查")
+                .dongJieFuJianGuid("fj-98765432-1a2b-3c4d-5e6f-7g8h9i0j1k2l")
+                .dongJieSatrtTime(1762857600000L)
+                .dongJieEndTime(1762944000000L)
+                .build();
+
+        return result;
+    }
+
+    // *** 培训、考试 ***
+
+    // 培训课程分页
+    public BasePageResp<PeiXunPageResp> pageTrainCourse(TrainCoursePageReq req) {
         ArrayList<PeiXunPageResp> list = Lists.newArrayList(
                 // 第1条：日常培训（含3课时，2025年最新发布）
                 PeiXunPageResp.builder()
@@ -2435,7 +2470,8 @@ public class ExpertMockService {
                 .build();
     }
 
-    public Object getPeiXunInfo(PeiXunKeChengReq req) {
+    // 培训课程详情
+    public Object getTrainCourse(TrainCourseGetInfoReq req) {
         return PeiXunPageResp.PeiXunKeChengInfo.builder()
                 .courseGuid("0966b932-cf4f-45bc-bdbf-03ccc4a7e92a")
                 .courseIntroduction("日常培训test")
@@ -2450,35 +2486,8 @@ public class ExpertMockService {
                 .build();
     }
 
-    public Object getPeiXunKeChengKeJieList(PeiXunKeChengReq req) {
-        return null;
-    }
-
-    public DongJieGetResp getDongJie(DongJieGetReq req) {
-        DongJieGetResp result = DongJieGetResp.builder()
-                .changeRecordGuid("f47ac10b-58cc-4372-a567-0e02b2c3d479")
-                .shiXiangGuid("a1b2c3d4-e5f6-4a5b-9c8d-7e6f5a4b3c2d")
-                .shiXiangType(1)
-                .oldValue("评标专业状态：正常（可参与评标）")
-                .newValue("评标专业状态：已冻结（暂停参与评标）")
-                .createTime(1762857600000L)
-                .creatorGuid("c1d2e3f4-a5b6-4c5d-6e7f-8a9b0c1d2e3f")
-                .creatorName("张三")
-                .modifyTime(1762857600000L)
-                .modifierGuid(null)
-                .modifierName(null)
-                .jieDongReason(null)
-                .jieDongFuJianGuid(null)
-                .dongJieReason("因系统数据校验发现该评标专业存在信息异常，需临时冻结核查")
-                .dongJieFuJianGuid("fj-98765432-1a2b-3c4d-5e6f-7g8h9i0j1k2l")
-                .dongJieSatrtTime(1762857600000L)
-                .dongJieEndTime(1762944000000L)
-                .build();
-
-        return result;
-    }
-
-    public BasePageResp<PeiXunKeChengKeJiePageResp> pagePeiXunKeChengKeJie(PeiXunKeChengKeJiePageReq req) {
+    // 培训课程课节分页
+    public BasePageResp<PeiXunKeChengKeJiePageResp> pageTrainCourseLesson(TrainCourseLessonPageReq req) {
 
         ArrayList<PeiXunKeChengKeJiePageResp> list = Lists.newArrayList(
                 PeiXunKeChengKeJiePageResp.builder()
@@ -2498,6 +2507,98 @@ public class ExpertMockService {
                 .build();
     }
 
+    // 培训课程课节详情
+    public TrainCourseLessonGetApiResp getTrainCourseLesson(TrainCourseLessonGetReq req) {
+        return TrainCourseLessonGetApiResp.builder()
+                .courseGuid("edc2673d-ecf6-498a-b0e4-783861db8656")
+                .isTestAfterLearn(false)
+                .learnContent("开标一览表_1690190241009 (1).pdf")
+                .learnFileGroupGuid("4ba116c0-85ae-4087-bbcf-ff427830b9a0")
+                .leiJiXueXiShiChang(null)
+                .lessonGuid("71239d7b-c05e-4ba5-a321-c68490111aa8")
+                .lessonName("都是成双成对")
+                .lessonProgressGuid("")
+                .progressDetails("")
+                .studyProgress(null)
+                .testPaperGuid("")
+                .xueXiShiChang(2)
+                .build();
+    }
+
+    // 附件列表
+    public List<CommonFuJianListApiResp> listCommonFuJian(CommonFuJianListReq req) {
+        List<CommonFuJianListApiResp> apiResp = Lists.newArrayList(
+                CommonFuJianListApiResp.builder()
+                        .createTime(1758532252845L)
+                        .creatorGuid("其他用户")
+                        .creatorName("其他用户")
+                        .fileGroupGuid("97f9d7ce-11dd-4fab-bf97-dee5360d8ffb")
+                        .fileGuid("1419732467212898305")
+                        .fileMD5("")
+                        .fileName("新建 PPT 演示文稿.pdf")
+                        .fileType(null)
+                        .groupGuid("41e2cb9c-5370-4c47-b448-b7b845932a9b")
+                        .otherInfo("")
+                        .sysFile(null)
+                        .uploadTime(null)
+                        .uploadTimeText("")
+                        .build()
+        );
+
+        return apiResp;
+    }
+
+    // 更新培训课节学习进度
+    public TainLessonProgressUpdateApiResp updateTainLessonProgress(TainLessonProgressUpdateApiReq req) {
+        return TainLessonProgressUpdateApiResp.builder()
+                .courseGuid("edc2673d-ecf6-498a-b0e4-783861db8656")
+                .createTime(1763650409116L)
+                .creatorGuid("ed78e562-27a2-43ea-8ccd-704fc12ae0ae")
+                .creatorName("张立辉")
+                .expertGuid("ed78e562-27a2-43ea-8ccd-704fc12ae0ae")
+                .expertTestGuid("")
+                .finishTimestamp(1763650409115L)
+                .leiJiXueXiShiChang(2128L)
+                .lessonGuid("71239d7b-c05e-4ba5-a321-c68490111aa8")
+                .lessonProgressGuid("19f1a6fc-a9cb-4545-850e-a15d15e01d6a")
+                .modifierGuid("ed78e562-27a2-43ea-8ccd-704fc12ae0ae")
+                .modifierName("张立辉")
+                .modifyTime(1763650409116L)
+                .progressDetails("[{\"guid\":\"eabd8454-4ff5-4a36-a2a9-297d48c10587\",\"duration\":1,\"currentTime\":1,\"progress\":1}]")
+                .progressStatus(20)
+                .studyProgress("1")
+                .build();
+    }
+
+    public BasePageResp<TrainExamPageApiResp> pageTrainExam(TrainExamPageReq req) {
+        List<TrainExamPageApiResp> list = Lists.newArrayList(
+                TrainExamPageApiResp.builder()
+                        .courseGuid("2bc31b55-5ea5-4f6f-b58c-5cc3d39f9c9d")
+                        .courseName("入库培训")
+                        .courseReleaseTimestamp(1702872120000L)
+                        .courseTypeName("入库培训")
+                        .examPassTimestamp(null)
+                        .examResult(0)
+                        .jiGeScore(new BigDecimal("60.00"))
+                        .lessonGuid("")
+                        .lessonName("")
+                        .score(new BigDecimal("100.00"))
+                        .studyProgress(new BigDecimal("0.06"))
+                        .testPaperGuid("0d747edf-eb8b-4a06-8f91-3970adb54eed")
+                        .zuiGaoScore(null)
+                        .build()
+        );
+
+        return BasePageResp.<TrainExamPageApiResp>builder()
+                .current(1)
+                .pages(1)
+                .total(4)
+                .data(list)
+                .build();
+    }
+
+
+
     public PeiXunKeChengKeJieGetResp getPeiXunKeChengKeJie(PeiXunKeChengKeJieGetReq req) {
 
         return PeiXunKeChengKeJieGetResp.builder()

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

 package com.cnooc.expert.service;
 
 import com.cnooc.expert.common.response.BasePageResp;
+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;
@@ -11,60 +12,76 @@ 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.PeiXunKeChengKeJiePageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuInfoGetByChouQuMaReq;
-import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuPageReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiApplyReq;
 import com.cnooc.expert.controller.expert.model.request.QingJiaJinJiPageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseGetInfoReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonGetReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCourseLessonPageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainCoursePageReq;
+import com.cnooc.expert.controller.expert.model.request.TrainExamPageReq;
 import com.cnooc.expert.controller.expert.model.request.WeiGuiGetReq;
 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.DongJieGetResp;
-import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
-import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaPageResp;
 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.PeiXunKeChengKeJiePageResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
-import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuByOwnerPageResp;
-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.QingJiaJinJiPageResp;
-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.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
 import com.cnooc.expert.external.expert.model.request.CityTreeApiReq;
+import com.cnooc.expert.external.expert.model.request.CommonFuJianListApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonJiTuanErJiDanWeiListApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiReq;
 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.ExpertInfoGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
+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.TrainCourseGetApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainCourseLessonGetApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainCourseLessonPageApiReq;
+import com.cnooc.expert.external.expert.model.request.TrainExamPageApiReq;
+import com.cnooc.expert.external.expert.model.request.ViolationExpertGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ViolationExpertPageApiReq;
 import com.cnooc.expert.external.expert.model.request.XiangMuInfoByChouQuNumGetApiReq;
+import com.cnooc.expert.external.expert.model.request.ZhuanJiaPingBiaoXiangMuRenWuPageApiReq;
 import com.cnooc.expert.external.expert.model.response.CityTreeApiResp;
+import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonJiTuanErJiDanWeiListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiResp;
 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.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.TrainCourseGetApiResp;
+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.TrainCoursePageApiReq;
+import com.cnooc.expert.external.expert.model.response.TrainCoursePageApiResp;
+import com.cnooc.expert.external.expert.model.response.TrainExamPageApiResp;
+import com.cnooc.expert.external.expert.model.response.ViolationExpertGetApiResp;
 import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
 import com.cnooc.expert.external.expert.model.response.XiangMuInfoByChouQuNumGetApiResp;
+import com.cnooc.expert.external.expert.model.response.ZhuanJiaPingBiaoXiangMuRenWuPageApiResp;
 import com.cnooc.expert.external.expert.service.ExpertServiceClient;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -76,10 +93,9 @@ public class ExpertService {
 
     private final ExpertServiceClient expertServiceClient;
 
-    public ApproveBusinessIdGetResp getApproveBusinessId() {
-        return ApproveBusinessIdGetResp.builder()
-                .businessId("1439982443434848257")
-                .build();
+    public String getApproveBusinessId() {
+        ApiBaseResult<String> apiResp = expertServiceClient.getBusinessId();
+        return apiResp.getData();
     }
 
     public List<CommonNofilterEnumGetApiResp> listDictNofilter(DictNofilterListReq req) {
@@ -178,225 +194,78 @@ public class ExpertService {
         return apiResp.getData();
     }
 
-    public BasePageResp<QingJiaJinJiPageResp> pageJinJiQingJia(QingJiaJinJiPageReq req) {
-        List<QingJiaJinJiPageResp> data = Lists.newArrayList(
-                QingJiaJinJiPageResp.builder()
-                        .chouQuNum("202509236391")
-                        .jinJiQingJiaGuid("800abddb-e866-439b-93e6-2ac3f9dee3c8")
-                        .chouQuQingKuangGuid("5e2f90be-b8ad-4a8e-931d-cdaae5f1c118")
-                        .chouQuZhuangTai(null)
-                        .xiangMuNo("XCGSQ2025091236")
-                        .xiangMuName("0923采购申请资格审查")
-                        .jinJiQingJiaReason("1111")
-                        .qingJiaTime(1763037471982L)
-                        .isQingJia(false)
-                        .pingBiaoStartTime(1758609816544L)
-                        .shenHeStatus(50)
-                        .pingBiaoEndTime(1758624216544L)
-                        .build()
-        );
+    // 紧急请假分页
+    public BasePageResp<JinJiQingJiaPageApiResp> pageJinJiQingJia(QingJiaJinJiPageReq req) {
+        JinJiQingJiaPageApiReq.JinJiQingJiaVo qingJiaVo = JinJiQingJiaPageApiReq.JinJiQingJiaVo.builder()
+                .zhuanJiaGuid(req.getZhuanJiaGuid())
+                .qingJiaStartTime(req.getQingJiaStartTime())
+                .qingJiaEndTime(req.getQingJiaEndTime())
+                .build();
+        JinJiQingJiaPageApiReq apiReq = JinJiQingJiaPageApiReq.builder()
+                .page(req.getPageNo())
+                .rows(req.getPageSize())
+                .jinJiQingJiaVO(qingJiaVo)
+                .build();
+        ApiBaseResult<ApiBasePageResp<JinJiQingJiaPageApiResp>> apiResp = expertServiceClient.pageJinJiQingJia(apiReq);
 
-        return BasePageResp.<QingJiaJinJiPageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(1)
-                .data(data)
+        ApiBasePageResp<JinJiQingJiaPageApiResp> pageResp = apiResp.getData();
+
+        return BasePageResp.<JinJiQingJiaPageApiResp>builder()
+                .current(pageResp.getCurrent())
+                .pages(pageResp.getPages())
+                .total(pageResp.getTotal())
+                .data(pageResp.getData())
                 .build();
     }
 
-    public BasePageResp<PingBiaoXiangMuPageResp> pagePingBiaoXiangMu(PingBiaoXiangMuPageReq req) {
-
-        PingBiaoXiangMuPageResp.ZjcqChouQuQingKuang cqqk = PingBiaoXiangMuPageResp.ZjcqChouQuQingKuang.builder()
-                .adAccount("")
-                .bankCard("")
-                .bankName("")
-                .bidSectionId(null)
-                .buChouReason("")
-                .chongXinTongZhiStatus(null)
-                .chouQuCiShu(1)
-                .chouQuNum("202509236135")
-                .chouQuQingKuangGuid("c14061e0-6a79-40d8-9317-e080bbf4a8f3")
-                .chouQuRenWuGuid("6923480b-22ab-4b0d-b7d3-95450d7fed82")
-                .chouQuType(10)
-                .chouQuZhuanYeGuid("a51a0e98-396a-46a6-881e-889609dd00cb")
-                .createTime(1758610110239L)
-                .createTimeText("2025-09-23 14:48:30")
-                .creatorGuid("1371780505761468417")
-                .creatorName("")
-                .danWeiBH("")
-                .danWeiName("中化建国际招标有限责任公司天津分公司")
-                .diQu("")
-                .email("1590000021@cnooc.com.cn")
-                .erJiKuName("")
-                .haveChengFa(false)
-                .isBuChou(false)
-                .isCancel(false)
-                .isDuanXinQueRen(true)
-                .isFeiQi(false)
-                .isFeiQiText("否")
-                .isHuLue(false)
-                .isNewChouQu(false)
-                .isSuoDing(false)
-                .isTuiSongSJTJ(false)
-                .isXiuGaiRenGongTongZhi(false)
-                .jianKuangBaoFuJianGuid("")
-                .jinJiQingJiaGuid("")
-                .jinJiQingJiaTime(null)
-                .meetingId("")
-                .meetingPassWord("")
-                .mobile("15900000018")
-                .modifierName("合同四")
-                .modifyTime(1758610477749L)
-                .modifyTimeText("2025-09-23 14:54:37")
-                .pingBiaoAddress("北京市京信大厦28层")
-                .pingBiaoDiQuGuid("110100")
-                .pingBiaoEndTime(1758624216544L)
-                .pingBiaoEndTimeText("2025-09-23 18:43:36")
-                .pingBiaoFenZhongXin("")
-                .pingBiaoStartTime(1758609816544L)
-                .pingBiaoStartTimeText("2025-09-23 14:43:36")
-                .pingShenDiDian("110000,110100,110105")
-                .professionLevel(null)
-                .qianDaoTime(null)
-                .qingJiaCreatorName("")
-                .qingJiaSource(null)
-                .qingJiaTime(null)
-                .qingJiaTimeNode(null)
-                .reason("")
-                .sealValidTime(null)
-                .sendHealthStatus(false)
-                .shenFenZheng("BB94A0293969808540687D32F2AE3C9A082005536A0A49AF72822987955D8D16")
-                .shenHeStatus(null)
-                .status(2)
-                .tag("")
-                .tenantId(892422091105296385L)
-                .tenantName("")
-                .tongZhiCiShu(1)
-                .tongZhiFangShi(20)
-                .tongZhiJieGuo(2)
-                .tuiSongShiBaiCiShuSJTJ(null)
-                .xiangMuGuid("a4168ddc-f8b2-4244-bc9b-b4ec6d7f8266")
-                .xiangMuName("")
-                .xiangMuNo("")
-                .xingChengMaFuJianGuid("")
-                .zhiChengName("")
-                .zhiDingZhuanJiaType(null)
-                .zhuanJiaCode("000099")
-                .zhuanJiaDengJi(null)
-                .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                .zhuanJiaName("物装中心十八")
-                .zhuanJiaShuXing("")
-                .zhuanJiaSuoZaiDiCode("")
-                .zhuanJiaSuoZaiDiGuids("")
-                .zhuanJiaSuoZaiDiName("")
-                .zhuanYeCode("A00001")
-                .zhuanYeGuid("62848bc2-6b2d-4549-9e33-13121cf0c3ae")
-                .zhuanYeGuidPri("62848bc2-6b2d-4549-9e33-13121cf0c3ae")
-                .zhuanYeName("测试A00001")
+    // 紧急请假申请
+    public JinJiQingJiaApplyApiResp applyJinJiQingJia(QingJiaJinJiApplyReq req) {
+        JinJiQingJiaApplyApiReq apiReq = JinJiQingJiaApplyApiReq.builder()
+                .chouQuQingKuangGuid(req.getChouQuQingKuangGuid())
+                .chouQuRenWuGuid(req.getChouQuRenWuGuid())
+                .jinJiQingJiaReason(req.getJinJiQingJiaReason())
+                .qingJiaTime(req.getQingJiaTime())
                 .build();
+        ApiBaseResult<JinJiQingJiaApplyApiResp> apiResp = expertServiceClient.applyJinJiQingJia(apiReq);
 
-        PingBiaoXiangMuPageResp.DictPingBiaoZhuanYe dictPingBiaoZhuanYe = PingBiaoXiangMuPageResp.DictPingBiaoZhuanYe.builder()
-                .checked(false)
-                .createTime(1660731959615L)
-                .createTimeText("2022-08-17 18:25:59")
-                .creatorName("dev-test")
-                .excelForLevel(null)
-                .excelForNumber("")
-                .excelForNumberParent("")
-                .excelIsChecked(null)
-                .hasLastChildZY(false)
-                .isHide(false)
-                .isScarce(false)
-                .lastLevel(false)
-                .level(null)
-                .lsChildren(null)
-                .miaoShu("")
-                .modifierName("郑炯达")
-                .modifyTime(1675057207760L)
-                .modifyTimeText("2023-01-30 13:40:07")
-                .oldScarce(false)
-                .paiXuHao(1)
-                .parentGuid("0")
-                .path("$$$A00001$$$")
-                .professionLevel(1)
-                .scarce(false)
-                .state("")
-                .suoShuZhaoBiaoDaiLi("91110000710932216U")
-                .xiaquCode(123456789)
-                .yingJiKuKeChouNum(null)
-                .yingJiKuNum(null)
-                .zhengChangKuKeChouNum(null)
-                .zhengChangKuNum(2)
-                .zhuKuNum(null)
-                .zhuanJiaLeiBie(null)
-                .zhuanYeBH("A00001")
-                .zhuanYeGuid("62848bc2-6b2d-4549-9e33-13121cf0c3ae")
-                .zhuanYeName("测试A00001")
-                .zhuanYeShuXing(2)
-                .build();
+        return apiResp.getData();
+    }
 
-        PingBiaoXiangMuPageResp item = PingBiaoXiangMuPageResp.builder()
-                .chouQuFangShi(10)
-                .chouQuRenDanWei("")
-                .chouQuRenName("")
-                .chouQuRenPhone("")
-                .chouQuZhuanTai(null)
-                .fanKuiYiJian("")
-                .isCQDHuanZhuanYe(false)
-                .isSubmit(null)
-                .jianDuRenDanWei("")
-                .jianDuRenName("")
-                .jingBanRen("")
-                .jingBanRenPhone("")
-                .keywords("123")
-                .messageContent("")
-                .modifierGuid("")
-                .modifierName("")
-                .modifyTime(1758610073858L)
-                .modifyTimeText("2025-09-23 14:47:53")
-                .pingJiaStatus(1)
-                .pingShenType(30)
-                .projectId("")
-                .reevaluation(false)
-                .reevaluationName("")
-                .shuJuLaiYuan(0)
-                .submitTime(null)
-                .submitTimeText("")
-                .tenantId(892422091105296385L)
-                .tenantName("")
-                .tiJiaoEndTime(null)
-                .tiJiaoEndTimeText("")
-                .tiJiaoStartTime(null)
-                .tiJiaoStartTimeText("")
-                .tongZhiFangShi(null)
-                .workFlowBusinessIdNew("")
-                .xiangMuApplyName("")
-                .xiangMuApplyNo("c5472c04-9754-44f0-bd93-9c0e70cd6ef7")
-                .xiangMuAttr(null)
-                .xiangMuCaiGouDanWei("")
-                .xiangMuDaiMa("")
-                .xiangMuGuid("a4168ddc-f8b2-4244-bc9b-b4ec6d7f8266")
-                .xiangMuLaiYuan(null)
-                .xiangMuName("0923采购申请资格审查")
-                .xiangMuNo("XCGSQ2025091236")
-                .xiangMuType(0)
-                .xiangMuWho(1)
-                .zhaoBiaoFangShi("")
-                .zjcqXiangMuStatus(null)
-                .cqqk(cqqk)
-                .dictPingBiaoZhuanYe(dictPingBiaoZhuanYe)
+    // 个人请假分页
+    public BasePageResp<GeRenXiuJiaPageApiResp> pageGeRenXiuJia(GeRenXiuJiaPageReq req) {
+        GeRenXiuJiaPageApiReq apiReq = GeRenXiuJiaPageApiReq.builder()
+                .page(req.getPageNo())
+                .rows(req.getPageSize())
+                .zhuanJiaGuid(req.getZhuanJiaGuid())
+                .qingJiaStartTime(req.getQingJiaStartTime())
+                .qingJiaEndTime(req.getQingJiaEndTime())
                 .build();
+        ApiBaseResult<ApiBasePageResp<GeRenXiuJiaPageApiResp>> apiResp = expertServiceClient.pageGeRenXiuJia(apiReq);
 
-        List<PingBiaoXiangMuPageResp> data = Lists.newArrayList(item);
+        ApiBasePageResp<GeRenXiuJiaPageApiResp> pageResp = apiResp.getData();
 
-        return BasePageResp.<PingBiaoXiangMuPageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(1)
-                .data(data)
+        return BasePageResp.<GeRenXiuJiaPageApiResp>builder()
+                .current(pageResp.getCurrent())
+                .pages(pageResp.getPages())
+                .total(pageResp.getTotal())
+                .data(pageResp.getData())
                 .build();
     }
 
+    // 个人休假申请
+    public GeRenXiuJiaApplyApiResp applyGeRenXiuJia(GeRenXiuJiaApplyReq req) {
+        GeRenXiuJiaApplyApiReq apiReq = GeRenXiuJiaApplyApiReq.builder()
+                .zhuanJiaGuid(req.getZhuanJiaGuid())
+                .startTime(req.getStartTime())
+                .endTime(req.getEndTime())
+                .qingJiaYuanYin(req.getQingJiaYuanYin())
+                .qingJiaDays(req.getQingJiaDays())
+                .build();
+        ApiBaseResult<GeRenXiuJiaApplyApiResp> apiResp = expertServiceClient.applyGeRenXiuJia(apiReq);
+
+        return apiResp.getData();
+    }
+
     public List<PingBiaoZhuanYeTreeNodeResp> treePingBiaoZhuanYe() {
 
         List<PingBiaoZhuanYeTreeNodeResp> children3 = Lists.newArrayList(
@@ -450,690 +319,211 @@ public class ExpertService {
         return children1;
     }
 
-    public QingJiaJinJiApplyResp applyJinJiQingJia(QingJiaJinJiApplyReq req) {
-
-        return QingJiaJinJiApplyResp.builder()
-                .chouQuQingKuangGuid("5e2f90be-b8ad-4a8e-931d-cdaae5f1c118")
-                .chouQuRenWuGuid("6923480b-22ab-4b0d-b7d3-95450d7fed82")
-                .createTime(1763037473819L)
-                .createTimeText("2025-11-13 20:37:53")
-                .creatorGuid("1171528721049890817")
-                .creatorName("物装中心二")
-                .jinJiQingJiaGuid("800abddb-e866-439b-93e6-2ac3f9dee3c8")
-                .jinJiQingJiaReason("1111")
-                .qingJiaSource("")
-                .qingJiaTime(1763037471982L)
-                .qingJiaTimeNode(null)
-                .qingJiaTimeText("2025-11-13 20:37:51")
-                .shenHeStatus(50)
-                .build();
-    }
-
-    public BasePageResp<GeRenXiuJiaPageResp> pageGeRenXiuJia(GeRenXiuJiaPageReq req) {
-        List<GeRenXiuJiaPageResp> data = Lists.newArrayList(
-                GeRenXiuJiaPageResp.builder()
-                        .createTime(1761198859239L)
-                        .createTimeText("2025-10-23 13:54:19")
-                        .creatorName("物装中心十七")
-                        .endTime(1761408000000L)
-                        .endTimeText("2025-10-26 00:00:00")
-                        .isHaveChanged(false)
-                        .isXiTongQj(false)
-                        .leiXing(1)
-                        .modifierName("物装中心十七")
-                        .modifyTime(1761198867075L)
-                        .modifyTimeText("2025-10-23 13:54:27")
-                        .qingJiaDays("1.0")
-                        .qingJiaEndTime(null)
-                        .qingJiaGuid("05317e7a-5e19-4125-a088-1d5256aa5eed")
-                        .qingJiaStartTime(null)
-                        .qingJiaYuanYin("ceshiyixia")
-                        .remark("")
-                        .shenFenZheng("")
-                        .shenPiTime(null)
-                        .shenPiTimeText("")
-                        .shenPiYiJian("")
-                        .shenPiZhuangTai(null)
-                        .startTime(1761321600000L)
-                        .startTimeText("2025-10-25 00:00:00")
-                        .tiJiaoTime(null)
-                        .tiJiaoTimeText("")
-                        .xiaoJiaTime(1761198867075L)
-                        .xiaoJiaTimeText("2025-10-23 13:54:27")
-                        .zhuanJiaCode("")
-                        .zhuanJiaGuid("3b5def9d-2e98-4f90-9aaa-10aefd28c61b")
-                        .zhuanJiaName("")
-                        .build()
-
-        );
-
-        return BasePageResp.<GeRenXiuJiaPageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(1)
-                .data(data)
+    public BasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp> pagePingBiaoXiangmuByOwner(PingBiaoXiangMuByOwnerPageReq req) {
+        ZhuanJiaPingBiaoXiangMuRenWuPageApiReq apiReq = ZhuanJiaPingBiaoXiangMuRenWuPageApiReq.builder()
+                .page(req.getPageNo())
+                .rows(req.getPageSize())
+                .pingBiaoStartTime(req.getPingBiaoStartTime())
+                .pingBiaoEndTime(req.getPingBiaoEndTime())
                 .build();
-    }
+        ApiBaseResult<ApiBasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp>> apiResp = expertServiceClient.pageZhuanJiaPingBiaoXiangMuRenWu(apiReq);
 
-    public GeRenXiuJiaApplyResp applyGeRenXiuJia(GeRenXiuJiaApplyReq req) {
+        ApiBasePageResp<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp> pageResp = apiResp.getData();
 
-        return GeRenXiuJiaApplyResp.builder()
-                .createTime(1763038871315L)
-                .createTimeText("2025-11-13 21:01:11")
-                .creatorName("物装中心十七")
-                .endTime(1762531200000L)
-                .endTimeText("2025-11-08 00:00:00")
-                .isHaveChanged(false)
-                .isXiTongQj(false)
-                .leiXing(1)
-                .modifierName("")
-                .modifyTime(null)
-                .modifyTimeText("")
-                .qingJiaDays(2)
-                .qingJiaEndTime(null)
-                .qingJiaGuid("81d87a6c-6619-409d-abcb-4638d4853fe0")
-                .qingJiaStartTime(null)
-                .qingJiaYuanYin("111")
-                .remark("")
-                .shenFenZheng("")
-                .shenPiTime(null)
-                .shenPiTimeText("")
-                .shenPiYiJian("")
-                .shenPiZhuangTai(null)
-                .startTime(1762358400000L)
-                .startTimeText("2025-11-06 00:00:00")
-                .tiJiaoTime(null)
-                .tiJiaoTimeText("")
-                .xiaoJiaTime(null)
-                .xiaoJiaTimeText("")
-                .zhuanJiaCode("")
-                .zhuanJiaGuid("3b5def9d-2e98-4f90-9aaa-10aefd28c61b")
-                .zhuanJiaName("")
+        return BasePageResp.<ZhuanJiaPingBiaoXiangMuRenWuPageApiResp>builder()
+                .current(pageResp.getCurrent())
+                .pages(pageResp.getPages())
+                .total(pageResp.getTotal())
+                .data(pageResp.getData())
                 .build();
     }
 
-    public BasePageResp<PingBiaoXiangMuByOwnerPageResp> pagePingBiaoXiangmuByOwner(PingBiaoXiangMuByOwnerPageReq req) {
-
-        PingBiaoXiangMuByOwnerPageResp.ZjcqChouQuQingKuang cqqk = PingBiaoXiangMuByOwnerPageResp.ZjcqChouQuQingKuang.builder()
-                .adAccount("")
-                .bankCard("")
-                .bankName("")
-                .bidSectionId(null)
-                .buChouReason("")
-                .chongXinTongZhiStatus(null)
-                .chouQuCiShu(1)
-                .chouQuNum("202509236135")
-                .chouQuQingKuangGuid("c14061e0-6a79-40d8-9317-e080bbf4a8f3")
-                .chouQuRenWuGuid("6923480b-22ab-4b0d-b7d3-95450d7fed82")
-                .chouQuType(10)
-                .chouQuZhuanYeGuid("a51a0e98-396a-46a6-881e-889609dd00cb")
-                .createTime(1758610110239L)
-                .createTimeText("2025-09-23 14:48:30")
-                .creatorGuid("1371780505761468417")
-                .creatorName("")
-                .danWeiBH("")
-                .danWeiName("中化建国际招标有限责任公司天津分公司")
-                .diQu("")
-                .email("1590000021@cnooc.com.cn")
-                .erJiKuName("")
-                .haveChengFa(false)
-                .isBuChou(false)
-                .isCancel(false)
-                .isDuanXinQueRen(true)
-                .isFeiQi(false)
-                .isFeiQiText("否")
-                .isHuLue(false)
-                .isNewChouQu(false)
-                .isSuoDing(false)
-                .isTuiSongSJTJ(false)
-                .isXiuGaiRenGongTongZhi(false)
-                .jianKuangBaoFuJianGuid("")
-                .jinJiQingJiaGuid("")
-                .jinJiQingJiaTime(null)
-                .meetingId("")
-                .meetingPassWord("")
-                .mobile("15900000018")
-                .modifierName("合同四")
-                .modifyTime(1758610477749L)
-                .modifyTimeText("2025-09-23 14:54:37")
-                .pingBiaoAddress("北京市京信大厦28层")
-                .pingBiaoDiQuGuid("110100")
-                .pingBiaoEndTime(1758624216544L)
-                .pingBiaoEndTimeText("2025-09-23 18:43:36")
-                .pingBiaoFenZhongXin("")
-                .pingBiaoStartTime(1758609816544L)
-                .pingBiaoStartTimeText("2025-09-23 14:43:36")
-                .pingShenDiDian("110000,110100,110105")
-                .professionLevel(null)
-                .qianDaoTime(null)
-                .qingJiaCreatorName("")
-                .qingJiaSource(null)
-                .qingJiaTime(null)
-                .qingJiaTimeNode(null)
-                .reason("")
-                .sealValidTime(null)
-                .sendHealthStatus(false)
-                .shenFenZheng("BB94A0293969808540687D32F2AE3C9A082005536A0A49AF72822987955D8D16")
-                .shenHeStatus(null)
-                .status(2)
-                .tag("")
-                .tenantId(892422091105296385L)
-                .tenantName("")
-                .tongZhiCiShu(1)
-                .tongZhiFangShi(20)
-                .tongZhiJieGuo(2)
-                .tuiSongShiBaiCiShuSJTJ(null)
-                .xiangMuGuid("a4168ddc-f8b2-4244-bc9b-b4ec6d7f8266")
-                .xiangMuName("")
-                .xiangMuNo("")
-                .xingChengMaFuJianGuid("")
-                .zhiChengName("")
-                .zhiDingZhuanJiaType(null)
-                .zhuanJiaCode("000099")
-                .zhuanJiaDengJi(null)
-                .zhuanJiaGuid("1b4ffa58-2197-4b91-8178-3f49bd100f09")
-                .zhuanJiaName("物装中心十八")
-                .zhuanJiaShuXing("")
-                .zhuanJiaSuoZaiDiCode("")
-                .zhuanJiaSuoZaiDiGuids("")
-                .zhuanJiaSuoZaiDiName("")
-                .zhuanYeCode("A00001")
-                .zhuanYeGuid("62848bc2-6b2d-4549-9e33-13121cf0c3ae")
-                .zhuanYeGuidPri("62848bc2-6b2d-4549-9e33-13121cf0c3ae")
-                .zhuanYeName("测试A00001")
-                .build();
-
-        PingBiaoXiangMuByOwnerPageResp.DictPingBiaoZhuanYe dictPingBiaoZhuanYe = PingBiaoXiangMuByOwnerPageResp.DictPingBiaoZhuanYe.builder()
-                .checked(false)
-                .createTime(1660731959615L)
-                .createTimeText("2022-08-17 18:25:59")
-                .creatorName("dev-test")
-                .excelForLevel(null)
-                .excelForNumber("")
-                .excelForNumberParent("")
-                .excelIsChecked(null)
-                .hasLastChildZY(false)
-                .isHide(false)
-                .isScarce(false)
-                .lastLevel(false)
-                .level(null)
-                .lsChildren(null)
-                .miaoShu("")
-                .modifierName("郑炯达")
-                .modifyTime(1675057207760L)
-                .modifyTimeText("2023-01-30 13:40:07")
-                .oldScarce(false)
-                .paiXuHao(1)
-                .parentGuid("0")
-                .path("$$$A00001$$$")
-                .professionLevel(1)
-                .scarce(false)
-                .state("")
-                .suoShuZhaoBiaoDaiLi("91110000710932216U")
-                .xiaquCode(123456789)
-                .yingJiKuKeChouNum(null)
-                .yingJiKuNum(null)
-                .zhengChangKuKeChouNum(null)
-                .zhengChangKuNum(2)
-                .zhuKuNum(null)
-                .zhuanJiaLeiBie(null)
-                .zhuanYeBH("A00001")
-                .zhuanYeGuid("62848bc2-6b2d-4549-9e33-13121cf0c3ae")
-                .zhuanYeName("测试A00001")
-                .zhuanYeShuXing(2)
-                .build();
-
-        PingBiaoXiangMuByOwnerPageResp item = PingBiaoXiangMuByOwnerPageResp.builder()
-                .chouQuFangShi(10)
-                .chouQuRenDanWei("")
-                .chouQuRenName("")
-                .chouQuRenPhone("")
-                .chouQuZhuanTai(null)
-                .createTime(1758609082178L)
-                .createTimeText("2025-09-23 14:31:22")
-                .creatorGuid("")
-                .creatorName("")
-                .fanKuiYiJian("")
-                .isCQDHuanZhuanYe(false)
-                .isSubmit(null)
-                .jianDuRenDanWei("")
-                .jianDuRenName("")
-                .jingBanRen("")
-                .jingBanRenPhone("")
-                .keywords("123")
-                .messageContent("")
-                .modifierGuid("")
-                .modifierName("")
-                .modifyTime(1758610073858L)
-                .modifyTimeText("2025-09-23 14:47:53")
-                .pingJiaStatus(1)
-                .pingShenType(30)
-                .projectId("")
-                .reevaluation(false)
-                .reevaluationName("")
-                .shuJuLaiYuan(0)
-                .submitTime(null)
-                .submitTimeText("")
-                .tenantId(892422091105296385L)
-                .tenantName("")
-                .tiJiaoEndTime(null)
-                .tiJiaoEndTimeText("")
-                .tiJiaoStartTime(null)
-                .tiJiaoStartTimeText("")
-                .tongZhiFangShi(null)
-                .workFlowBusinessIdNew("")
-                .xiangMuApplyName("")
-                .xiangMuApplyNo("c5472c04-9754-44f0-bd93-9c0e70cd6ef7")
-                .xiangMuAttr(null)
-                .xiangMuCaiGouDanWei("")
-                .xiangMuDaiMa("")
-                .xiangMuGuid("a4168ddc-f8b2-4244-bc9b-b4ec6d7f8266")
-                .xiangMuLaiYuan(null)
-                .xiangMuName("0923采购申请资格审查")
-                .xiangMuNo("XCGSQ2025091236")
-                .xiangMuType(0)
-                .xiangMuWho(1)
-                .zhaoBiaoFangShi("")
-                .zjcqXiangMuStatus(null)
-                .cqqk(cqqk)
-                .dictPingBiaoZhuanYe(dictPingBiaoZhuanYe)
-                .build();
-
-        List<PingBiaoXiangMuByOwnerPageResp> data = Lists.newArrayList(item);
-
-        return BasePageResp.<PingBiaoXiangMuByOwnerPageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(1)
-                .data(data)
-                .build();
-    }
+    // ***** 违规、冻结 *****
 
+    // 专家冻结分页
     public BasePageResp<DongJieZhuanYePageApiResp> pageDongJie(DongJiePageReq req) {
         DongJieZhuanYePageApiReq apiReq = DongJieZhuanYePageApiReq.builder()
                 .page(req.getPageNo())
                 .rows(req.getPageSize())
                 .zhuanJiaGuid(UserInfoUtils.getExpertInfo().getZhuanJiaGuid())
                 .build();
-        ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>> apiResp = expertServiceClient.pageDongJieZhuanYeApi(apiReq);
+        ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>> apiResp = expertServiceClient.pageDongJieZhuanYe(apiReq);
 
         ApiBasePageResp<DongJieZhuanYePageApiResp> pageResp = apiResp.getData();
 
         return BasePageResp.<DongJieZhuanYePageApiResp>builder()
-                .current(pageResp.getPageNo())
-                .pages(pageResp.getPageSize())
-                .total(pageResp.getTotalCount())
-                .data(pageResp.getList())
+                .current(pageResp.getCurrent())
+                .pages(pageResp.getPages())
+                .total(pageResp.getTotal())
+                .data(pageResp.getData())
                 .build();
     }
 
+    // 专家冻结详情
+    public DongJieGetApiResp getDongJie(DongJieGetReq req) {
+        DongJieGetApiReq apiReq = DongJieGetApiReq.builder()
+                .pingBiaoZhuanYeGuid(req.getPingBiaoZhuanYeGuid())
+                .build();
+        ApiBaseResult<DongJieGetApiResp> apiResp = expertServiceClient.getDongJieExpert(apiReq);
 
+        return apiResp.getData();
+    }
+
+
+    // 专家违规分页
     public BasePageResp<ViolationExpertPageApiResp> pageWeiGuiList(WeiGuiJiLuPageReq req) {
         ViolationExpertPageApiReq apiReq = ViolationExpertPageApiReq.builder()
+                .page(req.getPageNo())
+                .rows(req.getPageSize())
+                .zhuanJiaGuid(req.getZhuanJiaGuid())
                 .build();
         ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>> apiResp = expertServiceClient.pageViolationExpert(apiReq);
 
         ApiBasePageResp<ViolationExpertPageApiResp> pageResp = apiResp.getData();
 
         return BasePageResp.<ViolationExpertPageApiResp>builder()
-                .current(pageResp.getPageNo())
-                .pages(pageResp.getPageSize())
-                .total(pageResp.getTotalCount())
-                .data(pageResp.getList())
+                .current(pageResp.getCurrent())
+                .pages(pageResp.getPages())
+                .total(pageResp.getTotal())
+                .data(pageResp.getData())
                 .build();
     }
 
-    public List<WeiGuiPageResp.WeiGuiShiXiang> listWeiGuiShiXiang() {
-        ArrayList<WeiGuiPageResp.WeiGuiShiXiang> list = Lists.newArrayList(
-                // 第1条数据
-                WeiGuiPageResp.WeiGuiShiXiang.builder()
-                        .createTime(1698737053322L)
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .isDeleted(false)
-                        .modifierGuid("1005209701203447809")
-                        .modifierName("中化建国际招标有限责任公司")
-                        .modifyTime(1698737082055L)
-                        .qiYongstatus(1)
-                        .weiguiChuliReason("向他人透露对投标文件的评审和比较、中标候选人的推荐以及与评标有关的其他情况")
-                        .weiguiChuliShichangs("-1")
-                        .weiguiShixiangGuid("23490f8f-c4e1-4726-a7d8-ad623f3e133f")
-                        .build(),
+    // 专家违规详情
+    public ViolationExpertGetApiResp getWeiGui(WeiGuiGetReq req) {
+        ViolationExpertGetApiReq apiReq = ViolationExpertGetApiReq.builder()
+                .zhuanJiaGuid(req.getZhuanJiaGuid())
+                .guid(req.getGuid())
+                .build();
+        ApiBaseResult<ViolationExpertGetApiResp> apiResp = expertServiceClient.getViolationExpert(apiReq);
 
-                // 第2条数据
-                WeiGuiPageResp.WeiGuiShiXiang.builder()
-                        .createTime(1698737076518L)
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .isDeleted(false)
-                        .modifierGuid("1005209701203447809")
-                        .modifierName("中化建国际招标有限责任公司")
-                        .modifyTime(1698737079691L)
-                        .qiYongstatus(1)
-                        .weiguiChuliReason("严重违反评标工作纪律、执业规范或者职业道德")
-                        .weiguiChuliShichangs("-1,3")
-                        .weiguiShixiangGuid("4c1102e5-bf31-491d-8879-1ea335f5e40f")
-                        .build(),
+        return apiResp.getData();
+    }
 
-                // 第3条数据
-                WeiGuiPageResp.WeiGuiShiXiang.builder()
-                        .createTime(1698736884442L)
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .isDeleted(false)
-                        .modifierGuid("1005209701203447809")
-                        .modifierName("中化建国际招标有限责任公司")
-                        .modifyTime(1715860266425L)
-                        .qiYongstatus(1)
-                        .weiguiChuliReason("有关部门依法对投诉进行调查时，不予配合")
-                        .weiguiChuliShichangs("3,6,12,0")
-                        .weiguiShixiangGuid("4f337ae8-c921-4882-bf5f-c2d6ff132cdb")
-                        .build(),
+    // ***** 培训 / 考试 *****
 
-                // 第4条数据
-                WeiGuiPageResp.WeiGuiShiXiang.builder()
-                        .createTime(1698737002259L)
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .isDeleted(false)
-                        .modifierGuid("1005209701203447809")
-                        .modifierName("中化建国际招标有限责任公司")
-                        .modifyTime(1698737084120L)
-                        .qiYongstatus(1)
-                        .weiguiChuliReason("违反评标工作纪律或存在其他违反执业规范或者职业道德行为，情节较轻")
-                        .weiguiChuliShichangs("12,24,36")
-                        .weiguiShixiangGuid("5419e886-a624-41f3-acb1-87cd334b3e25")
-                        .build(),
+    private static final List<String> EXCLUDE_COURSE_TYPE_LIST = Lists.newArrayList("续期培训", "续期考试");
 
-                // 第5条数据
-                WeiGuiPageResp.WeiGuiShiXiang.builder()
-                        .createTime(1698736902543L)
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .isDeleted(false)
-                        .modifierGuid("1005209701203447809")
-                        .modifierName("中化建国际招标有限责任公司")
-                        .modifyTime(1715860276633L)
-                        .qiYongstatus(1)
-                        .weiguiChuliReason("违反评标工作纪律或存在其他违反执业规范或者职业道德行为，未造成实质性影响")
-                        .weiguiChuliShichangs("3,6,12,0")
-                        .weiguiShixiangGuid("5f789f05-67a1-4d45-8e58-2a7dbd656f40")
-                        .build(),
+    // 培训课程分页
+    public BasePageResp<TrainCoursePageApiResp> pageTrainCourse(TrainCoursePageReq req) {
+        TrainCoursePageApiReq apiReq = TrainCoursePageApiReq.builder()
+                .page(req.getPageNo())
+                .rows(req.getPageNo())
+                .userGuid(req.getZhuanJiaGuid())
+                .progressStatus(0)
+                .excludeCourseTypeList(EXCLUDE_COURSE_TYPE_LIST)
+                .build();
+        ApiBaseResult<ApiBasePageResp<TrainCoursePageApiResp>> apiResp = expertServiceClient.pageTrainCourse(apiReq);
 
-                // 第6条数据
-                WeiGuiPageResp.WeiGuiShiXiang.builder()
-                        .createTime(1698736949297L)
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .isDeleted(false)
-                        .modifierGuid("1005209701203447809")
-                        .modifierName("中化建国际招标有限责任公司")
-                        .modifyTime(1698737089858L)
-                        .qiYongstatus(1)
-                        .weiguiChuliReason("暗示或者诱导投标人对投标文件作出澄清、说明或者接受投标人主动提出的澄清、说明，影响评标公正性")
-                        .weiguiChuliShichangs("12,24,36")
-                        .weiguiShixiangGuid("6386e0f8-6995-41d7-8247-ef3a427830c5")
-                        .build()
-        );
-        return list;
+        ApiBasePageResp<TrainCoursePageApiResp> pageResp = apiResp.getData();
+
+        return BasePageResp.<TrainCoursePageApiResp>builder()
+                .current(pageResp.getCurrent())
+                .pages(pageResp.getPages())
+                .total(pageResp.getTotal())
+                .data(pageResp.getData())
+                .build();
     }
 
-    public WeiGuiGetResp getWeiGui(WeiGuiGetReq req) {
-        return WeiGuiGetResp.builder()
-                .applyBusinessId("1240990734186446848")
-                .applyshenheStatus(50)
-                .businessId("1241043784526479360")
-                .chouquRenwuGuid("07072824-728b-417c-add9-17f94f746e10")
-                .chuliEndTime(1723910399999L)
-                .chuliStartTime(1715929495719L)
-                .createTime(1715916848348L)
-                .creatorGuid("1171528704599830529")
-                .creatorName("物装中心十四")
-                .fujianGuid("")
-                .modifierGuid("1171528704599830529")
-                .modifierName("物装中心十四")
-                .modifyTime(1715929400639L)
-                .shenheRen("中化建国际招标有限责任公司")
-                .shenheStatus(50)
-                .shenheTime(1715929495790L)
-                .submitTime(1715929400628L)
-                .submiter("物装中心十四")
-                .submiterGuid("1171528704599830529")
-                .submiterPersonId("1171739935665954817")
-                .tijiaorenEmail("")
-                .tijiaorenPhone("18912344321")
-                .weiguiChuliShichang(3)
-                .weiguiReason("4c1102e5-bf31-491d-8879-1ea335f5e40f")
-                .weiguiReasonName("")
-                .weiguiXiangxiMiaoshu("12333")
-                .zhuanJiaAdAccount("")
-                .zhuanJiaCode("")
-                .zhuanJiaZhuangTai(null)
-                .zhuanjiaGuid("8ffb7651-1416-4f74-a590-1f0cf860463b")
-                .zhuanjiaName("")
-                .zhuanjiaWeiguiGuid("316cf113-2233-4118-9bd6-713e75b81363")
+    // 培训课程详情
+    public TrainCourseGetApiResp getTrainCourse(TrainCourseGetInfoReq req) {
+        TrainCourseGetApiReq apiReq = TrainCourseGetApiReq.builder()
+                .courseGuid(req.getCourseGuid())
                 .build();
+        ApiBaseResult<TrainCourseGetApiResp> apiResp = expertServiceClient.getTrainCourse(apiReq);
+
+        return apiResp.getData();
     }
 
-    public Object weiGuiChuLiYuanYin() {
-        ArrayList<WeiGuiPageResp.WeiGuiChuLiYuanYin> weiGuiChuLiYuanYins = Lists.newArrayList(
-                WeiGuiPageResp.WeiGuiChuLiYuanYin.builder()
-                        .createTime(1698737076518L)  // 时间戳加L标识long类型
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .isDeleted(false)
-                        .modifierGuid("1005209701203447809")
-                        .modifierName("中化建国际招标有限责任公司")
-                        .modifyTime(1698737079691L)
-                        .qiYongstatus(1)
-                        .weiguiChuliReason("严重违反评标工作纪律、执业规范或者职业道德")
-                        .weiguiChuliShichangs("-1,3")  // 保留原字符串格式
-                        .weiguiShixiangGuid("4c1102e5-bf31-491d-8879-1ea335f5e40f")
-                        .build()
-        );
-        return weiGuiChuLiYuanYins;
+    // 培训课程课节分页
+    public BasePageResp<TrainCourseLessonPageApiResp> pageTrainCourseLesson(TrainCourseLessonPageReq req) {
+        TrainCourseLessonPageApiReq apiReq = TrainCourseLessonPageApiReq.builder()
+                .page(req.getPageNo())
+                .rows(req.getPageSize())
+                .courseGuid(req.getCourseGuid())
+                .userGuid(req.getZhuanJiaGuid())
+                .build();
+        ApiBaseResult<ApiBasePageResp<TrainCourseLessonPageApiResp>> apiResp = expertServiceClient.pageTrainCourseLesson(apiReq);
+
+        ApiBasePageResp<TrainCourseLessonPageApiResp> pageResp = apiResp.getData();
+
+        return BasePageResp.<TrainCourseLessonPageApiResp>builder()
+                .current(pageResp.getCurrent())
+                .pages(pageResp.getPages())
+                .total(pageResp.getTotal())
+                .data(pageResp.getData())
+                .build();
     }
 
-    public Object listWeiGuiChuLiJiLu() {
-        return Lists.newArrayList(
-                WeiGuiPageResp.WeiGuiShenHeChuliJiLu.builder()
-                        .bianGengXuHao(null)
-                        .buTongGuoEndSequence("")
-                        .buTongGuoStartSequence(null)
-                        .createTime(1715929495805L)
-                        .createTimeText("2024-05-17 15:04:55")
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .daiShenRenGuids("")
-                        .daiShenRenNames("")
-                        .fujianGuid("")
-                        .isCurrent(false)
-                        .isDeleted(false)
-                        .isFinish(true)
-                        .modifierGuid("")
-                        .modifierName("")
-                        .modifyTime(null)
-                        .modifyTimeText("")
-                        .remark("")
-                        .sequence(null)
-                        .shenHeBuMenGuid("")
-                        .shenHeBuMenName("")
-                        .shenHeFuJianGuid("")
-                        .shenHeGuid("789bba36-62a8-4dba-aa10-be7b5b6fb662")
-                        .shenHeRenGuid("")
-                        .shenHeRenName("中化建国际招标有限责任公司")
-                        .shenHeStatus(50)
-                        .shenHeTime(1715929495805L)
-                        .shenHeTimeText("2024-05-17 15:04:55")
-                        .shenHeYiJian("")
-                        .shenPiJieGuoGuid("3c935668-2087-416e-af58-24a43da2e4f7")
-                        .shenQingLeiXing(null)
-                        .shiFouYiFaZhuanJia(false)
-                        .shiFouZhuanJiao(false)
-                        .shiXiangGuid("316cf113-2233-4118-9bd6-713e75b81363")
-                        .shiXiangName("")
-                        .shiXiangType(null)
-                        .shouLiTime(null)
-                        .shouLiTimeText("")
-                        .tiJiaoRenGuid("")
-                        .tiJiaoRenName("中化建国际招标有限责任公司")
-                        .tiJiaoTime(1715929495805L)
-                        .tiJiaoTimeText("2024-05-17 15:04:55")
-                        .xiaJiShenHeRenGuid("")
-                        .xiaJiShenHeRenName("")
-                        .xiangMuGuid("")
-                        .zhiJieHuiFu(false)
-                        .build(),
-                // 第2条记录
-                WeiGuiPageResp.WeiGuiShenHeChuliJiLu.builder()
-                        .bianGengXuHao(null)
-                        .buTongGuoEndSequence("")
-                        .buTongGuoStartSequence(null)
-                        .createTime(1715929481048L)
-                        .createTimeText("2024-05-17 15:04:41")
-                        .creatorGuid("1171528704599830529")
-                        .creatorName("物装中心十四")
-                        .daiShenRenGuids("")
-                        .daiShenRenNames("")
-                        .fujianGuid("")
-                        .isCurrent(false)
-                        .isDeleted(false)
-                        .isFinish(true)
-                        .modifierGuid("")
-                        .modifierName("")
-                        .modifyTime(null)
-                        .modifyTimeText("")
-                        .remark("")
-                        .sequence(null)
-                        .shenHeBuMenGuid("")
-                        .shenHeBuMenName("")
-                        .shenHeFuJianGuid("")
-                        .shenHeGuid("8361f885-2a4b-4870-9d6a-ebee5171448b")
-                        .shenHeRenGuid("1171739935665954817")
-                        .shenHeRenName("物装中心十四")
-                        .shenHeStatus(30)
-                        .shenHeTime(1715929481048L)
-                        .shenHeTimeText("2024-05-17 15:04:41")
-                        .shenHeYiJian("")
-                        .shenPiJieGuoGuid("d0a846ac-2a72-4603-86a4-fa22af893841")
-                        .shenQingLeiXing(null)
-                        .shiFouYiFaZhuanJia(false)
-                        .shiFouZhuanJiao(false)
-                        .shiXiangGuid("316cf113-2233-4118-9bd6-713e75b81363")
-                        .shiXiangName("")
-                        .shiXiangType(null)
-                        .shouLiTime(null)
-                        .shouLiTimeText("")
-                        .tiJiaoRenGuid("1171739935665954817")
-                        .tiJiaoRenName("物装中心十四")
-                        .tiJiaoTime(1715929481048L)
-                        .tiJiaoTimeText("2024-05-17 15:04:41")
-                        .xiaJiShenHeRenGuid("")
-                        .xiaJiShenHeRenName("")
-                        .xiangMuGuid("")
-                        .zhiJieHuiFu(false)
-                        .build(),
-                // 第3条记录
-                WeiGuiPageResp.WeiGuiShenHeChuliJiLu.builder()
-                        .bianGengXuHao(null)
-                        .buTongGuoEndSequence("")
-                        .buTongGuoStartSequence(null)
-                        .createTime(1715929259722L)
-                        .createTimeText("2024-05-17 15:00:59")
-                        .creatorGuid("1005209701203447809")
-                        .creatorName("中化建国际招标有限责任公司")
-                        .daiShenRenGuids("")
-                        .daiShenRenNames("")
-                        .fujianGuid("")
-                        .isCurrent(false)
-                        .isDeleted(false)
-                        .isFinish(true)
-                        .modifierGuid("")
-                        .modifierName("")
-                        .modifyTime(null)
-                        .modifyTimeText("")
-                        .remark("vs")
-                        .sequence(null)
-                        .shenHeBuMenGuid("")
-                        .shenHeBuMenName("")
-                        .shenHeFuJianGuid("")
-                        .shenHeGuid("8e27c179-c64f-4e16-81aa-1050a41394f7")
-                        .shenHeRenGuid("")
-                        .shenHeRenName("中化建国际招标有限责任公司")
-                        .shenHeStatus(40)
-                        .shenHeTime(1715929259722L)
-                        .shenHeTimeText("2024-05-17 15:00:59")
-                        .shenHeYiJian("")
-                        .shenPiJieGuoGuid("dbc40cdb-8db5-42b0-884f-bf4d3eb2823d")
-                        .shenQingLeiXing(null)
-                        .shiFouYiFaZhuanJia(false)
-                        .shiFouZhuanJiao(false)
-                        .shiXiangGuid("316cf113-2233-4118-9bd6-713e75b81363")
-                        .shiXiangName("")
-                        .shiXiangType(null)
-                        .shouLiTime(null)
-                        .shouLiTimeText("")
-                        .tiJiaoRenGuid("")
-                        .tiJiaoRenName("中化建国际招标有限责任公司")
-                        .tiJiaoTime(1715929259722L)
-                        .tiJiaoTimeText("2024-05-17 15:00:59")
-                        .xiaJiShenHeRenGuid("")
-                        .xiaJiShenHeRenName("")
-                        .xiangMuGuid("")
-                        .zhiJieHuiFu(false)
-                        .build(),
-                // 第4条记录
-                WeiGuiPageResp.WeiGuiShenHeChuliJiLu.builder()
-                        .bianGengXuHao(null)
-                        .buTongGuoEndSequence("")
-                        .buTongGuoStartSequence(null)
-                        .createTime(1715929171875L)
-                        .createTimeText("2024-05-17 14:59:31")
-                        .creatorGuid("1171528704599830529")
-                        .creatorName("物装中心十四")
-                        .daiShenRenGuids("")
-                        .daiShenRenNames("")
-                        .fujianGuid("")
-                        .isCurrent(false)
-                        .isDeleted(false)
-                        .isFinish(true)
-                        .modifierGuid("")
-                        .modifierName("")
-                        .modifyTime(null)
-                        .modifyTimeText("")
-                        .remark("")
-                        .sequence(null)
-                        .shenHeBuMenGuid("")
-                        .shenHeBuMenName("")
-                        .shenHeFuJianGuid("")
-                        .shenHeGuid("b1712b8b-5d4d-4a24-af83-9e5f6d1bd013")
-                        .shenHeRenGuid("1171739935665954817")
-                        .shenHeRenName("物装中心十四")
-                        .shenHeStatus(30)
-                        .shenHeTime(1715929171875L)
-                        .shenHeTimeText("2024-05-17 14:59:31")
-                        .shenHeYiJian("")
-                        .shenPiJieGuoGuid("d0a846ac-2a72-4603-86a4-fa22af893841")
-                        .shenQingLeiXing(null)
-                        .shiFouYiFaZhuanJia(false)
-                        .shiFouZhuanJiao(false)
-                        .shiXiangGuid("316cf113-2233-4118-9bd6-713e75b81363")
-                        .shiXiangName("")
-                        .shiXiangType(null)
-                        .shouLiTime(null)
-                        .shouLiTimeText("")
-                        .tiJiaoRenGuid("1171739935665954817")
-                        .tiJiaoRenName("物装中心十四")
-                        .tiJiaoTime(1715929171875L)
-                        .tiJiaoTimeText("2024-05-17 14:59:31")
-                        .xiaJiShenHeRenGuid("")
-                        .xiaJiShenHeRenName("")
-                        .xiangMuGuid("")
-                        .zhiJieHuiFu(false)
+    // 培训课程课节详情
+    public TrainCourseLessonGetApiResp getTrainCourseLesson(TrainCourseLessonGetReq req) {
+        TrainCourseLessonGetApiReq apiReq = TrainCourseLessonGetApiReq.builder()
+                .lessonGuid(req.getLessonGuid())
+                .build();
+        ApiBaseResult<TrainCourseLessonGetApiResp> apiResp = expertServiceClient.getTrainCourseLesson(apiReq);
+
+        return apiResp.getData();
+    }
+
+    // 附件列表
+    public List<CommonFuJianListApiResp> listCommonFuJian(CommonFuJianListReq req) {
+        CommonFuJianListApiReq apiReq = CommonFuJianListApiReq.builder()
+                .groupGuid(req.getGroupGuid())
+                .build();
+        ApiBaseResult<List<CommonFuJianListApiResp>> apiResp = expertServiceClient.listCommonFuJian(apiReq);
+        return apiResp.getData();
+    }
+
+    // 更新培训课节学习进度
+    public TainLessonProgressUpdateApiResp updateTainLessonProgress(TainLessonProgressUpdateApiReq req) {
+        ApiBaseResult<TainLessonProgressUpdateApiResp> apiResp = expertServiceClient.updateTainLessonProgress(req);
+        return apiResp.getData();
+    }
+
+    // 考试分页
+    public BasePageResp<TrainExamPageApiResp> pageTrainExam(TrainExamPageReq req) {
+        TrainExamPageApiReq apiReq = TrainExamPageApiReq.builder()
+                .page(req.getPageNo())
+                .rows(req.getPageSize())
+                .expertGuid(req.getZhuanJiaGuid())
+                .excludeCourseTypeList(EXCLUDE_COURSE_TYPE_LIST)
+                .build();
+        ApiBaseResult<ApiBasePageResp<TrainExamPageApiResp>> apiResp = expertServiceClient.pageTrainExam(apiReq);
+
+        ApiBasePageResp<TrainExamPageApiResp> pageResp = apiResp.getData();
+
+        return BasePageResp.<TrainExamPageApiResp>builder()
+                .current(pageResp.getCurrent())
+                .pages(pageResp.getPages())
+                .total(pageResp.getTotal())
+                .data(pageResp.getData())
+                .build();
+    }
+
+
+    public List<PeiXunKeChengKeJieFuJianListResp> listPeiXunKeChengKeJieFuJian(PeiXunKeChengKeJieFuJianListReq req) {
+        ArrayList<PeiXunKeChengKeJieFuJianListResp> result = Lists.newArrayList(
+                PeiXunKeChengKeJieFuJianListResp.builder()
+                        .createTime(1758532252845L)
+                        .creatorGuid("其他用户")
+                        .creatorName("其他用户")
+                        .fileGroupGuid("97f9d7ce-11dd-4fab-bf97-dee5360d8ffb")
+                        .fileGuid("1419732467212898305")
+                        .fileMD5("")
+                        .fileName("新建 PPT 演示文稿.pdf")
+                        .fileType(null)
+                        .groupGuid("41e2cb9c-5370-4c47-b448-b7b845932a9b")
+                        .otherInfo("")
+                        .sysFile(null)
+                        .uploadTime(null)
+                        .uploadTimeText("")
                         .build()
         );
+
+        return result;
     }
 
+
     public BasePageResp<KaoShiPageResp> pageKaoShi(KaoShiPageReq req) {
         List<KaoShiPageResp> list = Arrays.asList(
                 KaoShiPageResp.builder()
@@ -1209,119 +599,6 @@ public class ExpertService {
                 .build();
     }
 
-    public BasePageResp<PeiXunPageResp> pagePeiXunKeCheng(PeiXunPageReq req) {
-        ArrayList<PeiXunPageResp> list = Lists.newArrayList(
-                // 第1条：日常培训（含3课时，2025年最新发布）
-                PeiXunPageResp.builder()
-                        .courseGuid("1a2b3c4d-5e6f-4789-8765-4321fedcba01")
-                        .courseName("2025评标规范日常培训（基础版）")
-                        .courseReleaseTimestamp(1758902400000L)  // 2025-10-27 00:00:00
-                        .courseTypeName("日常培训")
-                        .lessonCount(3)
-                        .progressStatus((short) 0)
-                        .studyProgress(BigDecimal.valueOf(0.00))
-                        .build(),
-                // 第2条：定期培训（含6课时，季度更新）
-                PeiXunPageResp.builder()
-                        .courseGuid("2b3c4d5e-6f7a-4890-9876-54321fedcba2")
-                        .courseName("2025Q4评标专家定期考核培训")
-                        .courseReleaseTimestamp(1749667200000L)  // 2025-07-12 00:00:00
-                        .courseTypeName("定期培训")
-                        .lessonCount(6)
-                        .progressStatus((short) 0)
-                        .studyProgress(BigDecimal.valueOf(0.00))
-                        .build(),
-                // 第3条：入库培训（含8课时，新专家必备）
-                PeiXunPageResp.builder()
-                        .courseGuid("3c4d5e6f-7a8b-4901-0987-654321fedcba3")
-                        .courseName("2025新评标专家入库必修培训")
-                        .courseReleaseTimestamp(1735689600000L)  // 2025-01-01 00:00:00
-                        .courseTypeName("入库培训")
-                        .lessonCount(8)
-                        .progressStatus((short) 0)
-                        .studyProgress(BigDecimal.valueOf(0.00))
-                        .build(),
-                // 第4条：专项培训（含4课时，系统操作类）
-                PeiXunPageResp.builder()
-                        .courseGuid("4d5e6f7a-8b9c-4012-1987-7654321fedcba4")
-                        .courseName("电子评标系统操作专项培训（2025升级）")
-                        .courseReleaseTimestamp(1755225600000L)  // 2025-08-14 00:00:00
-                        .courseTypeName("专项培训")
-                        .lessonCount(4)
-                        .progressStatus((short) 0)
-                        .studyProgress(BigDecimal.valueOf(0.00))
-                        .build()
-        );
-        return BasePageResp.<PeiXunPageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(4)
-                .data(list)
-                .build();
-    }
-
-    public Object getPeiXunInfo(PeiXunKeChengReq req) {
-        return PeiXunPageResp.PeiXunKeChengInfo.builder()
-                .courseGuid("0966b932-cf4f-45bc-bdbf-03ccc4a7e92a")
-                .courseIntroduction("日常培训test")
-                .courseName("日常培训test")
-                .courseReleaseStatus((short) 1)
-                .courseReleaseTimestamp(1758902400000L)
-                .courseTypeGuid("7e68a592-91b1-4ce9-b946-59af183ef5ab")
-                .courseTypeName("日常培训")
-                .isTestAfterLearn(true)
-                .lessonCount(2)
-                .testPaperGuid("0d747edf-eb8b-4a06-8f91-3970adb54eed")
-                .build();
-    }
-
-    public Object getPeiXunKeChengKeJieList(PeiXunKeChengReq req) {
-        return null;
-    }
-
-    public DongJieGetResp getDongJie(DongJieGetReq req) {
-        DongJieGetResp result = DongJieGetResp.builder()
-                .changeRecordGuid("f47ac10b-58cc-4372-a567-0e02b2c3d479")
-                .shiXiangGuid("a1b2c3d4-e5f6-4a5b-9c8d-7e6f5a4b3c2d")
-                .shiXiangType(1)
-                .oldValue("评标专业状态：正常（可参与评标）")
-                .newValue("评标专业状态：已冻结（暂停参与评标）")
-                .createTime(1762857600000L)
-                .creatorGuid("c1d2e3f4-a5b6-4c5d-6e7f-8a9b0c1d2e3f")
-                .creatorName("张三")
-                .modifyTime(1762857600000L)
-                .modifierGuid(null)
-                .modifierName(null)
-                .jieDongReason(null)
-                .jieDongFuJianGuid(null)
-                .dongJieReason("因系统数据校验发现该评标专业存在信息异常，需临时冻结核查")
-                .dongJieFuJianGuid("fj-98765432-1a2b-3c4d-5e6f-7g8h9i0j1k2l")
-                .dongJieSatrtTime(1762857600000L)
-                .dongJieEndTime(1762944000000L)
-                .build();
-
-        return result;
-    }
-
-    public BasePageResp<PeiXunKeChengKeJiePageResp> pagePeiXunKeChengKeJie(PeiXunKeChengKeJiePageReq req) {
-
-        ArrayList<PeiXunKeChengKeJiePageResp> list = Lists.newArrayList(
-                PeiXunKeChengKeJiePageResp.builder()
-                        .finishTimestamp(null)
-                        .learnFileGroupGuid("41e2cb9c-5370-4c47-b448-b7b845932a9b")
-                        .lessonGuid("6a9eea61-09ed-427d-ab22-281d9cbb7106")
-                        .lessonName("test1")
-                        .studyContent("新建 PPT 演示文稿.pdf")
-                        .studyProgress(null)
-                        .build()
-        );
-        return BasePageResp.<PeiXunKeChengKeJiePageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(1)
-                .data(list)
-                .build();
-    }
 
     public PeiXunKeChengKeJieGetResp getPeiXunKeChengKeJie(PeiXunKeChengKeJieGetReq req) {
 
@@ -1341,27 +618,6 @@ public class ExpertService {
                 .build();
     }
 
-    public List<PeiXunKeChengKeJieFuJianListResp> listPeiXunKeChengKeJieFuJian(PeiXunKeChengKeJieFuJianListReq req) {
-        ArrayList<PeiXunKeChengKeJieFuJianListResp> result = Lists.newArrayList(
-                PeiXunKeChengKeJieFuJianListResp.builder()
-                        .createTime(1758532252845L)
-                        .creatorGuid("其他用户")
-                        .creatorName("其他用户")
-                        .fileGroupGuid("97f9d7ce-11dd-4fab-bf97-dee5360d8ffb")
-                        .fileGuid("1419732467212898305")
-                        .fileMD5("")
-                        .fileName("新建 PPT 演示文稿.pdf")
-                        .fileType(null)
-                        .groupGuid("41e2cb9c-5370-4c47-b448-b7b845932a9b")
-                        .otherInfo("")
-                        .sysFile(null)
-                        .uploadTime(null)
-                        .uploadTimeText("")
-                        .build()
-        );
-
-        return result;
-    }
 
     public PeiXunKeChengKeJieFuJianGetResp getPeiXunKeChengKeJieFuJian(PeiXunKeChengKeJieFuJianGetReq req) {
         return PeiXunKeChengKeJieFuJianGetResp.builder()
@@ -1435,4 +691,5 @@ public class ExpertService {
                 .build();
     }
 
+
 }

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

+package com.cnooc.expert.service;
+
+import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
+import com.google.common.collect.Lists;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class FileMockService {
+
+    public List<DownLoadInfoDTO> downloadInfo(String pathId) {
+        List<DownLoadInfoDTO> result = Lists.newArrayList(
+                DownLoadInfoDTO.builder()
+                        .fileName("新建 PPT 演示文稿.pdf")
+                        .downLoadUrl("https://purb.m-bid.cnooc.com.cn/bid-mimic-cggl/892422091105296385/2/2025/9/22/1419732467212898305/%E6%96%B0%E5%BB%BA%20PPT%20%E6%BC%94%E7%A4%BA%E6%96%87%E7%A8%BF.pdf?response-content-disposition=attachment%3Bfilename%3D%25E6%2596%25B0%25E5%25BB%25BA%2BPPT%2B%25E6%25BC%2594%25E7%25A4%25BA%25E6%2596%2587%25E7%25A8%25BF.pdf&AWSAccessKeyId=5T0WWU7JAUDUXJ2EG1FB&Expires=1763091567&Signature=JAo0KSspEbWreyxgc306%2FjmcI8E%3D")
+                        .directDownLoadUrl("https://purb.m-bid.cnooc.com.cn/bid-mimic-cggl/892422091105296385/2/2025/9/22/1419732467212898305/%E6%96%B0%E5%BB%BA%20PPT%20%E6%BC%94%E7%A4%BA%E6%96%87%E7%A8%BF.pdf?response-content-disposition=attachment%3Bfilename%3D%25E6%2596%25B0%25E5%25BB%25BA%2BPPT%2B%25E6%25BC%2594%25E7%25A4%25BA%25E6%2596%2587%25E7%25A8%25BF.pdf&AWSAccessKeyId=5T0WWU7JAUDUXJ2EG1FB&Expires=1763091567&Signature=JAo0KSspEbWreyxgc306%2FjmcI8E%3D")
+                        .createTime(1758532197592L)
+                        .fileSize(1128L)
+                        .build()
+        );
+
+        return result;
+    }
+
+}

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

+package com.cnooc.expert.service;
+
+import com.cnooc.expert.external.common.model.response.ApiBaseResult;
+import com.cnooc.expert.external.file.model.response.DownLoadInfoDTO;
+import com.cnooc.expert.external.file.sevice.FileServiceClient;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@AllArgsConstructor
+@Service
+public class FileService {
+
+    private final FileServiceClient FileServiceClient;
+
+
+    public List<DownLoadInfoDTO> downloadInfo(String pathId) {
+        ApiBaseResult<List<DownLoadInfoDTO>> apiResp = FileServiceClient.generatorDownloadInfo(pathId);
+
+        return apiResp.getData();
+    }
+
+}

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

 package com.cnooc.expert.service;
 
-import com.cnooc.expert.common.response.BasePageResp;
 import com.cnooc.expert.controller.subject.model.request.CompanyPageReq;
-import com.cnooc.expert.controller.subject.model.response.CompanyPageResp;
+import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
+import com.cnooc.expert.external.common.model.response.ApiBaseResult;
+import com.cnooc.expert.external.subject.model.request.PlatformCompanyPageApiReq;
+import com.cnooc.expert.external.subject.model.response.PlatformCompanyPageApiResp;
 import com.cnooc.expert.external.subject.service.SubjectServiceClient;
-import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 @AllArgsConstructor
 public class SubjectService {
 
     private SubjectServiceClient subjectServiceClient;
 
-    public BasePageResp<CompanyPageResp> pageCompany(CompanyPageReq req) {
-        List<CompanyPageResp> data = Lists.newArrayList(
-                CompanyPageResp.builder()
-                        .id("1420053958893662209")
-                        .subjectId("1420053958767833088")
-                        .subjectName("江苏瑞尔姆电器安安有限公司")
-                        .businessType(5)
-                        .creditCode("91320577MA4Y6K7H0F")
-                        .contactPerson("张三")
-                        .contactPhone("13800138000")
-                        .contactEmail("zhangsan@cnooc.com.cn")
-                        .build(),
-                CompanyPageResp.builder()
-                        .id("1420051042464067584")
-                        .subjectId("1420051042065608705")
-                        .subjectName("中海科技很大的公司")
-                        .businessType(5)
-                        .creditCode("91320507MA4Y6K7H0F")
-                        .contactPerson("里斯")
-                        .contactPhone("13333333333")
-                        .contactEmail("lisi@cnooc.com.cn")
-                        .build()
-        );
-
-        return BasePageResp.<CompanyPageResp>builder()
-                .current(1)
-                .pages(1)
-                .total(2)
-                .data(data)
+    public ApiBasePageResp<PlatformCompanyPageApiResp> pageCompany(CompanyPageReq req) {
+        PlatformCompanyPageApiReq apiReq = PlatformCompanyPageApiReq.builder()
+                .pageNum(req.getPageNo())
+                .pageSize(req.getPageSize())
+                .businessType(req.getBusinessType())
+                .tenantId(UserInfoUtils.TENANT_ID)
+                .subjectName(req.getSubjectName())
+                .creditCode(req.getCreditCode())
                 .build();
+        ApiBaseResult<ApiBasePageResp<PlatformCompanyPageApiResp>> apiResp = subjectServiceClient.pagePlatformCompanyApi(apiReq);
+
+
+        return apiResp.getData();
     }
 }

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

@@ -42,6 +42,7 @@ public class WorkflowMockService {
                 ApprovePathSettingPageResp.builder()
                         .defId("e2dbccf455ec448b8a8284dc2c6c3b04")
                         .defName("中移深化-专家审批")
+                        .defPath("1")
                         .opinion(null)
                         .pathId(null)
                         .useIfream(true)

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

@@ -42,6 +42,7 @@ public class WorkflowService {
                 ApprovePathSettingPageResp.builder()
                         .defId("e2dbccf455ec448b8a8284dc2c6c3b04")
                         .defName("中移深化-专家审批")
+                        .defPath("1")
                         .opinion(null)
                         .pathId(null)
                         .useIfream(true)