feat: add 违规

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

@@ -63,7 +63,7 @@ public class ExpertController extends AbstractBaseController {
     }
 
     /**
-     * 执业资格列表
+     * 执业资格
      *
      * @return
      */

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

 package com.cnooc.expert.external.expert.api;
 
+import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
 import com.cnooc.expert.external.expert.model.request.CityTreeApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonJiTuanErJiDanWeiListApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiReq;
 import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
+import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
+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.response.CityTreeApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonJiTuanErJiDanWeiListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
+import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
+import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
+import com.cnooc.expert.external.expert.model.response.XiangMuInfoByChouQuNumGetApiResp;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.HeaderMap;
@@ -43,4 +50,17 @@ public interface ExpertServiceApi {
     @POST("/api/mini/zjcq/ChouQuShenQing/queryCityTreeContainPartArea")
     Call<ApiBaseResult<List<CityTreeApiResp>>> cityTree(@HeaderMap Map<String, Object> headers, @Body CityTreeApiReq req);
 
+    @POST("/api/mini/zjcq/quailfication/queryInfoByChouQuNum")
+    Call<ApiBaseResult<XiangMuInfoByChouQuNumGetApiResp>> xiangMuInfoByChouQuNumGetApi(@HeaderMap Map<String, Object> headers, @Body XiangMuInfoByChouQuNumGetApiReq req);
+
+    /* 冻结、违规 */
+
+    // 冻结
+    @POST("/api/mini/zjgl/zhuanJiaPingBiaoZhuanYe/queryDongJieZhuanYeList")
+    Call<ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>>> pageDongJieZhuanYeApi(@HeaderMap Map<String, Object> headers, @Body DongJieZhuanYePageApiReq req);
+
+    // 违规
+    @POST("/api/mini/zjgl/zjwg/pageViolationExpert")
+    Call<ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>>> pageViolationExpertApi(@HeaderMap Map<String, Object> headers, @Body ViolationExpertPageApiReq req);
+
 }

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

@@ -9,5 +9,5 @@ public class CommonJiTuanErJiDanWeiListApiReq {
 
     private String danWeiName;
 
-    private Integer tenantId;
+    private Long tenantId;
 }

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

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

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

+package com.cnooc.expert.external.expert.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ViolationExpertPageApiReq {
+}

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

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

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class DongJieZhuanYePageApiResp {
+
+    private String jiTuanErJiDanWeiName;
+
+    private String adAccount;
+
+    private String shenFenZheng;
+
+    private String zhuanYeName;
+
+    private String zhuanYeBH;
+
+    private String dongJieFuJianGuid;
+
+    private String jieDongFuJianGuid;
+
+    private String dongJieReason;
+
+    private String gongZuoDanWei;
+
+    private String zhuanJiaGuid;
+
+    private String pingBiaoZhuanYeGuid;
+
+    private Boolean isPrimary;
+    
+    private String zhuanJiaCode;
+
+    private String zhuanYeStatus;
+
+    private String jieDongReason;
+
+    private String zhuanJiaName;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class ViolationExpertPageApiResp {
+
+     private String bidSectionCode;
+
+     private String bidSectionName;
+
+     private String businessId;
+
+     private String chouquRenwuGuid;
+
+     private String chuliEndTime;
+
+     private String chuliPeriod;
+
+     private Long chuliStartTime;
+
+     private String fujianGuid;
+
+     private String shenFenZheng;
+
+     private Integer shenheStatus;
+
+     private String shenheStatusName;
+
+     private Long submitTime;
+
+     private String submitTimeStr;
+
+     private String submiter;
+
+     private Integer weiguiChuliShichang;
+
+     private String weiguiChuliShichangStr;
+
+     private String weiguiReason;
+
+     private String weiguiReasonNamel;
+
+     private String weiguiXiangxiMiaoshu;
+
+     private String zhuanJiaAdAccount;
+
+     private String zhuanJiaCode;
+
+     private String zhuanJiaZhuangTaiName;
+
+     private String zhuanjiaGuid;
+
+     private String zhuanjiaName;
+
+     private String zhuanjiaWeiguiGuid;
+
+}

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

+package com.cnooc.expert.external.expert.model.response;
+
+import lombok.Data;
+
+@Data
+public class XiangMuInfoByChouQuNumGetApiResp {
+
+    private String chouQuQingKuangGuid;
+
+    private String xiangMuNo;
+
+    private String xiangMuName;
+
+    private String chouQuRenWuGuid;
+
+    private Long pingBiaoStartTime;
+
+    private String zhuanJiaName;
+
+    private String pingBiaoAddress;
+
+    private Integer status;
+
+}

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

 package com.cnooc.expert.external.expert.service;
 
 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.CityTreeApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonJiTuanErJiDanWeiListApiReq;
 import com.cnooc.expert.external.expert.model.request.CommonNofilterEnumGetApiReq;
 import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
+import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetApiReq;
+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.response.CityTreeApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonJiTuanErJiDanWeiListApiResp;
 import com.cnooc.expert.external.expert.model.response.CommonNofilterEnumGetApiResp;
 import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
+import com.cnooc.expert.external.expert.model.response.DongJieZhuanYePageApiResp;
 import com.cnooc.expert.external.expert.model.response.ExpertInfoGetApiResp;
+import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
+import com.cnooc.expert.external.expert.model.response.XiangMuInfoByChouQuNumGetApiResp;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import retrofit2.Call;
@@ -65,4 +72,23 @@ public class ExpertServiceClient extends AbstractRetrofitManager {
         Call<ApiBaseResult<List<CityTreeApiResp>>> call = expertServiceApi.cityTree(headers, req);
         return this.getResponseBody(call, "treeCity");
     }
+
+    public ApiBaseResult<XiangMuInfoByChouQuNumGetApiResp> getXiangMuInfoByChouQuNum(XiangMuInfoByChouQuNumGetApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<XiangMuInfoByChouQuNumGetApiResp>> call = expertServiceApi.xiangMuInfoByChouQuNumGetApi(headers, req);
+        return this.getResponseBody(call, "getXiangMuInfoByChouQuNum");
+    }
+
+    public ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>> pageDongJieZhuanYeApi(DongJieZhuanYePageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>>> call = expertServiceApi.pageDongJieZhuanYeApi(headers, req);
+        return this.getResponseBody(call, "pageDongJieZhuanYeApi");
+    }
+
+    public ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>> pageViolationExpert(ViolationExpertPageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>>> call = expertServiceApi.pageViolationExpertApi(headers, req);
+        return this.getResponseBody(call, "pageViolationExpert");
+    }
+
 }

src/main/java/com/cnooc/expert/external/subject/api/SubjectServiceApi.java

 package com.cnooc.expert.external.subject.api;
 
+import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
+import com.cnooc.expert.external.common.model.response.ApiBaseResult;
+import com.cnooc.expert.external.subject.model.request.PlatformCompanyPageApiReq;
+import com.cnooc.expert.external.subject.model.response.PlatformCompanyPageApiResp;
+import retrofit2.Call;
+import retrofit2.http.Body;
+import retrofit2.http.HeaderMap;
+import retrofit2.http.POST;
+
+import java.util.Map;
+
 public interface SubjectServiceApi {
+
+    @POST("/api/mini/noauth/expert/pagePlatformCorpInfoByPlatformId")
+    Call<ApiBaseResult<ApiBasePageResp<PlatformCompanyPageApiResp>>> pagePlatformCompanyApi(@HeaderMap Map<String, Object> headers, @Body PlatformCompanyPageApiReq req);
+
 }

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

+package com.cnooc.expert.external.subject.model.request;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class PlatformCompanyPageApiReq {
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private Integer businessType;
+
+    private Boolean validStatus;
+
+    private Integer tenantId;
+
+}

src/main/java/com/cnooc/expert/external/subject/model/response/PlatformCompanyPageApiResp.java

+package com.cnooc.expert.external.subject.model.response;
+
+import lombok.Data;
+
+@Data
+public class PlatformCompanyPageApiResp {
+
+    private String id;
+
+    private String subjectId;
+
+    private String subjectName;
+
+    private Integer businessType;
+
+    private String creditCode;
+
+    private String contactPerson;
+
+    private String contactPhone;
+
+    private String contactEmail;
+
+}

src/main/java/com/cnooc/expert/external/subject/service/SubjectServiceClient.java

 package com.cnooc.expert.external.subject.service;
 
 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.portal.model.request.AgentNumGetApiReq;
+import com.cnooc.expert.external.portal.model.response.AgentNumGetApiResp;
 import com.cnooc.expert.external.subject.api.SubjectServiceApi;
+import com.cnooc.expert.external.subject.model.request.PlatformCompanyPageApiReq;
+import com.cnooc.expert.external.subject.model.response.PlatformCompanyPageApiResp;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
+import retrofit2.Call;
 import retrofit2.Retrofit;
 
+import java.util.Map;
+
 @Service
 public class SubjectServiceClient extends AbstractRetrofitManager {
 
@@ -15,4 +24,10 @@ public class SubjectServiceClient extends AbstractRetrofitManager {
         this.subjectServiceApi = retrofit.create(SubjectServiceApi.class);
     }
 
+    public ApiBaseResult<ApiBasePageResp<PlatformCompanyPageApiResp>> pagePlatformCompanyApi(PlatformCompanyPageApiReq req) {
+        Map<String, Object> headers = super.getHeaders();
+        Call<ApiBaseResult<ApiBasePageResp<PlatformCompanyPageApiResp>>> call = subjectServiceApi.pagePlatformCompanyApi(headers, req);
+        return super.getResponseBody(call, "pagePlatformCompanyApi");
+    }
+
 }

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

+package com.cnooc.expert.service;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class CurExpertUserInfo {
+
+    private Long userId;
+
+    private String userName;
+
+    private String zhuanJiaGuid;
+
+    private String zhuanJiaName;
+
+    private String zhuanJiaCode;
+
+    private Long subjectId;
+
+    private String subjectName;
+
+}

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.common.utils.UserUtils;
 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;
@@ -49,14 +48,13 @@ import com.cnooc.expert.controller.expert.model.response.SecondaryUnitListItemRe
 import com.cnooc.expert.controller.expert.model.response.WeiGuiGetResp;
 import com.cnooc.expert.controller.expert.model.response.WeiGuiPageResp;
 import com.cnooc.expert.controller.expert.model.response.ZhuanJiaShenQingJiLuPageResp;
+import com.cnooc.expert.external.common.model.response.ApiBasePageResp;
 import com.cnooc.expert.external.common.model.response.ApiBaseResult;
-import com.cnooc.expert.external.expert.model.request.CityTreeApiReq;
-import com.cnooc.expert.external.expert.model.request.DictByParentListApiReq;
+import com.cnooc.expert.external.expert.model.request.DongJieZhuanYePageApiReq;
 import com.cnooc.expert.external.expert.model.request.ExpertInfoGetReq;
-import com.cnooc.expert.external.expert.model.response.CityTreeApiResp;
-import com.cnooc.expert.external.expert.model.response.DictByParentListApiResp;
+import com.cnooc.expert.external.expert.model.request.ViolationExpertPageApiReq;
+import com.cnooc.expert.external.expert.model.response.ViolationExpertPageApiResp;
 import com.cnooc.expert.external.expert.service.ExpertServiceClient;
-import com.cnooc.expert.system.entity.pojo.ZhuanJiaUser;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
@@ -834,6 +832,11 @@ public class ExpertService {
     }
 
     public PingBiaoXiangMuInfoGetByChouQuMaResp getPingBiaoXiangMuInfoByChouQuMa(PingBiaoXiangMuInfoGetByChouQuMaReq req) {
+//        XiangMuInfoByChouQuNumGetApiReq apiReq = XiangMuInfoByChouQuNumGetApiReq.builder()
+//                .chouQuNum(req.getChouQuNum())
+//                .build();
+//        ApiBaseResult<XiangMuInfoByChouQuNumGetApiResp> apiResp = expertServiceClient.getXiangMuInfoByChouQuNum(apiReq);
+//        return apiResp;
 
         PingBiaoXiangMuInfoGetByChouQuMaResp result = PingBiaoXiangMuInfoGetByChouQuMaResp.builder()
                 .chouQuQingKuangGuid("5e2f90be-b8ad-4a8e-931d-cdaae5f1c118")
@@ -1424,6 +1427,14 @@ public class ExpertService {
     }
 
     public BasePageResp<DongJiePageResp> pageDongJie(DongJiePageReq req) {
+//        DongJieZhuanYePageApiReq apiReq = DongJieZhuanYePageApiReq.builder()
+//                .page(req.getPageNo())
+//                .rows(req.getPageSize())
+//                .zhuanJiaGuid(UserInfoUtils.getExpertInfo().getZhuanJiaGuid())
+//                .build();
+//        ApiBaseResult<ApiBasePageResp<DongJieZhuanYePageApiResp>> apiResp = expertServiceClient.pageDongJieZhuanYeApi(apiReq);
+//        return apiResp;
+
         List<DongJiePageResp> list = Lists.newArrayList(
                 DongJiePageResp.builder()
                         .jiTuanErJiDanWeiName("中化建国际招标有限责任公司")
@@ -1457,6 +1468,12 @@ public class ExpertService {
 
 
     public BasePageResp<WeiGuiPageResp> pageWeiGuiList(WeiGuiJiLuPageReq req) {
+
+//        ViolationExpertPageApiReq  apiReq = ViolationExpertPageApiReq.builder()
+//                .build();
+//        ApiBaseResult<ApiBasePageResp<ViolationExpertPageApiResp>> apiResp = expertServiceClient.pageViolationExpert(apiReq);
+//        return apiResp;
+
         List<WeiGuiPageResp> list = Lists.newArrayList(
                 WeiGuiPageResp.builder()
                         .bidSectionCode("24-CNCCC-GC-GK-5142/01")

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

+package com.cnooc.expert.service;
+
+public class UserInfoUtils {
+
+    public static final Long TENANT_ID = 1439982443434848257L;
+
+    public static CurExpertUserInfo getExpertInfo(){
+        return CurExpertUserInfo.builder()
+                .userId(1438567485735698432L)
+                .userName("ex_zhanglh15")
+                .zhuanJiaGuid("ed78e562-27a2-43ea-8ccd-704fc12ae0ae")
+                .zhuanJiaName("张立辉")
+                .zhuanJiaCode("000100")
+                .subjectId(1171522650451877889L)
+                .subjectName("中化建国际招标有限责任公司")
+                .build();
+    }
+
+}