招商经理等

coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java

@@ -1,7 +1,10 @@
 package com.cool.store.controller;
 
 import com.cool.store.context.CurrentUserHolder;
+import com.cool.store.dto.calendar.UserCalendarsEventDTO;
 import com.cool.store.enums.LineStatusEnum;
+import com.cool.store.exception.ApiException;
+import com.cool.store.http.ISVHttpRequest;
 import com.cool.store.request.*;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.*;
@@ -36,7 +39,10 @@ public class DeskController {
     HyPartnerLineInfoService hyPartnerLineInfoService;
     @Resource
     HyPartnerBaseInfoService hyPartnerBaseInfoService;
-
+    @Resource
+    private ISVHttpRequest isvHttpRequest;
+    @Resource
+    EnterpriseUserService enterpriseUserService;
 
 
     @GetMapping(path = "/interviewSchedule")
@@ -48,6 +54,28 @@ public class DeskController {
     }
 
 
+    @GetMapping(path = "/getInvestmentManagerList")
+    @ApiOperation("招商经理")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "allocation-招商经理   transfer", required = false),
+            @ApiImplicitParam(name = "keyword", value = "keyword", required = false),
+    })
+    public  ResponseResult<List<EnterpriseUserSingleInfoVO>>  getInvestmentManagerList(String type,String keyword){
+        return ResponseResult.success(enterpriseUserService.getInvestmentManagerList(type,CurrentUserHolder.getUserId(),keyword));
+    }
+
+
+    @GetMapping(path = "/interviewSchedule")
+    @ApiOperation("飞书日程信息")
+    public ResponseResult<List<UserCalendarsEventDTO>> interviewSchedule(@RequestParam(value = "startTime",required = true) Long startTime,
+                                                                         @RequestParam(value = "endTime",required = true) Long endTime) throws ApiException {
+
+        String userId = CurrentUserHolder.getUserId();
+        return  ResponseResult.success(isvHttpRequest.getUserCalendarsEvents(userId,startTime,endTime));
+    }
+
+
+
     @GetMapping(path = "/queryStageCount")
     @ApiOperation("招商经理视角====各阶段待处理待跟进数量")
     @ApiImplicitParams({
@@ -118,8 +146,8 @@ public class DeskController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "lineId", value = "线索ID", required = false),
     })
-    public ResponseResult<PartnerIntentApplyInfoVO> getPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){
-        return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyInfo(lineId));
+    public ResponseResult<PartnerIntentInfoVO> getPartnerIntentInfo(@RequestParam(value = "lineId",required = false)Long lineId){
+        return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyDetail(lineId));
     }
 
 

coolstore-partner-webb/src/main/java/com/cool/store/controller/RegionController.java

@@ -2,11 +2,16 @@ package com.cool.store.controller;
 
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.RegionService;
+import com.cool.store.service.ZoneService;
 import com.cool.store.vo.region.RegionBaseInfoVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -28,6 +33,8 @@ public class RegionController {
 
     @Resource
     private RegionService regionService;
+    @Resource
+    ZoneService zoneService;
 
     @GetMapping("/getRegionList")
     public ResponseResult<List<RegionBaseInfoVO>> getRegionBaseInfoList(){
@@ -36,4 +43,13 @@ public class RegionController {
     }
 
 
+    @ApiOperation("查询所有被绑定战区的组织机构")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "intent-意向区域   development 开发区域", required = false)
+    })
+    @GetMapping("/queryAllBingZoneRegionList")
+    public ResponseResult<List<String>> queryAllBingZoneRegionList(@RequestParam(value = "type",required = false)String type){
+        return ResponseResult.success(zoneService.queryAllBingZoneRegionList(type));
+    }
+
 }

coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java

@@ -4,6 +4,7 @@ import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.request.IntentAreaSettingRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.ZoneService;
+import com.cool.store.vo.ZoneCheckVO;
 import com.cool.store.vo.ZoneVO;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiImplicitParam;
@@ -13,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * @Author suzhuhong
@@ -32,6 +34,12 @@ public class ZoneController {
         return ResponseResult.success(zoneService.addZone( CurrentUserHolder.getUserId(),intentAreaSettingRequest));
     }
 
+    @PostMapping(path = "/checkZone")
+    @ApiOperation("校验战区")
+    public ResponseResult<List<ZoneCheckVO>> checkZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){
+        return ResponseResult.success(zoneService.checkZone(intentAreaSettingRequest));
+    }
+
     @PostMapping(path = "/updateZone")
     @ApiOperation("编辑意向战区/开发战区")
     public ResponseResult<Boolean> updateZone(@RequestBody IntentAreaSettingRequest intentAreaSettingRequest){