add expert workflow

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

@@ -13,6 +13,7 @@ import com.cnooc.expert.controller.expert.model.request.ExamQuestionXiaoTiListRe
 import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoGetByBusinessIdReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
+import com.cnooc.expert.controller.expert.model.request.FirstCategoryExpertApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
@@ -24,14 +25,16 @@ 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.ViolationGetReq;
+import com.cnooc.expert.controller.expert.model.request.ViolationPageReq;
 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.PingBiaoZhuanYeTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.external.expert.model.request.ApproveNodeGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
+import com.cnooc.expert.external.expert.model.response.ApproveNodeGetApiResp;
 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;
@@ -44,6 +47,7 @@ import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
+import com.cnooc.expert.external.expert.model.response.FirstCategoryExpertApplyApiResp;
 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;
@@ -89,6 +93,13 @@ public class ExpertController extends AbstractBaseController {
         );
     }
 
+    // 获取审批节点
+    @PostMapping("/approve/node/list")
+    public ApiResult<List<ApproveNodeGetApiResp>> getApproveNodeList(@RequestBody @Validated ApproveNodeGetApiReq req) {
+        List<ApproveNodeGetApiResp> apiResp = expertService.getApproveNodeList(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
     // *** 个人信息 ***
 
     // 民族列表
@@ -171,7 +182,14 @@ public class ExpertController extends AbstractBaseController {
     // 专家个人信息修改
     @PostMapping("/updateAllInfo")
     public ApiResult<ExpertInfoGetApiResp> expertInfoUpdate(@RequestBody @Validated ExpertInfoUpdateApiReq req) {
-        ExpertInfoGetApiResp apiResp = expertService.updateExpetInfo(req);
+        ExpertInfoGetApiResp apiResp = expertService.updateExpertInfo(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
+    // 申请成为一级专家
+    @PostMapping("/first-category-expert/apply")
+    public ApiResult<FirstCategoryExpertApplyApiResp> applyFirstCategoryExpert(@RequestBody @Validated FirstCategoryExpertApplyReq req) {
+        FirstCategoryExpertApplyApiResp apiResp = expertService.applyFirstCategoryExpert(req);
         return ApiResult.successWithResult(apiResp);
     }
 
@@ -260,15 +278,15 @@ public class ExpertController extends AbstractBaseController {
 
     // 专家违规分页列表
     @PostMapping("/wei-gui/page")
-    public ApiResult<BasePageResp<ViolationExpertPageApiResp>> weiGuiJiLuPage(@RequestBody @Validated WeiGuiJiLuPageReq req) {
+    public ApiResult<BasePageResp<ViolationExpertPageApiResp>> violationPage(@RequestBody @Validated ViolationPageReq req) {
         BasePageResp<ViolationExpertPageApiResp> apiResp = expertService.pageWeiGuiList(req);
         return ApiResult.successWithResult(apiResp);
     }
 
     // 专家违规详情
     @PostMapping("/wei-gui/get")
-    public ApiResult<ViolationExpertGetApiResp> weiGuiGet(@RequestBody @Validated WeiGuiGetReq req) {
-        ViolationExpertGetApiResp apiResp = expertService.getWeiGui(req);
+    public ApiResult<ViolationExpertGetApiResp> violationGet(@RequestBody @Validated ViolationGetReq req) {
+        ViolationExpertGetApiResp apiResp = expertService.getViolation(req);
         return ApiResult.successWithResult(apiResp);
     }
 

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

@@ -13,6 +13,7 @@ import com.cnooc.expert.controller.expert.model.request.ExamQuestionXiaoTiListRe
 import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoGetByBusinessIdReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
+import com.cnooc.expert.controller.expert.model.request.FirstCategoryExpertApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
 import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq;
@@ -28,10 +29,11 @@ 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.ViolationGetReq;
+import com.cnooc.expert.controller.expert.model.request.ViolationPageReq;
 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.ApproveNodeGetResp;
 import com.cnooc.expert.controller.expert.model.response.CityTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
 import com.cnooc.expert.controller.expert.model.response.DongJieGetResp;
@@ -41,6 +43,7 @@ import com.cnooc.expert.controller.expert.model.response.ExamQuestionListResp;
 import com.cnooc.expert.controller.expert.model.response.ExamQuestionXiaoTiListResp;
 import com.cnooc.expert.controller.expert.model.response.ExamRecordSaveResp;
 import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
+import com.cnooc.expert.controller.expert.model.response.FirstCategoryExpertApplyResp;
 import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
 import com.cnooc.expert.controller.expert.model.response.KaoShiPageResp;
 import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
@@ -54,21 +57,19 @@ import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNode
 import com.cnooc.expert.controller.expert.model.response.QingJiaJinJiApplyResp;
 import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp;
 import com.cnooc.expert.controller.expert.model.response.TempExamPaperGetResp;
-import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp;
+import com.cnooc.expert.controller.expert.model.response.ViolationGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiPageResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaInfoGetByBusinessIdResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.external.expert.model.request.ApproveNodeGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
+import com.cnooc.expert.external.expert.model.response.ApproveNodeGetApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonFuJianListApiResp;
-import com.cnooc.expert.external.expert.model.response.ExamPaperSubmitApiResp;
-import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
-import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
-import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
+import com.cnooc.expert.external.expert.model.response.FirstCategoryExpertApplyApiResp;
 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.model.response.ZhuanJiaInfoGetByBusinessIdApiResp;
 import com.cnooc.expert.service.ExpertMockService;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -91,6 +92,13 @@ public class ExpertMockController extends AbstractBaseController {
         return ApiResult.successWithResult(expertMockService.getApproveBusinessId());
     }
 
+    // 获取审批节点
+    @PostMapping("/approve/node/list")
+    public ApiResult<List<ApproveNodeGetResp>> getApproveNodeList(@RequestBody @Validated ApproveNodeGetApiReq req) {
+        List<ApproveNodeGetResp> apiResp = expertMockService.getApproveNodeList(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
     // *** 数据字典 ***
 
     /**
@@ -209,6 +217,13 @@ public class ExpertMockController extends AbstractBaseController {
         return ApiResult.successWithResult(expertMockService.updateExpetInfo(req));
     }
 
+    // 专家个人信息修改
+    @PostMapping("/first-category-expert/apply")
+    public ApiResult<FirstCategoryExpertApplyResp> applyFirstCategoryExpert(@RequestBody @Validated FirstCategoryExpertApplyReq req) {
+        FirstCategoryExpertApplyResp apiResp = expertMockService.applyFirstCategoryExpert(req);
+        return ApiResult.successWithResult(apiResp);
+    }
+
     // 根据BusinessId获取专家信息
     @PostMapping("/info-by-businessId")
     public ApiResult<ZhuanJiaInfoGetByBusinessIdResp> expertInfoByBusinessId(@RequestBody @Validated ExpertInfoGetByBusinessIdReq req) {
@@ -295,8 +310,8 @@ public class ExpertMockController extends AbstractBaseController {
 
     // 专家违规分页列表
     @PostMapping("/wei-gui/page")
-    public ApiResult<BasePageResp<WeiGuiPageResp>> weiGuiJiLuPage(@RequestBody @Validated WeiGuiJiLuPageReq req) {
-        return ApiResult.successWithResult(expertMockService.pageWeiGuiList(req));
+    public ApiResult<BasePageResp<WeiGuiPageResp>> violationPage(@RequestBody @Validated ViolationPageReq req) {
+        return ApiResult.successWithResult(expertMockService.pageViolation(req));
     }
 
     /**
@@ -306,8 +321,8 @@ public class ExpertMockController extends AbstractBaseController {
      * @return
      */
     @PostMapping("/wei-gui/get")
-    public ApiResult<WeiGuiGetResp> weiGuiGet(@RequestBody @Validated WeiGuiGetReq req) {
-        return ApiResult.successWithResult(expertMockService.getWeiGui(req));
+    public ApiResult<ViolationGetResp> violationGet(@RequestBody @Validated ViolationGetReq req) {
+        return ApiResult.successWithResult(expertMockService.getViolation(req));
     }
 
     // *** 培训 / 考试 ***
@@ -395,35 +410,6 @@ public class ExpertMockController extends AbstractBaseController {
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     // 课程详情 课节 详情
     @PostMapping("/peiXun/kecheng/kejie/detail/get")
     public ApiResult<PeiXunKeChengKeJieGetResp> getPeiXunKeChengKeJie(@RequestBody @Validated PeiXunKeChengKeJieGetReq req) {

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

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

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

@@ -3,7 +3,7 @@ package com.cnooc.expert.controller.expert.model.request;
 import lombok.Data;
 
 @Data
-public class WeiGuiGetReq {
+public class ViolationGetReq {
 
     private String zhuanJiaGuid;
 

src/main/java/com/cnooc/expert/controller/expert/model/request/WeiGuiJiLuPageReq.java → src/main/java/com/cnooc/expert/controller/expert/model/request/ViolationPageReq.java

@@ -4,16 +4,10 @@ import com.cnooc.expert.common.request.BasePageRequest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * @author: FuHongZhang
- * @date 2025-11-14 17:39
- */
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class WeiGuiJiLuPageReq extends BasePageRequest {
+public class ViolationPageReq extends BasePageRequest {
 
     private String zhuanJiaGuid;
 
-
-
 }

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

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ApproveNodeGetResp {
+
+    // 事项code
+    private String code;
+
+    // 是否下个需要提交审批
+    private Boolean approveNodeNext;
+
+    // 是否审批中的节点
+    private Boolean approveNodeCur;
+
+    // 是否开启审批
+    private Boolean needApprove;
+
+    // 名称
+    private String name;
+
+    // 提示
+    private String toolTip;
+
+    // 当前登录人主体id
+    private String subjectId;
+
+}

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

@@ -42,5 +42,4 @@ public class DongJiePageResp {
     private String jieDongReason;
 
     private String zhuanJiaName;
-
 }

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

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class FirstCategoryExpertApplyResp {
+
+    private String businessId;
+}

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

@@ -5,7 +5,7 @@ import lombok.Data;
 
 @Data
 @Builder
-public class WeiGuiGetResp {
+public class ViolationGetResp {
 
     private String applyBusinessId;
     private Integer applyshenheStatus;
@@ -39,5 +39,7 @@ public class WeiGuiGetResp {
     private String zhuanjiaGuid;
     private String zhuanjiaName;
     private String zhuanjiaWeiguiGuid;
+    // 违规处理时间
+    private Long handledTime;
 
 }

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

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ApproveNodeGetApiReq {
+
+    private String subjectId;
+
+    private String subjectName;
+
+    private String businessId;
+
+    private String busKey;
+}

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

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

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

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

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

@@ -13,7 +13,7 @@ public class ViolationExpertPageApiReq {
 
     private String zhuanJiaGuid;
 
-    private String shenheStatus;
+    private Integer shenheStatus;
 
     private String zhuanJiaZhuangTai;
 

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class ApproveNodeGetApiResp {
+
+    // 事项code
+    private String code;
+
+    // 是否下个需要提交审批
+    private Boolean approveNodeNext;
+
+    // 是否审批中的节点
+    private Boolean approveNodeCur;
+
+    // 是否开启审批
+    private Boolean needApprove;
+
+    // 名称
+    private String name;
+
+    // 提示
+    private String toolTip;
+
+    // 当前登录人主体id
+    private String subjectId;
+
+}

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

@@ -14,13 +14,17 @@ public class DongJieZhuanYePageApiResp {
     private String zhuanYeName;
 
     private String zhuanYeBH;
-
+    
+    private Long jieDongTime;
+    
     private String dongJieFuJianGuid;
-
+    
     private String jieDongFuJianGuid;
 
     private String dongJieReason;
 
+    private Long dongJieTime;
+
     private String gongZuoDanWei;
 
     private String zhuanJiaGuid;
@@ -28,7 +32,7 @@ public class DongJieZhuanYePageApiResp {
     private String pingBiaoZhuanYeGuid;
 
     private Boolean isPrimary;
-    
+
     private String zhuanJiaCode;
 
     private String zhuanYeStatus;

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class FirstCategoryExpertApplyApiResp {
+
+    private String businessId;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class ViolationAuditRecordListApiResp {
+
+    private Integer bianGengXuHao;
+
+    private String buTongGuoEndSequence;
+
+    private Integer buTongGuoStartSequence;
+
+    private String daiShenRenGuids;
+
+    private String daiShenRenNames;
+
+    private String fujianGuid;
+
+    private Boolean isCurrent;
+
+    private Boolean isFinish;
+
+    private String remark;
+
+    private Integer sequence;
+
+    private String shenHeBuMenGuid;
+
+    private String shenHeBuMenName;
+
+    private String shenHeFuJianGuid;
+
+    private String shenHeGuid;
+
+    private String shenHeRenGuid;
+
+    private String shenHeRenName;
+
+    private Integer shenHeStatus;
+
+    private Long shenHeTime;
+
+    private String shenHeTimeText;
+
+    private String shenHeYiJian;
+
+    private String shenPiJieGuoGuid;
+
+    private Integer shenQingLeiXing;
+
+    private Boolean shiFouYiFaZhuanJia;
+
+    private Boolean shiFouZhuanJiao;
+
+    private String shiXiangGuid;
+
+    private String shiXiangName;
+
+    private Integer shiXiangType;
+
+    private Long shouLiTime;
+
+    private String shouLiTimeText;
+
+    private String tiJiaoRenGuid;
+
+    private String tiJiaoRenName;
+
+    private Long tiJiaoTime;
+
+    private String tiJiaoTimeText;
+
+    private String xiaJiShenHeRenGuid;
+
+    private String xiaJiShenHeRenName;
+
+    private String xiangMuGuid;
+
+    private Boolean zhiJieHuiFu;
+}

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

 package com.cnooc.expert.external.expert.model.response;
 
+import lombok.Data;
+
+@Data
 public class ViolationExpertGetApiResp {
 
     private String applyBusinessId;
@@ -54,4 +57,8 @@ public class ViolationExpertGetApiResp {
 
     private String zhuanjiaWeiguiGuid;
 
+    // 违规处理时间
+    private Long handledTime;
+
+
 }

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

@@ -5,6 +5,7 @@ import com.cnooc.expert.external.common.AbstractRetrofitManager;
 import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
 import com.cnooc.expert.external.expert.api.ExpertServiceApi;
+import com.cnooc.expert.external.expert.model.request.ApproveNodeGetApiReq;
 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;
@@ -17,6 +18,7 @@ import com.cnooc.expert.external.expert.model.request.ExamQuestionListApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamRecordSaveApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
+import com.cnooc.expert.external.expert.model.request.FirstCategoryExpertApplyApiReq;
 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;
@@ -27,11 +29,13 @@ 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.ViolationAuditRecordListApiReq;
 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.ZhuanJiaInfoGetByBusinessIdApiReq;
 import com.cnooc.expert.external.expert.model.request.ZhuanJiaPingBiaoXiangMuRenWuPageApiReq;
+import com.cnooc.expert.external.expert.model.response.ApproveNodeGetApiResp;
 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;
@@ -44,6 +48,7 @@ import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
+import com.cnooc.expert.external.expert.model.response.FirstCategoryExpertApplyApiResp;
 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;
@@ -56,11 +61,13 @@ import com.cnooc.expert.external.expert.model.response.TrainCourseLessonPageApiR
 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.ViolationAuditRecordListApiResp;
 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.ZhuanJiaInfoGetByBusinessIdApiResp;
 import com.cnooc.expert.external.expert.model.response.ZhuanJiaPingBiaoXiangMuRenWuPageApiResp;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import retrofit2.Call;
@@ -68,6 +75,7 @@ import retrofit2.Retrofit;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class ExpertServiceClient extends AbstractRetrofitManager {
@@ -86,6 +94,12 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         return this.getResponseBody(call, "getBusinessId");
     }
 
+    public ApiBaseResult<List<ApproveNodeGetApiResp>> getApproveNode(ApproveNodeGetApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<List<ApproveNodeGetApiResp>>> call = expertServiceApi.getApproveNodeApi(headers, req);
+        return this.getResponseBody(call, "getApproveNode");
+    }
+
     // ****** 专家 ******
 
     public ApiBaseResult<ExpertInfoGetApiResp> getExpertInfo(ExpertInfoGetApiReq req) {
@@ -110,6 +124,12 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         return this.getResponseBody(call, "updateExpertInfo");
     }
 
+    public ApiBaseResult<FirstCategoryExpertApplyApiResp> applyFirstCategoryExpert(FirstCategoryExpertApplyApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<FirstCategoryExpertApplyApiResp>> call = expertServiceApi.applyFirstCategoryExpertApi(headers, req);
+        return this.getResponseBody(call, "applyFirstCategoryExpert");
+    }
+
     public ApiBaseResult<List<CommonNofilterEnumGetApiResp>> getCommonNofilterEnum(CommonNofilterEnumGetApiReq req) {
         Map<String, Object> headers = super.getHeaders();
         Call<ApiBaseResult<List<CommonNofilterEnumGetApiResp>>> call = expertServiceApi.getCommonNofilterEnumApi(headers, req);
@@ -211,11 +231,38 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         return this.getResponseBody(call, "pageViolationExpert");
     }
 
+    private static final int SHEN_HE_STATUS_HANDLED = 50;
+
     // 专家违规详情
     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");
+
+        ApiBaseResult<ViolationExpertGetApiResp> violationApiResp = this.getResponseBody(call, "getViolationExpert");
+        ViolationExpertGetApiResp apiData = violationApiResp.getData();
+
+        if (Objects.equals(SHEN_HE_STATUS_HANDLED, apiData.getShenheStatus())) {
+            ApiBaseResult<List<ViolationAuditRecordListApiResp>> auditListApiResp = this.listViolationAuditRecord(req.getGuid());
+            if (auditListApiResp.getSuccess()) {
+                List<ViolationAuditRecordListApiResp> auditList = auditListApiResp.getData();
+                if (CollectionUtils.isNotEmpty(auditList)) {
+                    ViolationAuditRecordListApiResp lastAudit = auditList.get(0);
+                    apiData.setHandledTime(lastAudit.getTiJiaoTime());
+                }
+            }
+        }
+
+        return violationApiResp;
+    }
+
+    // 专家违规处理记录
+    public ApiBaseResult<List<ViolationAuditRecordListApiResp>> listViolationAuditRecord(String zhuanjiaWeiguiGuid) {
+        Map<String, Object> headers = super.getHeaders();
+        ViolationAuditRecordListApiReq apiReq = ViolationAuditRecordListApiReq.builder()
+                .zhuanjiaWeiguiGuid(zhuanjiaWeiguiGuid)
+                .build();
+        Call<ApiBaseResult<List<ViolationAuditRecordListApiResp>>> call = expertServiceApi.listViolationAuditRecordApi(headers, apiReq);
+        return this.getResponseBody(call, "listViolationAuditRecord");
     }
 
     // *** 培训、考试 ***

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

@@ -8,6 +8,7 @@ import com.cnooc.expert.controller.expert.model.request.DongJiePageReq;
 import com.cnooc.expert.controller.expert.model.request.ExamQuestionXiaoTiListReq;
 import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
+import com.cnooc.expert.controller.expert.model.request.FirstCategoryExpertApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
 import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq;
@@ -23,10 +24,11 @@ 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.ViolationGetReq;
+import com.cnooc.expert.controller.expert.model.request.ViolationPageReq;
 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.ApproveNodeGetResp;
 import com.cnooc.expert.controller.expert.model.response.CityTreeNodeResp;
 import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
 import com.cnooc.expert.controller.expert.model.response.DongJieGetResp;
@@ -36,6 +38,7 @@ import com.cnooc.expert.controller.expert.model.response.ExamQuestionListResp;
 import com.cnooc.expert.controller.expert.model.response.ExamQuestionXiaoTiListResp;
 import com.cnooc.expert.controller.expert.model.response.ExamRecordSaveResp;
 import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
+import com.cnooc.expert.controller.expert.model.response.FirstCategoryExpertApplyResp;
 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;
@@ -52,10 +55,11 @@ 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.SecondaryUnitListItemResp;
 import com.cnooc.expert.controller.expert.model.response.TempExamPaperGetResp;
-import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp;
+import com.cnooc.expert.controller.expert.model.response.ViolationGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiPageResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaInfoGetByBusinessIdResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.external.expert.model.request.ApproveNodeGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ExamPaperSubmitApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
 import com.cnooc.expert.external.expert.model.request.TainLessonProgressUpdateApiReq;
@@ -87,6 +91,22 @@ public class ExpertMockService {
                 .build();
     }
 
+    public List<ApproveNodeGetResp> getApproveNodeList(ApproveNodeGetApiReq req) {
+
+        ArrayList<ApproveNodeGetResp> result = Lists.newArrayList(
+                ApproveNodeGetResp.builder()
+                        .approveNodeCur(true)
+                        .approveNodeNext(true)
+                        .code("FirstCategoryExpertApply-innerApprove")
+                        .name("内部审批")
+                        .needApprove(true)
+                        .subjectId("")
+                        .toolTip("您即将提交给公司内部审批")
+                        .build()
+        );
+        return result;
+    }
+
     public List<NofilterListItemResp> listDictNofilter(DictNofilterListReq req) {
         ArrayList<NofilterListItemResp> result = Lists.newArrayList(
                 NofilterListItemResp.builder()
@@ -1776,6 +1796,12 @@ public class ExpertMockService {
         return result;
     }
 
+    public FirstCategoryExpertApplyResp applyFirstCategoryExpert(FirstCategoryExpertApplyReq req) {
+        return FirstCategoryExpertApplyResp.builder()
+                .businessId(req.getBusinessId())
+                .build();
+    }
+
     public PingBiaoXiangMuInfoGetByChouQuMaResp getPingBiaoXiangMuInfoByChouQuMa(PingBiaoXiangMuInfoGetByChouQuMaReq req) {
 
         PingBiaoXiangMuInfoGetByChouQuMaResp result = PingBiaoXiangMuInfoGetByChouQuMaResp.builder()
@@ -2400,7 +2426,7 @@ public class ExpertMockService {
     }
 
 
-    public BasePageResp<WeiGuiPageResp> pageWeiGuiList(WeiGuiJiLuPageReq req) {
+    public BasePageResp<WeiGuiPageResp> pageViolation(ViolationPageReq req) {
 
         List<WeiGuiPageResp> list = Lists.newArrayList(
                 WeiGuiPageResp.builder()
@@ -2536,8 +2562,8 @@ public class ExpertMockService {
         return list;
     }
 
-    public WeiGuiGetResp getWeiGui(WeiGuiGetReq req) {
-        return WeiGuiGetResp.builder()
+    public ViolationGetResp getViolation(ViolationGetReq req) {
+        return ViolationGetResp.builder()
                 .applyBusinessId("1240990734186446848")
                 .applyshenheStatus(50)
                 .businessId("1241043784526479360")
@@ -2570,6 +2596,7 @@ public class ExpertMockService {
                 .zhuanjiaGuid("8ffb7651-1416-4f74-a590-1f0cf860463b")
                 .zhuanjiaName("")
                 .zhuanjiaWeiguiGuid("316cf113-2233-4118-9bd6-713e75b81363")
+                .handledTime(1701415932795L)
                 .build();
     }
 

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

@@ -8,6 +8,7 @@ import com.cnooc.expert.controller.expert.model.request.DongJiePageReq;
 import com.cnooc.expert.controller.expert.model.request.ExamQuestionXiaoTiListReq;
 import com.cnooc.expert.controller.expert.model.request.ExamRecordSaveReq;
 import com.cnooc.expert.controller.expert.model.request.ExpertInfoUpdateApiReq;
+import com.cnooc.expert.controller.expert.model.request.FirstCategoryExpertApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
 import com.cnooc.expert.controller.expert.model.request.PingBiaoXiangMuByOwnerPageReq;
@@ -19,13 +20,14 @@ 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.ViolationGetReq;
+import com.cnooc.expert.controller.expert.model.request.ViolationPageReq;
 import com.cnooc.expert.controller.expert.model.request.ZhuanJiaShenQingJiLuPageReq;
 import com.cnooc.expert.controller.expert.model.response.PingBiaoZhuanYeTreeNodeResp;
 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.ApproveNodeGetApiReq;
 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;
@@ -39,6 +41,7 @@ import com.cnooc.expert.external.expert.model.request.ExamQuestionXiaoTiListApiR
 import com.cnooc.expert.external.expert.model.request.ExamRecordSaveApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
+import com.cnooc.expert.external.expert.model.request.FirstCategoryExpertApplyApiReq;
 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;
@@ -53,6 +56,7 @@ 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.ApproveNodeGetApiResp;
 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;
@@ -65,6 +69,7 @@ import com.cnooc.expert.external.expert.model.response.ExamQuestionListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamQuestionXiaoTiListApiResp;
 import com.cnooc.expert.external.expert.model.response.ExamRecordSaveApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
+import com.cnooc.expert.external.expert.model.response.FirstCategoryExpertApplyApiResp;
 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;
@@ -102,6 +107,11 @@ public class ExpertService {
         return apiResp.getData();
     }
 
+    public List<ApproveNodeGetApiResp> getApproveNodeList(ApproveNodeGetApiReq req) {
+        ApiBaseResult<List<ApproveNodeGetApiResp>> apiResp = expertServiceClient.getApproveNode(req);
+        return apiResp.getData();
+    }
+
     public List<CommonNofilterEnumGetApiResp> listDictNofilter(DictNofilterListReq req) {
         CommonNofilterEnumGetApiReq apiReq = CommonNofilterEnumGetApiReq.builder()
                 .name("MinZu")
@@ -199,11 +209,20 @@ public class ExpertService {
         return apiResp.getData();
     }
 
-    public ExpertInfoGetApiResp updateExpetInfo(ExpertInfoUpdateApiReq req) {
+    public ExpertInfoGetApiResp updateExpertInfo(ExpertInfoUpdateApiReq req) {
         ApiBaseResult<ExpertInfoGetApiResp> apiResp = expertServiceClient.updateExpertInfo(req);
         return apiResp.getData();
     }
 
+    public FirstCategoryExpertApplyApiResp applyFirstCategoryExpert(FirstCategoryExpertApplyReq req) {
+        FirstCategoryExpertApplyApiReq apiReq = FirstCategoryExpertApplyApiReq.builder()
+                .zhuanJiaGuid(req.getZhuanJiaGuid())
+                .businessId(req.getBusinessId())
+                .build();
+        ApiBaseResult<FirstCategoryExpertApplyApiResp> apiResp = expertServiceClient.applyFirstCategoryExpert(apiReq);
+        return apiResp.getData();
+    }
+
     public XiangMuInfoByChouQuNumGetApiResp getPingBiaoXiangMuInfoByChouQuMa(PingBiaoXiangMuInfoGetByChouQuMaReq req) {
         XiangMuInfoByChouQuNumGetApiReq apiReq = XiangMuInfoByChouQuNumGetApiReq.builder()
                 .chouQuNum(req.getChouQuNum())
@@ -387,12 +406,14 @@ public class ExpertService {
         return apiResp.getData();
     }
 
+    private static final int SHEN_HE_STATUS_HANDLED = 50;
 
-    // 专家违规分页
-    public BasePageResp<ViolationExpertPageApiResp> pageWeiGuiList(WeiGuiJiLuPageReq req) {
+    // 专家违规分页 (查询处理状态 = ‘已处理’)
+    public BasePageResp<ViolationExpertPageApiResp> pageWeiGuiList(ViolationPageReq req) {
         ViolationExpertPageApiReq apiReq = ViolationExpertPageApiReq.builder()
                 .page(req.getPageNo())
                 .rows(req.getPageSize())
+                .shenheStatus(SHEN_HE_STATUS_HANDLED)
                 .zhuanJiaGuid(req.getZhuanJiaGuid())
                 .build();
         ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>> apiResp = expertServiceClient.pageViolationExpert(apiReq);
@@ -408,7 +429,7 @@ public class ExpertService {
     }
 
     // 专家违规详情
-    public ViolationExpertGetApiResp getWeiGui(WeiGuiGetReq req) {
+    public ViolationExpertGetApiResp getViolation(ViolationGetReq req) {
         ViolationExpertGetApiReq apiReq = ViolationExpertGetApiReq.builder()
                 .zhuanJiaGuid(req.getZhuanJiaGuid())
                 .guid(req.getGuid())

src/main/resources/application.yml

@@ -25,7 +25,7 @@ spring:
       indent-output: true
     deserialization:
       fail-on-unknown-properties: false
-    default-property-inclusion: non_null
+    # default-property-inclusion: non_null
 
   kafka:
     # Kafka服务器地址