请假、休假

src/main/java/com/cnooc/expert/common/interceptor/LoginInterceptor.java

@@ -29,49 +29,49 @@ import java.util.Map;
 @Component
 public class LoginInterceptor implements HandlerInterceptor {
 
-    @Resource(name="redisCommonTemplate")
-    private RedisTemplate<String, Object> redisTemplate;
-
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String token = request.getHeader("Authorization");
-        log.info("request uri :"+request.getRequestURI());
-        if (token == null || token.trim().isEmpty()) {
-            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-            throw new BusinessException(HttpServletResponse.SC_UNAUTHORIZED, GlobalErrorCodeConstants.LOGIN_EXPIRED.getMsg());
-        }
-        try {
-            Map<String, String> userMap = JwtUtils.getTokenInfo(token);
-            String userId = userMap.get(TokenConstants.USER_ID);
-            String uuidKey = userMap.get(TokenConstants.UUID_KEY);
-            ValidUtils.isNotNull(uuidKey, "登录异常，请重新登录");
-
-            ZhuanJiaUser zhuanjiaUser = (ZhuanJiaUser)redisTemplate.opsForValue().get(TokenConstants.LOGIN_USER_KEY_ + userId);
-            if (zhuanjiaUser==null ){
-                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-                response.getWriter().write("{\"httpCode\":401,\"message\":\"请先登录\"}");
-                return false;
-            }
-            UserUtils.setUserId(zhuanjiaUser);
-            // 所有条件都满足，放行请求
-            return true;
-
-        } catch (Exception e) {
-            log.info("token解析异常 {}",e.getMessage(),e);
-            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-            UserUtils.clear();
-            throw new BusinessException(401, "请先登录");
-        }
-    }
-
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-        UserUtils.clear();
-    }
+//    @Resource(name="redisCommonTemplate")
+//    private RedisTemplate<String, Object> redisTemplate;
+//
+//
+//    @Override
+//    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+//        String token = request.getHeader("Authorization");
+//        log.info("request uri :"+request.getRequestURI());
+//        if (token == null || token.trim().isEmpty()) {
+//            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//            throw new BusinessException(HttpServletResponse.SC_UNAUTHORIZED, GlobalErrorCodeConstants.LOGIN_EXPIRED.getMsg());
+//        }
+//        try {
+//            Map<String, String> userMap = JwtUtils.getTokenInfo(token);
+//            String userId = userMap.get(TokenConstants.USER_ID);
+//            String uuidKey = userMap.get(TokenConstants.UUID_KEY);
+//            ValidUtils.isNotNull(uuidKey, "登录异常，请重新登录");
+//
+//            ZhuanJiaUser zhuanjiaUser = (ZhuanJiaUser)redisTemplate.opsForValue().get(TokenConstants.LOGIN_USER_KEY_ + userId);
+//            if (zhuanjiaUser==null ){
+//                response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//                response.getWriter().write("{\"httpCode\":401,\"message\":\"请先登录\"}");
+//                return false;
+//            }
+//            UserUtils.setUserId(zhuanjiaUser);
+//            // 所有条件都满足，放行请求
+//            return true;
+//
+//        } catch (Exception e) {
+//            log.info("token解析异常 {}",e.getMessage(),e);
+//            response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
+//            UserUtils.clear();
+//            throw new BusinessException(401, "请先登录");
+//        }
+//    }
+//
+//    @Override
+//    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+//
+//    }
+//
+//    @Override
+//    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+//        UserUtils.clear();
+//    }
 }

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

@@ -4,16 +4,21 @@ 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.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
+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.response.DictListItemResp;
 import com.cnooc.expert.controller.expert.model.response.ExpertInfoGetResp;
-import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaPageResp;
+import com.cnooc.expert.controller.expert.model.response.GeRenXiuJiaApplyResp;
 import com.cnooc.expert.controller.expert.model.response.NofilterListItemResp;
+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.PingBiaoZhuanYeTreeNodeResp;
+import com.cnooc.expert.controller.expert.model.response.QingJiaJinJiApplyResp;
 import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemResp;
 import com.cnooc.expert.service.ExpertService;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -63,7 +68,17 @@ public class ExpertController {
     }
 
     /**
-     * 职称列表
+     * 执业资格列表
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid3/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud3List() {
+        return ApiResult.successWithResult(expertService.listDict3());
+    }
+
+    /**
+     * 执业资格列表
      *
      * @return
      */
@@ -94,6 +109,26 @@ public class ExpertController {
     }
 
     /**
+     * 语种
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid11/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud11List() {
+        return ApiResult.successWithResult(expertService.listDict11());
+    }
+
+    /**
+     * 熟练程度
+     *
+     * @return
+     */
+    @PostMapping("/dict/guid12/list")
+    public ApiResult<List<DictListItemResp>> dictGuiud12List() {
+        return ApiResult.successWithResult(expertService.listDict12());
+    }
+
+    /**
      * 评标专业
      *
      * @return
@@ -140,16 +175,39 @@ public class ExpertController {
     }
 
     // *** 请假/休假 ***
-    // 紧急请假
+
+    // 紧急请假分页列表
     @PostMapping("/qing-jia/page")
     public ApiResult<BasePageResp<Object>> qingJiaJinJiPage(@RequestBody @Validated QingJiaJinJiPageReq req) {
         return ApiResult.successWithResult(expertService.pageJinJiQingJia(req));
     }
 
-    // 个人休假
+    // 紧急请假申请
+    @PostMapping("/qing-jia/apply")
+    public ApiResult<QingJiaJinJiApplyResp> qingJiaJinJiApply(@RequestBody @Validated QingJiaJinJiApplyReq req) {
+        return ApiResult.successWithResult(expertService.applyJinJiQingJia(req));
+    }
+
+
+    // 个人休假分页列表
     @PostMapping("/xiu-jia/page")
     public ApiResult<BasePageResp<Object>> geRenXiuJiaPage(@RequestBody @Validated GeRenXiuJiaPageReq req) {
         return ApiResult.successWithResult(expertService.pageGeRenXiuJia(req));
     }
 
+    // 个人休假申请
+    @PostMapping("/xiu-jia/apply")
+    public ApiResult<GeRenXiuJiaApplyResp> geRenXiuJiaApply(@RequestBody @Validated GeRenXiuJiaApplyReq req) {
+        return ApiResult.successWithResult(expertService.applyGeRenXiuJia(req));
+    }
+
+    // *** 评标项目 ***
+
+    // 专家的评标项目分页列表
+    @PostMapping("/ping-biao-xiang-mu/by-owner/page")
+    public ApiResult<BasePageResp<Object>> pingBiaoXiangMuByOwnerPage(@RequestBody @Validated PingBiaoXiangMuByOwnerPageReq req) {
+        return ApiResult.successWithResult(expertService.pagePingBiaoXiangmuByOwner(req));
+    }
+
+
 }

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

+package com.cnooc.expert.controller.expert.model.request;
+
+import lombok.Data;
+
+@Data
+public class GeRenXiuJiaApplyReq {
+
+    private String zhuanJiaGuid;
+
+    private Long startTime;
+
+    private Long endTime;
+
+    private String qingJiaYuanYin;
+
+    private int qingJiaDays;
+}

src/main/java/com/cnooc/expert/controller/expert/model/request/PingBiaoXiangMuByOwnerPageReq.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 PingBiaoXiangMuByOwnerPageReq extends BasePageRequest {
+
+    private String zhuanJiaGuid;
+
+}

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

+package com.cnooc.expert.controller.expert.model.request;
+
+import lombok.Data;
+
+@Data
+public class QingJiaJinJiApplyReq {
+
+    private String chouQuQingKuangGuid;
+
+    private String chouQuRenWuGuid;
+
+    private String jinJiQingJiaReason;
+
+    private String qingJiaTime;
+
+}

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

@@ -9,6 +9,8 @@ public class DictListItemResp {
 
     private String dictGuid;
 
+    private String typeName;
+
     private String key;
 
     private String value;

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

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class GeRenXiuJiaApplyResp {
+
+    	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 Integer qingJiaDays;
+
+        private Long qingJiaEndTime;
+
+        private String qingJiaGuid;
+
+        private Long qingJiaStartTime;
+
+        private String qingJiaYuanYin;
+
+        private String remark;
+
+        private String shenFenZheng;
+
+        private Long shenPiTime;
+
+        private String shenPiTimeText;
+
+        private String shenPiYiJian;
+
+        private String shenPiZhuangTai;
+
+        private Long startTime;
+
+        private String startTimeText;
+
+        private Long tiJiaoTime;
+
+        private String tiJiaoTimeText;
+
+        private Long xiaoJiaTime;
+
+        private String xiaoJiaTimeText;
+
+        private String zhuanJiaCode;
+
+        private String zhuanJiaGuid;
+
+        private String zhuanJiaName;
+
+}

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

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class PingBiaoXiangMuByOwnerPageResp {
+
+    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
+    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
+    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/controller/expert/model/response/PingBiaoXiangMuPageResp.java

@@ -17,6 +17,14 @@ public class PingBiaoXiangMuPageResp {
 
     private String chouQuZhuanTai; // 抽取的状态
 
+    private Long createTime;
+
+    private String createTimeText;
+
+    private String creatorGuid;
+
+    private String creatorName;
+
     private String fanKuiYiJian; // 反馈意见
 
     private Boolean isCQDHuanZhuanYe; // 是否抽取换专业

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

+package com.cnooc.expert.controller.expert.model.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class QingJiaJinJiApplyResp {
+
+    private String chouQuQingKuangGuid;
+
+    private String chouQuRenWuGuid;
+
+    private Long createTime;
+
+    private String createTimeText;
+
+    private String creatorGuid;
+
+    private String creatorName;
+
+    private String jinJiQingJiaGuid;
+
+    private String jinJiQingJiaReason;
+
+    private String qingJiaSource;
+
+    private Long qingJiaTime;
+
+    private String qingJiaTimeNode;
+
+    private String qingJiaTimeText;
+
+    private Integer shenHeStatus;
+
+}

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

@@ -3,18 +3,24 @@ 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.GeRenXiuJiaApplyReq;
 import com.cnooc.expert.controller.expert.model.request.GeRenXiuJiaPageReq;
+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.response.CompanyPageResp;
 import com.cnooc.expert.controller.expert.model.response.DictListItemResp;
 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.NofilterListItemResp;
+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.external.expert.model.request.ExpertInfoGetReq;
@@ -75,16 +81,40 @@ public class ExpertService {
         return result;
     }
 
+    public List<DictListItemResp> listDict3() {
+
+        ArrayList<DictListItemResp> result = Lists.newArrayList(
+                DictListItemResp.builder()
+                        .dictGuid("zhicheng-fuwu")
+                        .key("")
+                        .value("服务类")
+                        .typeName("职称")
+                        .build(),
+                DictListItemResp.builder()
+                        .dictGuid("zhicheng-shebei")
+                        .key("")
+                        .typeName("职称")
+                        .value("设备类")
+                        .build()
+        );
+
+        return result;
+    }
+
     public List<DictListItemResp> listDict4() {
 
         ArrayList<DictListItemResp> result = Lists.newArrayList(
                 DictListItemResp.builder()
-                        .key("1")
+                        .dictGuid("00fbea56-22b8-4f6c-842e-b1953f1bf079")
+                        .key("")
+                        .typeName("执业资格")
                         .value("一级建造师（通信与广电工程）")
                         .build(),
                 DictListItemResp.builder()
-                        .key("2")
-                        .value("二级建造师（通信与广电工程）")
+                        .dictGuid("zhiyezige50")
+                        .key("")
+                        .typeName("执业资格")
+                        .value("其他")
                         .build()
         );
 
@@ -97,11 +127,13 @@ public class ExpertService {
                 DictListItemResp.builder()
                         .dictGuid("625ade01-00f0-4a1f-93d8-66d6b4c5a2b3")
                         .key("")
+                        .typeName("学历")
                         .value("博士研究生")
                         .build(),
                 DictListItemResp.builder()
                         .dictGuid("708932cc-794c-4d1a-b30e-a16afd364495")
                         .key("")
+                        .typeName("学历")
                         .value("硕士研究生")
                         .build()
         );
@@ -115,11 +147,13 @@ public class ExpertService {
                 DictListItemResp.builder()
                         .dictGuid("28a0942a-84ad-4329-8be4-8196ed3164fe")
                         .key("")
+                        .typeName("学位")
                         .value("学士")
                         .build(),
                 DictListItemResp.builder()
                         .dictGuid("5676942a-84ad-4329-8be4-8196ed3164fe")
                         .key("")
+                        .typeName("学位")
                         .value("其他")
                         .build()
         );
@@ -127,6 +161,46 @@ public class ExpertService {
         return result;
     }
 
+    public List<DictListItemResp> listDict11() {
+
+        ArrayList<DictListItemResp> result = Lists.newArrayList(
+                DictListItemResp.builder()
+                        .dictGuid("152cc498-5c44-4fbd-85b9-e6d3653e231b")
+                        .key("")
+                        .typeName("语种")
+                        .value("葡萄牙语")
+                        .build(),
+                DictListItemResp.builder()
+                        .dictGuid("ce221ce6-3649-4d0c-bfc9-10acc9d0595e")
+                        .key("")
+                        .typeName("语种")
+                        .value("英语")
+                        .build()
+        );
+
+        return result;
+    }
+
+    public List<DictListItemResp> listDict12() {
+
+        ArrayList<DictListItemResp> result = Lists.newArrayList(
+                DictListItemResp.builder()
+                        .dictGuid("1798a3ab-dac0-4f71-967d-1f9242327e98")
+                        .key("")
+                        .typeName("熟练程度")
+                        .value("了解")
+                        .build(),
+                DictListItemResp.builder()
+                        .dictGuid("529ebc4e-b0ff-4fa2-82fa-abf57e6da61f")
+                        .key("")
+                        .typeName("熟练程度")
+                        .value("熟悉")
+                        .build()
+        );
+
+        return result;
+    }
+
     public BasePageResp<Object> pageCompany(CompanyPageReq req) {
         List<Object> data = Lists.newArrayList(
                 CompanyPageResp.builder()
@@ -821,6 +895,10 @@ public class ExpertService {
                 .chouQuRenName("")
                 .chouQuRenPhone("")
                 .chouQuZhuanTai(null)
+                .createTime(1758609082178L)
+                .createTimeText("2025-09-23 14:31:22")
+                .creatorGuid("")
+                .creatorName("")
                 .fanKuiYiJian("")
                 .isCQDHuanZhuanYe(false)
                 .isSubmit(null)
@@ -927,6 +1005,25 @@ 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<Object> pageGeRenXiuJia(GeRenXiuJiaPageReq req) {
         List<Object> data = Lists.newArrayList(
                 GeRenXiuJiaPageResp.builder()
@@ -972,4 +1069,238 @@ public class ExpertService {
                 .data(data)
                 .build();
     }
+
+    public GeRenXiuJiaApplyResp applyGeRenXiuJia(GeRenXiuJiaApplyReq req) {
+
+        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("")
+                .build();
+    }
+
+    public BasePageResp<Object> 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<Object> data = Lists.newArrayList(item);
+
+        return BasePageResp.builder()
+                .current(1)
+                .pages(1)
+                .total(1)
+                .data(data)
+                .build();
+    }
 }