Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

This commit is contained in:
zhangchenbiao
2024-04-11 19:19:45 +08:00
10 changed files with 198 additions and 2 deletions

View File

@@ -2,6 +2,7 @@ package com.cool.store.controller.webc;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.LineService;
import com.cool.store.vo.IntendProcessTotalVO;
import com.cool.store.vo.LineInfoVO;
import com.cool.store.vo.interview.AppointmentTimeVO;
import io.swagger.annotations.Api;
@@ -50,6 +51,15 @@ public class LineController {
}
@ApiOperation("线索流程进度")
@GetMapping("/getIntendProcess")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索id", required = true)
})
public ResponseResult<IntendProcessTotalVO> getIntendProcessTotal(@RequestParam("lineId")Long lineId) {
return ResponseResult.success(lineService.getIntendProcessTotal(lineId));
}

View File

@@ -2,6 +2,7 @@ package com.cool.store.controller.webc;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.OpenAreaService;
import com.cool.store.utils.poi.constant.Constants;
import com.cool.store.vo.OpenAreaTreeVO;
import com.cool.store.vo.OpenAreaVO;
import com.github.pagehelper.PageInfo;
@@ -57,7 +58,7 @@ public class MiniOpenAreaController {
@ApiOperation("重点开放城市列表)")
public ResponseResult<PageInfo<OpenAreaVO>> getOpenAreaList(@RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){
PageInfo<OpenAreaVO> openAreaVOPageInfo = openAreaService.queryKeyOpenAreaList(pageSize, pageNumber,null,null);
PageInfo<OpenAreaVO> openAreaVOPageInfo = openAreaService.queryKeyOpenAreaList(pageSize, pageNumber,null, Constants.ZERO_INTEGER);
return ResponseResult.success(openAreaVOPageInfo);
}