add workflow

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

@@ -2,44 +2,8 @@ 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.expert.model.request.CompanyPageReq;
-import com.cnooc.expert.controller.expert.model.request.DictNofilterListReq;
-import com.cnooc.expert.controller.expert.model.request.DongJieGetReq;
-import com.cnooc.expert.controller.expert.model.request.DongJiePageReq;
-import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
-import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
-import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianGetReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianListReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieGetReq;
-import com.cnooc.expert.controller.expert.model.request.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.WeiGuiGetReq;
-import com.cnooc.expert.controller.expert.model.request.WeiGuiJiLuPageReq;
-import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
-import com.cnooc.expert.controller.expert.model.response.DongJieGetResp;
-import com.cnooc.expert.controller.expert.model.response.DongJiePageResp;
-import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
-import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
-import com.cnooc.expert.controller.expert.model.response.KaoShiPageResp;
-import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianGetResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianListResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJiePageResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
-import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuInfoGetByChouQuMaResp;
-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.request.*;
+import com.cnooc.expert.controller.expert.model.response.*;
 import com.cnooc.expert.service.ExpertService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.AllArgsConstructor;
@@ -230,6 +194,18 @@ public class ExpertController {
     }
 
 
+    /**
+     * 专家个人的申请列表
+     * @param req
+     * @return
+     */
+    @PostMapping("/zhuan-jia/shen-qing-ji-lu/page")
+    public ApiResult<BasePageResp<ZhuanJiaShenQingJiLuPageResp>> zhuanJiaShenQingJiLuPage(@RequestBody @Validated ZhuanJiaShenQingJiLuPageReq req) {
+        return ApiResult.successWithResult(expertService.pageZhuanJiaShenQingJiLu(req));
+    }
+
+
+
     // *** 违规信息/冻结信息 ***
 
     // 专家冻结信息分页列表

src/main/java/com/cnooc/expert/controller/expert/model/request/ZhuanJiaShenQingJiLuPageReq.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;
+
+/**
+ * @author: FuHongZhang
+ * @date 2025-11-16 13:51
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZhuanJiaShenQingJiLuPageReq extends BasePageRequest {
+
+    private String zhuanJiaGuid;
+
+    private Short shenQingLeiXing;
+
+    private Integer page;
+
+    private Integer rows;
+
+    // 二开新增：申请类型数组（多个用英文逗号,分隔）
+    private String shenQingLeiXingList;
+
+    // 二开新增：申请类型数组（后端用）
+    private List<Short> shenQingLeiXings;
+
+    // 二开新增（后端用）
+    private List<String> shenPiJiLuGuids;
+
+}

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

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * @author: FuHongZhang
+ * @date 2025-11-16 13:53
+ */
+@Data
+@Builder
+public class ZhuanJiaShenQingJiLuPageResp {
+
+    private static final long serialVersionUID = -1L;
+
+    private String shenPiJiLuGuid;
+
+    private String zhuanJiaGuid;
+
+    private String zhuanJiaShiXiangGuid;
+
+    private String shiXiangName;
+
+    private Short shiXiangType;
+
+    private String xiangMuGuid;
+
+    private String shenPiBuMenGuid;
+
+    private String shenPiBuMenName;
+
+    private Short shenPiZhuangTai;
+
+    private String shenPiYiJian;
+
+    private Long shenPiShiJian;
+
+    private String shenHeRenGuid;
+
+    private String shenPiRen;
+
+    private String tiJiaoRenName;
+
+    private String tiJiaoRenGuid;
+
+    private Long tiJiaoTime;
+
+    private String creatorName;
+
+    private Long createTime;
+
+    private String modifierName;
+
+    private Long modifyTime;
+
+    private Integer shenQingLeiXing;
+
+    private Boolean isDeleted;
+
+    private Short bianGengXuHao;
+
+    private String tuiKuYuanYin;
+
+    private String mobile;
+
+    private String shenFenZheng;
+
+    private Boolean shiFouZhuanJiao;
+
+    private String xiaJiShenHeRenGuid;
+
+    private String xiaJiShenHeRenName;
+
+    private Boolean nengCheHui;
+
+    private String remark;
+
+    private Integer sequence;
+
+    private String daiShenRenGuids;
+
+    private String daiShenRenNames;
+
+    private Long shouLiTime;
+
+    private Boolean isFinish;
+
+    private Short shouLiZhuanTai;
+
+    private String shouLiRen;
+
+    private String photoGuid;
+
+    private String workFlowBusinessId;
+
+    private Long workFlowBusinessIdNew;
+
+    private String businessId;
+
+    // 工作流审批当前节点
+    private String currentNode;
+
+    private String shiXiangGuid;
+
+    private String createTimeText;
+
+    private String createName;
+
+    private String modifyTimeText;
+
+    private String shouLiTimeText;
+
+    private String tiJiaoTimeText;
+
+
+}

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.CompanyPageReq;
-import com.cnooc.expert.controller.expert.model.request.DictNofilterListReq;
-import com.cnooc.expert.controller.expert.model.request.DongJieGetReq;
-import com.cnooc.expert.controller.expert.model.request.DongJiePageReq;
-import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaApplyReq;
-import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
-import com.cnooc.expert.controller.expert.model.request.KaoShiPageReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianGetReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieFuJianListReq;
-import com.cnooc.expert.controller.expert.model.request.PeiXunKeChengKeJieGetReq;
-import com.cnooc.expert.controller.expert.model.request.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.WeiGuiGetReq;
-import com.cnooc.expert.controller.expert.model.request.WeiGuiJiLuPageReq;
-import com.cnooc.expert.controller.expert.model.response.CompanyPageResp;
-import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
-import com.cnooc.expert.controller.expert.model.response.DongJieGetResp;
-import com.cnooc.expert.controller.expert.model.response.DongJiePageResp;
-import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
-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.NofilterListItemResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianGetResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieFuJianListResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJieGetResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunKeChengKeJiePageResp;
-import com.cnooc.expert.controller.expert.model.response.PeiXunPageResp;
-import com.cnooc.expert.controller.expert.model.response.PingBiaoXiangMuByOwnerPageResp;
-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.QingJiaJinJiPageResp;
-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.request.*;
+import com.cnooc.expert.controller.expert.model.response.*;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetTestResp;
 import com.cnooc.expert.external.expert.service.ExpertServiceClient;
@@ -1985,4 +1944,66 @@ public class ExpertService {
                 .fileSize("1128")
                 .build();
     }
+
+    public BasePageResp<ZhuanJiaShenQingJiLuPageResp> pageZhuanJiaShenQingJiLu(ZhuanJiaShenQingJiLuPageReq req) {
+        ArrayList<ZhuanJiaShenQingJiLuPageResp> list = Lists.newArrayList(
+                ZhuanJiaShenQingJiLuPageResp.builder()
+                        .bianGengXuHao(null)
+                        .businessId("1438482566640164864")
+                        .createTime(1763002577535L)
+                        .createTimeText("2025-11-13 10:56:17")
+                        .creatorName("物装中心十七")
+                        .currentNode("expertModifyApply-innerApprove")
+                        .daiShenRenGuids("")
+                        .daiShenRenNames("")
+                        .isDeleted(false)
+                        .isFinish(false)
+                        .mobile("15900000017")
+                        .modifierName("物装中心十七")
+                        .modifyTime(1763002676888L)
+                        .modifyTimeText("2025-11-13 10:57:58")
+                        .nengCheHui(false)
+                        .photoGuid("")
+                        .remark("")
+                        .sequence(null)
+                        .shenFenZheng("123431198502127465")
+                        .shenHeRenGuid("")
+                        .shenPiBuMenGuid("")
+                        .shenPiBuMenName("b66065b5-3f4a-4b98-bdf5-4374d3350aef")
+                        .shenPiJiLuGuid("")
+                        .shenPiRen("")
+                        .shenPiShiJian(null)
+                        .shenPiYiJian("")
+                        .shenPiZhuangTai((short) 2)
+                        .shenQingLeiXing(105)
+                        .shiFouZhuanJiao(false)
+                        .shiXiangGuid("")
+                        .shiXiangName("")
+                        .shiXiangType(null)
+                        .shouLiRen("")
+                        .shouLiTime(null)
+                        .shouLiTimeText(null)
+                        .shouLiZhuanTai((short) 2)
+                        .tiJiaoRenGuid("")
+                        .tiJiaoRenName("")
+                        .tiJiaoTime(null)
+                        .tiJiaoTimeText(null)
+                        .tuiKuYuanYin("")
+                        .workFlowBusinessId("1438482566640164864")
+                        .workFlowBusinessIdNew(null)
+                        .xiaJiShenHeRenGuid("")
+                        .xiaJiShenHeRenName("")
+                        .xiangMuGuid("")
+                        .zhuanJiaGuid("")
+                        .zhuanJiaShiXiangGuid("")
+                        .build()
+        );
+
+        return BasePageResp.<ZhuanJiaShenQingJiLuPageResp>builder()
+                .current(1)
+                .pages(1)
+                .total(1)
+                .data(list)
+                .build();
+    }
 }