add getExpertInfo

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

@@ -4,9 +4,9 @@ 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.response.DictListResp;
-import com.cnooc.expert.controller.expert.model.response.NofilterListResp;
-import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListResp;
+import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
+import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
+import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp;
 import com.cnooc.expert.service.ExpertService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import lombok.AllArgsConstructor;
@@ -17,6 +17,8 @@ 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("/expert")
@@ -38,7 +40,7 @@ public class ExpertController {
      * @return
      */
     @PostMapping("/nofilter/list")
-    public ApiResult<NofilterListResp> dictNofilterList(@RequestBody @Validated DictNofilterListReq req) {
+    public ApiResult<List<NofilterListItemResp>> dictNofilterList(@RequestBody @Validated DictNofilterListReq req) {
         return ApiResult.successWithResult(expertService.listDictNofilter(req));
     }
 
@@ -48,7 +50,7 @@ public class ExpertController {
      * @return
      */
     @PostMapping("/secondary-unit/list")
-    public ApiResult<SecondaryUnitListResp> secondaryUnitList() {
+    public ApiResult<List<SecondaryUnitListItemResp>> secondaryUnitList() {
         return ApiResult.successWithResult(expertService.listSecondaryUnit());
     }
 
@@ -58,7 +60,7 @@ public class ExpertController {
      * @return
      */
     @PostMapping("/dict/guid4/list")
-    public ApiResult<DictListResp> dictGuiud4List() {
+    public ApiResult<List<DictListItemResp>> dictGuiud4List() {
         return ApiResult.successWithResult(expertService.listDict4());
     }
 
@@ -68,7 +70,7 @@ public class ExpertController {
      * @return
      */
     @PostMapping("/dict/guid5/list")
-    public ApiResult<DictListResp> dictGuiud5List() {
+    public ApiResult<List<DictListItemResp>> dictGuiud5List() {
         return ApiResult.successWithResult(expertService.listDict5());
     }
 
@@ -79,12 +81,13 @@ public class ExpertController {
      * @return
      */
     @PostMapping("/dict/guid6/list")
-    public ApiResult<DictListResp> dictGuiud6List() {
+    public ApiResult<List<DictListItemResp>> dictGuiud6List() {
         return ApiResult.successWithResult(expertService.listDict6());
     }
 
     /**
      * 公司列表
+     *
      * @return
      */
     @PostMapping("/company/page")
@@ -92,6 +95,15 @@ public class ExpertController {
         return ApiResult.successWithResult(expertService.pageCompany(req));
     }
 
+    /**
+     * 专家个人信息
+     *
+     * @return
+     */
+    @PostMapping("/info")
+    public ApiResult<ExpertInfoGetResp> ExpertInfoGet(@RequestBody @Validated CompanyPageReq req) {
+        return ApiResult.successWithResult(expertService.getExpertInfo(req));
+    }
 
 
 }

src/main/java/com/cnooc/expert/controller/expert/model/response/DictListResp.java → src/main/java/com/cnooc/expert/controller/expert/model/response/DictListItemResp.java

@@ -3,23 +3,14 @@ package com.cnooc.expert.controller.expert.model.response;
 import lombok.Builder;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 @Builder
-public class DictListResp {
-
-    private List<Item> data;
-
-    @Data
-    @Builder
-    public static class Item {
+public class DictListItemResp {
 
-        private String dictGuid;
+    private String dictGuid;
 
-        private String key;
+    private String key;
 
-        private String value;
-    }
+    private String value;
 
 }

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

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@Builder
+public class ExpertInfoGetResp {
+
+    private String businessId;
+
+    private Long pinQiStartTime;
+
+    private Long pinQiEndTime;
+
+    private Bean bean;
+
+    private SysShenHeJieGuo sysShenHeJieGuo;
+
+    private SysShenHeJieGuo xuQiShenHeJieGuo;
+
+    private ZhuangTaiXiuGaiJiLuSq xuQiXiuGaiJiLuSq;
+
+    private SysShenHeJieGuo tuiKuShenHeJieGuo;
+
+    private ZhuangTaiXiuGaiJiLuSq tuiKuGaiJiLuSq;
+
+    private SysShenHeJieGuo yiLeiShenHeJieGuo;
+
+    private SysShenHeJieGuo rukuShenHeJieGuo;
+
+    private List<Jl> jlList;
+
+    private List<Zg> zgList;
+
+    private List<Zc> zcList;
+
+    private List<Pb> pbList;
+
+    private List<Hb> hbList;
+
+    private List<Ps> psList;
+
+    private List<Language> languageList;
+
+    private List<XueLi> xueLiList;
+
+    private List<FuJian> fuJianList;
+
+
+    @Data
+    @Builder
+    public static class Bean {
+        private String adAccount;
+        private String age;
+        private String authPassWithImport;
+        private String auths;
+        private String base64FanMianFuJian;
+        private String base64FanMianFuJianName;
+        private String base64FuJian;
+        private String base64FuJianName;
+        private String base64Photo;
+        private String base64PhotoName;
+        private String baseAuths;
+        private String baseCode;
+        private String baseGuid;
+        private String baseMobile;
+        private String baseName;
+        private String baseSFZH;
+        private String baseShenPiZhuangTai;
+        private String baseZhuangTai;
+        private String biYeYuanXiao;
+        private Integer bianGengXuHao;
+        private String birthday;
+        private String buNengRuXuanQingKong;
+        private String byzFileGuid;
+        private String canYuXiangMu;
+        private String city;
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String danRenQiTaZhuanJia;
+        private String danweiGuid;
+        private String department;
+        private String domainName;
+        private String email;
+        private String fanMianFuJianGuids;
+        private String fax;
+        private String fuJianGuids;
+        private String gongZuoBeiZhu;
+        private String gongZuoDanWei;
+        private String gongZuoDanWeiBH;
+        private String gongZuoDanWeiDiZhi;
+        private String gongZuoPhone;
+        private String gongZuoPost;
+        private Long gongZuoTime;
+        private String gongZuoZhiWu;
+        private String gongZuoZhuanYeName;
+        private String gongZuoZhuanYeYears;
+        private String gongZuoZhuangTai;
+        private String graduationDate;
+        private Boolean hasLianJieChuLiYiJian;
+        private String huoJiangQingKuang;
+        private Boolean inGroup;
+        private Boolean isHasLianJieChuLiYiJian;
+        private Boolean isQualified;
+        private Boolean isReadRuKuPromise;
+        private Boolean isSenior;
+        private Boolean isZhiYeZiGe;
+        private String jgdmFileGuid;
+        private String jiTuanErJiDanWeiCode;
+        private String jiTuanErJiDanWeiName;
+        private String jiaTingDiZhi;
+        private String jiaTingPhone;
+        private String jiaTingPost;
+        private String jianKangZhuangKuang;
+        private String jinJiLianXiRenGuid;
+        private String jinJiLianXiRenName;
+        private String jinJiLianXiRenPhone;
+        private String kaoShiFenShu;
+        private Integer leiJiFenZhi;
+        private Long leiJiZhanTingTime;
+        private String lianJieYiJianShuFuJianGuid;
+        private String lsFuJian;
+        private String minZu;
+        private String minZuText;
+        private String mobile;
+        private String mobileGJQHText;
+        private String mobileGuoJiQuHao;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private Boolean needTest;
+        private String photoGuid;
+        private String pingBiaoChangZhuDiQu;
+        private String pingBiaoChangZhuDiQuName;
+        private Boolean pingBiaoIsYingJi;
+        private String pingBiaoQiTaDiQu;
+        private String pingBiaoTuiJianLX;
+        private String pingBiaoYingJiDiQu;
+        private Long pinqiEndTime;
+        private Long pinqiStartTime;
+        private String professionLevel;
+        private String qiTaLianXiFangShi;
+        private Boolean qualified;
+        private Boolean readRuKuPromise;
+        private Long readRuKuPromiseTime;
+        private Integer ruKuZhuangTai;
+        private Boolean senior;
+        private Boolean sex;
+        private String sfzFileGuid;
+        private String sfzFuJians;
+        private String shenFenZheng;
+        private Long shenHeEndTime;
+        private Long shenHeStartTime;
+        private String shenPiRen;
+        private String shenPiShiJian;
+        private String shenPiShiJianText;
+        private String shenPiYiJian;
+        private Integer shenPiZhuangTai;
+        private Long shenQingEndTime;
+        private Integer shenQingLeiXing;
+        private Long shenQingStartTime;
+        private Boolean shiFouYiFaZhuanJia;
+        private String subjectCode;
+        private String subjectId;
+        private String subjectName;
+        private Integer subjectType;
+        private String suoShuBuMeng;
+        private String suoShuDanWeiName;
+        private String suoShuHangYe;
+        private String suoShuZhaoBiaoDaiLi;
+        private String suoZaiQitaZhuanJiaKu;
+        private String tenantId;
+        private String tenantId_;
+        private String tenantName;
+        private Long tiJiaoTime;
+        private String tiJiaoTimeText;
+        private String tuiKuYuanYin;
+        private String waiYuChengDu;
+        private String xueLi;
+        private String xueLiTxt;
+        private String xueLiZhuanYe;
+        private String xueWei;
+        private String xueWeiTxt;
+        private String xueWeiZhuanYe;
+        private String yinHang;
+        private String yinHang1;
+        private String yinHangKa;
+        private String yinHangKaFileGuid;
+        private String yingJiZhuangTai;
+        private String zhangHao;
+        private String zhaoBiaoDanWeiBianHao;
+        private String zhaoBiaoDanweiMingChen;
+        private String zhengJianType;
+        private String zhengZhiMianMao;
+        private Boolean zhiYeZiGe;
+        private String zhuanJiaCode;
+        private Integer zhuanJiaFenJi;
+        private Integer zhuanJiaFenLei;
+        private String zhuanJiaGuid;
+        private String zhuanJiaName;
+        private String zhuanJiaShiXiangGuid;
+        private Integer zhuanJiaSourceType;
+        private String zhuanJiaSuoZaiDiGuids;
+        private String zhuanJiaSuoZaiDiNames;
+        private String zhuanJiaType;
+        private Integer zhuanJiaZhuangTai;
+        private String zhuanJiaZiZhiTiaoJian;
+        private String zhuanJiaZongHeBianHao;
+        private String zhuanYeJingLi;
+        private String zhuanYeTeChang;
+        private Integer zhuanjiaQinRenQi;
+        private Long ziDongZanTingEndTime;
+        private Long ziDongZanTingStartTime;
+    }
+
+    @Data
+    @Builder
+    public static class Jl {
+        private String buMenName;
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String danWeiBH;
+        private String danWeiName;
+        private String gongZuoMiaoShu;
+        private String jingLiGuid;
+        private Long liZhiTime;
+        private String liZhiTimeText;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private Long riZhiTime;
+        private String riZhiTimeText;
+        private String shenFenZheng;
+        private Long tenantId;
+        private String tenantName;
+        private String zhiWu;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class Zg {
+
+    }
+
+    @Data
+    @Builder
+    public static class Zc {
+        private String base64ZcFile;
+
+        private String base64ZcFileName;
+
+        private Long createTime;
+
+        private String createTimeText;
+
+        private String creatorName;
+
+        private String dictGuid;
+
+        private String modifierName;
+
+        private Long modifyTime;
+
+        private String modifyTimeText;
+
+        private String pingDingTime;
+
+        private String pingDingTimeText;
+
+        private String zcFileGuid;
+
+        private String zhiChengGuid;
+
+        private String zhiChengName;
+
+        private String zhiChengZhuanYe;
+
+        private String zhuanJiaGuid;
+
+        private String zhuanJiaShiXiangGuid;
+
+        private String ziXinXiGuid;
+    }
+
+
+    @Data
+    @Builder
+    public static class Pb {
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private Long dongJieEndTime;
+        private String dongJieFuJianGuid;
+        private String dongJieOperator;
+        private String dongJieReason;
+        private Long dongJieSatrtTime;
+        private Long dongJieTime;
+        private Boolean isPrimary;
+        private Boolean isScarce;
+        private String jieDongFuJianGuid;
+        private String jieDongOperator;
+        private String jieDongReason;
+        private Long jieDongTime;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private String parentGuid;
+        private String path;
+        private String pingBiaoZhuanYeGuid;
+        private Integer professionLevel;
+        private String zhuanJiaGuid;
+        private String zhuanJiaLeiBie;
+        private String zhuanJiaShiXiangGuid;
+        private String zhuanYeBH;
+        private String zhuanYeGuid;
+        private String zhuanYeJiBie;
+        private String zhuanYeName;
+        private String zhuanYeNianXian;
+        private Integer zhuanYeStatus;
+        private String zhuanYeXiangGuanJingLi;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class Hb {
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String danWeiBH;
+        private String danWeiName;
+        private String huiBiGuid;
+        private String huiBiMiaoShu;
+        private String huiBiMiaoShuStr;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class Ps {
+        private Long createTime;
+        private String creatorGuid;
+        private String creatorName;
+        private String modifierGuid;
+        private String modifierName;
+        private Long modifyTime;
+        private Long pinQiEndTime;
+        private String pinQiEndTimeText;
+        private Long pinQiStartTime;
+        private String pinQiStartTimeText;
+        private String pinShuFuJianGuid;
+        private String pingShuGuid;
+        private String zhuanJiaGuid;
+        private Integer zhuanJiaQinRenQi;
+    }
+
+    @Data
+    @Builder
+    public static class Language {
+        private String languageGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String languageName;
+        private String languageId;
+        private String shuLianChengDu;
+        private String shuLianChengDuId;
+
+    }
+
+    @Data
+    @Builder
+    public static class XueLi {
+        private Long biYeTime;
+        private String biYeYuanXiao;
+        private String biYeYuanXiaoGuid;
+        private String byzFileGuid;
+        private Long createTime;
+        private String creatorGuid;
+        private String creatorName;
+        private Long creatorTime;
+        private Boolean isImport;
+        private Boolean isZuiGaoXueLi;
+        private Boolean isZuiGaoXueWei;
+        private String modifier;
+        private String modifierName;
+        private Long modifyTime;
+        private String suoShuZhaoBiaoDaiLi;
+        private String xueLiBh;
+        private String xueLiDictGuid;
+        private String xueLiGuid;
+        private String xueLiName;
+        private String xueLiZhuanYe;
+        private String xueLiZhuanYeBh;
+        private String xueLiZhuanYeGuid;
+        private String xueWeiBh;
+        private String xueWeiDictGuid;
+        private String xueWeiName;
+        private String xwzFileGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class FuJian {
+        private Long createTime;
+        private String creatorGuid;
+        private String creatorName;
+        private String downloadUrl;
+        private String feiQiRenGuid;
+        private String feiQiRenName;
+        private Long feiQiTime;
+        private String fileDescription;
+        private String fileName;
+        private Integer fileSize;
+        private Integer fileType;
+        private String fuJianGuid;
+        private Boolean isFeiQi;
+        private String modifierGuid;
+        private String modifierName;
+        private Long modifyTime;
+        private String shenHeRenGuid;
+        private String shenHeRenName;
+        private Integer shenHeStatus;
+        private Long shenHeTime;
+        private String shenHeYiJian;
+        private Long tiJiaoTime;
+        private String zhuanJiaFuJianGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+        private String ziXinXiGuid;
+    }
+
+    @Data
+    @Builder
+    public static class SysShenHeJieGuo {
+        private String bianGengXuHao;
+        private String businessId;
+        private Long createTime;
+        private String createTimeText;
+        private String creatorName;
+        private String currentNode;
+        private String daiShenRenGuids;
+        private String daiShenRenNames;
+        private Boolean isFinish;
+        private String mobile;
+        private String modifierName;
+        private Long modifyTime;
+        private String modifyTimeText;
+        private Boolean nengCheHui;
+        private String photoGuid;
+        private String remark;
+        private String sequence;
+        private String shenFenZheng;
+        private String shenHeRenGuid;
+        private String shenPiBuMenGuid;
+        private String shenPiBuMenName;
+        private String shenPiJiLuGuid;
+        private String shenPiRen;
+        private String shenPiShiJian;
+        private String shenPiYiJian;
+        private Integer shenPiZhuangTai;
+        private Integer shenQingLeiXing;
+        private Boolean shiFouZhuanJiao;
+        private String shiXiangGuid;
+        private String shiXiangName;
+        private String shiXiangType;
+        private String shouLiRen;
+        private Long shouLiTime;
+        private String shouLiTimeText;
+        private Integer shouLiZhuanTai;
+        private String tiJiaoRenGuid;
+        private String tiJiaoRenName;
+        private Long tiJiaoTime;
+        private String tiJiaoTimeText;
+        private String tuiKuYuanYin;
+        private String workFlowBusinessId;
+        private String workFlowBusinessIdNew;
+        private String xiaJiShenHeRenGuid;
+        private String xiaJiShenHeRenName;
+        private String xiangMuGuid;
+        private String zhuanJiaGuid;
+        private String zhuanJiaShiXiangGuid;
+    }
+
+    @Data
+    @Builder
+    public static class ZhuangTaiXiuGaiJiLuSq {
+
+        private String jiluSqGuid;
+        private String zhuanJiaGuid;
+        private Short xiuGaiQianZhuangTai;
+        private Short xiuGaiHouZhuangTai;
+        private String xiuGaiLeiXing;
+        private String xiuGaiYuanYin;
+        private Long createTime;
+        private String creatorName;
+        private String creatorGuid;
+        private Long startTime;
+        private Long endTime;
+        private Boolean isChanged;
+        private String fuJianGuid;
+        private Boolean isRenew;
+        private Short zhuanJiaQinRenQi;
+        /** 解聘原因，10:专家主动退库,20:到期清退,30:到龄清退,40:管理员清退 */
+        private Short jiePinYuanYinType;
+        /** 续期原因类型,0:其他;1:聘任到期; */
+        private Short renewYuanyinType;
+        private String renewJutiYuanyin;
+    }
+
+
+}

src/main/java/com/cnooc/expert/controller/expert/model/response/NofilterListResp.java → src/main/java/com/cnooc/expert/controller/expert/model/response/NofilterListItemResp.java

@@ -3,21 +3,11 @@ package com.cnooc.expert.controller.expert.model.response;
 import lombok.Builder;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 @Builder
-public class NofilterListResp {
-
-    private List<Item> data;
-
-    @Data
-    @Builder
-    public static class Item {
-
-        private String id;
+public class NofilterListItemResp {
 
-        private String text;
-    }
+    private String id;
 
+    private String text;
 }

src/main/java/com/cnooc/expert/controller/expert/model/response/SecondaryUnitListResp.java → src/main/java/com/cnooc/expert/controller/expert/model/response/SecondaryUnitListItemResp.java

@@ -3,21 +3,12 @@ package com.cnooc.expert.controller.expert.model.response;
 import lombok.Builder;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 @Builder
-public class SecondaryUnitListResp {
-
-    private List<Item> data;
-
-    @Data
-    @Builder
-    public static class Item {
+public class SecondaryUnitListItemResp {
 
-        private String code;
+    private String code;
 
-        private String name;
-    }
+    private String name;
 
 }

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

@@ -4,10 +4,9 @@ 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.response.CompanyPageResp;
-import com.cnooc.expert.controller.expert.model.response.DictListResp;
-import com.cnooc.expert.controller.expert.model.response.NofilterListResp;
-import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListResp;
-import com.cnooc.expert.controller.portal.model.response.MessagePageResp;
+import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
+import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
+import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetResp;
 import com.cnooc.expert.external.expert.service.ExpertServiceClient;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -32,107 +31,87 @@ public class ExpertService {
         return objectMapper.writeValueAsString(result);
     }
 
-    public NofilterListResp listDictNofilter(DictNofilterListReq req) {
+    public List<NofilterListItemResp> listDictNofilter(DictNofilterListReq req) {
 
-        ArrayList<NofilterListResp.Item> data = Lists.newArrayList(
-                NofilterListResp.Item.builder()
+        ArrayList<NofilterListItemResp> result = Lists.newArrayList(
+                NofilterListItemResp.builder()
                         .id("1")
                         .text("汉族")
                         .build(),
-                NofilterListResp.Item.builder()
+                NofilterListItemResp.builder()
                         .id("2")
                         .text("蒙古族")
                         .build()
         );
 
-        NofilterListResp result = NofilterListResp.builder()
-                .data(data)
-                .build();
-
         return result;
     }
 
-    public SecondaryUnitListResp listSecondaryUnit() {
+    public List<SecondaryUnitListItemResp> listSecondaryUnit() {
 
-        ArrayList<SecondaryUnitListResp.Item> data = Lists.newArrayList(
-                SecondaryUnitListResp.Item.builder()
+        ArrayList<SecondaryUnitListItemResp> result = Lists.newArrayList(
+                SecondaryUnitListItemResp.builder()
                         .code("1")
                         .name("中海油研究总院有限责任公司")
                         .build(),
-                SecondaryUnitListResp.Item.builder()
+                SecondaryUnitListItemResp.builder()
                         .code("2")
                         .name("中海石油化工进出口有限公司")
                         .build()
         );
 
-        SecondaryUnitListResp result = SecondaryUnitListResp.builder()
-                .data(data)
-                .build();
-
         return result;
     }
 
-    public DictListResp listDict4() {
+    public List<DictListItemResp> listDict4() {
 
-        ArrayList<DictListResp.Item> data = Lists.newArrayList(
-                DictListResp.Item.builder()
+        ArrayList<DictListItemResp> result = Lists.newArrayList(
+                DictListItemResp.builder()
                         .key("1")
                         .value("一级建造师（通信与广电工程）")
                         .build(),
-                DictListResp.Item.builder()
+                DictListItemResp.builder()
                         .key("2")
                         .value("二级建造师（通信与广电工程）")
                         .build()
         );
 
-        DictListResp result = DictListResp.builder()
-                .data(data)
-                .build();
-
         return result;
     }
 
-    public DictListResp listDict5() {
+    public List<DictListItemResp> listDict5() {
 
-        ArrayList<DictListResp.Item> data = Lists.newArrayList(
-                DictListResp.Item.builder()
+        ArrayList<DictListItemResp> result = Lists.newArrayList(
+                DictListItemResp.builder()
                         .dictGuid("625ade01-00f0-4a1f-93d8-66d6b4c5a2b3")
                         .key("")
                         .value("博士研究生")
                         .build(),
-                DictListResp.Item.builder()
+                DictListItemResp.builder()
                         .dictGuid("708932cc-794c-4d1a-b30e-a16afd364495")
                         .key("")
                         .value("硕士研究生")
                         .build()
         );
 
-        DictListResp result = DictListResp.builder()
-                .data(data)
-                .build();
-
         return result;
     }
 
-    public DictListResp listDict6() {
+    public List<DictListItemResp> listDict6() {
 
-        ArrayList<DictListResp.Item> data = Lists.newArrayList(
-                DictListResp.Item.builder()
+        ArrayList<DictListItemResp> result = Lists.newArrayList(
+                DictListItemResp.builder()
                         .dictGuid("28a0942a-84ad-4329-8be4-8196ed3164fe")
                         .key("")
                         .value("学士")
                         .build(),
-                DictListResp.Item.builder()
+                DictListItemResp.builder()
                         .dictGuid("5676942a-84ad-4329-8be4-8196ed3164fe")
                         .key("")
                         .value("其他")
                         .build()
         );
 
-        DictListResp result = DictListResp.builder()
-                .data(data)
-                .build();
-
         return result;
     }
 
@@ -167,4 +146,10 @@ public class ExpertService {
                 .data(data)
                 .build();
     }
+
+    public Object getExpertInfo(CompanyPageReq req) {
+
+
+        return null;
+    }
 }