From deace8ecd5577b8734a84efab104388b028e41eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 13 Jun 2023 15:43:27 +0800 Subject: [PATCH] =?UTF-8?q?B=E7=AB=AF=20=E9=83=A8=E5=88=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/LineStatusEnum.java | 33 ++++++++ .../cool/store/dao/HyPartnerLineInfoDAO.java | 17 ++++ .../store/mapper/HyPartnerLineInfoMapper.java | 27 +++++++ .../mapper/HyPartnerLineInfoMapper.xml | 47 +++++++++++ .../dto/partner/PartnerBlackListDTO.java | 31 +++++++ .../store/entity/HyPartnerLineInfoDO.java | 6 ++ .../com/cool/store/request/LineRequest.java | 2 +- .../java/com/cool/store/vo/BlackListVO.java | 19 +---- .../cool/store/vo/IntentAreaSettingVO.java | 2 +- .../main/java/com/cool/store/vo/OrgVO.java | 22 +++++ .../main/java/com/cool/store/vo/ZoneVO.java | 33 ++++++++ .../main/java/com/cool/store/vo/orgVO.java | 2 +- .../Service/HyPartnerLineInfoService.java | 27 +++++++ .../impl/HyPartnerLineInfoServiceImpl.java | 80 +++++++++++++++++++ .../cool/store/controller/DeskController.java | 33 ++++---- 15 files changed, 344 insertions(+), 37 deletions(-) create mode 100644 coolstore-partner-common/src/main/java/com/cool/store/enums/LineStatusEnum.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerBlackListDTO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/OrgVO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/LineStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/LineStatusEnum.java new file mode 100644 index 000000000..08fec64a1 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/LineStatusEnum.java @@ -0,0 +1,33 @@ +package com.cool.store.enums; + +/** + * @Author suzhuhong + * @Date 2023/6/13 11:45 + * @Version 1.0 + */ +public enum LineStatusEnum { + + PUBLIC_SEAS(0,"公海线索"), + PRIVATE_SEAS(1,"私海线索"), + COOPERATION(2,"合作"), + BLACKLIST(3,"黑名单"), + ; + + private Integer code; + + private String message; + + LineStatusEnum(Integer code, String message) { + this.code = code; + this.message = message; + } + + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java index f72326c2d..429e10245 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -1,5 +1,6 @@ package com.cool.store.dao; +import com.cool.store.dto.partner.PartnerBlackListDTO; import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO; import com.cool.store.dto.partner.StageCountDTO; @@ -54,6 +55,10 @@ public class HyPartnerLineInfoDAO { return hyPartnerLineInfoMapper.selectByPrimaryKeySelective(id); } + public int updateByPrimaryKeySelective(HyPartnerLineInfoDO hyPartnerLineInfoDO){ + return hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO); + } + public Integer getAdventLineCount( String userId, String currentDate){ if (StringUtils.isEmpty(userId)){ @@ -108,4 +113,16 @@ public class HyPartnerLineInfoDAO { } + public PageInfo getBlackList( String keyWord, String intentArea , Integer acceptAdjustType){ + return hyPartnerLineInfoMapper.getBlackList(keyWord,intentArea,acceptAdjustType); + } + + + public Boolean joinAndRemoveBlack( Long lineId, Integer status, String joinReason, String removeReason){ + if (lineId==null){ + return Boolean.FALSE; + } + return hyPartnerLineInfoMapper.joinAndRemoveBlack(lineId,status,joinReason,removeReason); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index 4c42bdae1..274c09095 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -1,5 +1,6 @@ package com.cool.store.mapper; +import com.cool.store.dto.partner.PartnerBlackListDTO; import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO; import com.cool.store.dto.partner.StageCountDTO; @@ -105,4 +106,30 @@ public interface HyPartnerLineInfoMapper { * @return */ List getLineListByLineIds(List lineIdList); + + /** + * 查询黑名单列表 + * @param keyWord + * @param intentArea + * @param acceptAdjustType + * @return + */ + PageInfo getBlackList(@Param("keyWord") String keyWord, + @Param("intentArea") String intentArea , + @Param("acceptAdjustType") Integer acceptAdjustType); + + + /** + * 加入/移除 黑名单 + * @param lineId + * @param status + * @param joinReason + * @param removeReason + * @return + */ + Boolean joinAndRemoveBlack(@Param("lineId") Long lineId, + @Param("status") Integer status, + @Param("joinReason") String joinReason, + @Param("removeReason") String removeReason); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 104c5a8ec..268b8dd2a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -233,6 +233,12 @@ close_user_id = #{record.closeUserId}, + + join_black_reason = #{record.joinBlackReason}, + + + remove_black_reason = #{record.removeBlackReason}, + where id = #{record.id} @@ -336,4 +342,45 @@ + + + + + update hy_partner_line_info + + + line_status = #{status}, + + + join_black_reason = #{joinCause}, + + + remove_black_reason = #{removeReason}, + + + where id = #{lineId} + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerBlackListDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerBlackListDTO.java new file mode 100644 index 000000000..26bfab167 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerBlackListDTO.java @@ -0,0 +1,31 @@ +package com.cool.store.dto.partner; + +import lombok.Data; + +import java.util.Date; + +/** + * @Author suzhuhong + * @Date 2023/6/13 10:26 + * @Version 1.0 + */ +@Data +public class PartnerBlackListDTO { + + private Long lineId; + + private String partnerId; + + private String mobile; + + private String partnerUserName; + + private Date createTime; + + private String closeUserId; + + private Date closeTime; + + private String joinBlackReason; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java index 268392b1e..a4069904e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerLineInfoDO.java @@ -71,4 +71,10 @@ public class HyPartnerLineInfoDO implements Serializable { @ApiModelProperty("结束跟进人员ID") private String closeUserId; + + @ApiModelProperty("加入黑名单原因") + private String joinBlackReason; + + @ApiModelProperty("移除黑名单原因") + private String removeBlackReason; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LineRequest.java index 5551f311c..06f75a1ce 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/LineRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LineRequest.java @@ -14,7 +14,7 @@ import java.util.Date; */ @Data @ApiModel -public class LineRequest { +public class LineRequest extends PageInfoRequest{ @ApiModelProperty("关键字") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java index acf68c1b3..6804f4e45 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/BlackListVO.java @@ -18,15 +18,6 @@ public class BlackListVO { @ApiModelProperty("线索ID") private Long id; - @ApiModelProperty("hy_partner_user_info.partner_id") - private String partnerId; - - @ApiModelProperty("流程阶段:1意向申请审核;2预约面试时间;3加盟资格面试;4分配选址开发经理;5商圈点位评估;6上传店铺租赁信息;7完善加盟签约信息;8支付加盟费用;9签订加盟合同") - private String workflowStage; - - @ApiModelProperty("流程子状态") - private String workflowStatus; - @ApiModelProperty("加盟商用户ID") private String partnerUserId; @@ -54,14 +45,8 @@ public class BlackListVO { @ApiModelProperty("结束人员手机号") private String closeUserPhone; - @ApiModelProperty("结束人员手机号归属地") - private String closeUserPhoneAddress; - - - - - - + @ApiModelProperty("加入黑名单原因") + private String joinBlackReason; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java index 7d0dccc36..f1a61e6ca 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/IntentAreaSettingVO.java @@ -19,7 +19,7 @@ public class IntentAreaSettingVO { private String zoneName; - private List orgVOS; + private List orgVOS; private Date updateTime; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OrgVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OrgVO.java new file mode 100644 index 000000000..d6f96d492 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OrgVO.java @@ -0,0 +1,22 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/5/31 14:48 + * @Version 1.0 + */ +@Data +@ApiModel +public class orgVO { + + @ApiModelProperty("id") + private Long id; + @ApiModelProperty("组织机构名称") + private String name; + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java new file mode 100644 index 000000000..1196ccf10 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java @@ -0,0 +1,33 @@ +package com.cool.store.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/6/13 15:27 + * @Version 1.0 + */ +@Data +public class ZoneVO { + + private Long id; + + private String zoneName; + + private String updateTime; + + private String updateUserId; + + private String updateUserName; + + private List orgVos; + + private List openAreaVOS; + + + + + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/orgVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/orgVO.java index d6f96d492..af2f391d6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/orgVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/orgVO.java @@ -11,7 +11,7 @@ import lombok.Data; */ @Data @ApiModel -public class orgVO { +public class OrgVO { @ApiModelProperty("id") private Long id; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerLineInfoService.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerLineInfoService.java index c3ffcb52b..80f288396 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerLineInfoService.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/HyPartnerLineInfoService.java @@ -1,5 +1,7 @@ package com.cool.store.Service; +import com.cool.store.request.LineRequest; +import com.cool.store.vo.BlackListVO; import com.cool.store.vo.PartnerLineInfoAndBaseInfoVO; import com.cool.store.vo.PartnerLineInfoVO; import com.cool.store.vo.StageCountVO; @@ -63,5 +65,30 @@ public interface HyPartnerLineInfoService { Boolean allocationInvestmentManager(String userId, List lineIdList); + /** + * 黑名单列表 + * @param LineRequest LineRequest + * @return + */ + PageInfo getBlackList(LineRequest LineRequest); + + /** + * 加入或者移除 黑名单 + * @param lineId + * @param status + * @param joinReason + * @return + */ + Boolean joinBlackList( Long lineId, Integer status, String joinReason); + + /** + * 移除黑名单 + * @param lineId + * @param status + * @param removeReason + * @return + */ + Boolean removeBlackList( Long lineId, Integer status, String removeReason); + } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerLineInfoServiceImpl.java index 67580e4f4..ada49db6d 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/Service/impl/HyPartnerLineInfoServiceImpl.java @@ -4,16 +4,20 @@ import cn.hutool.core.date.DateUtil; import com.cool.store.Service.HyPartnerLineInfoService; import com.cool.store.dao.HyPartnerLineInfoDAO; import com.cool.store.dao.HyPartnerUserInfoDAO; +import com.cool.store.dto.partner.PartnerBlackListDTO; import com.cool.store.dto.partner.PartnerLineInfoAndBaseInfoDTO; import com.cool.store.dto.partner.StageCountDTO; import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.LineStatusEnum; import com.cool.store.enums.WorkflowStageEnum; import com.cool.store.enums.WorkflowStatusEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.request.LineRequest; import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.StringUtil; +import com.cool.store.vo.BlackListVO; import com.cool.store.vo.PartnerLineInfoAndBaseInfoVO; import com.cool.store.vo.PartnerLineInfoVO; import com.cool.store.vo.StageCountVO; @@ -129,6 +133,82 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { return null; } + @Override + public PageInfo getBlackList(LineRequest LineRequest) { + PageHelper.startPage(LineRequest.getPageNum(),LineRequest.getPageSize()); + PageInfo blackListDTOPageInfo = hyPartnerLineInfoDAO.getBlackList(LineRequest.getKeyWord(), LineRequest.getIntentArea(), LineRequest.getAcceptAdjustType()); + List list = blackListDTOPageInfo.getList(); + List result = new ArrayList<>(); + list.stream().forEach(x->{ + BlackListVO blackListVO = convertPartnerBlackListDTOToVo(x); + //todo su 员工名称手机号 手机号归属地 + result.add(blackListVO); + }); + blackListDTOPageInfo.setList(result); + return blackListDTOPageInfo; + } + + @Override + public Boolean joinBlackList(Long lineId, Integer status, String joinReason) { + if (lineId==null){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } + //加入黑名单 阶段回到第一步待提交状态 + HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); + hyPartnerLineInfoDO.setId(lineId); + hyPartnerLineInfoDO.setLineStatus(status); + hyPartnerLineInfoDO.setJoinBlackReason(joinReason); + hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); + hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); + + hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); + return Boolean.TRUE; + } + + @Override + public Boolean removeBlackList(Long lineId, Integer status, String removeReason) { + //移除黑名单 黑名单线索置为删除状态 新增一条线索 + if (lineId==null){ + throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); + } + HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); + hyPartnerLineInfoDO.setId(lineId); + hyPartnerLineInfoDO.setLineStatus(status); + hyPartnerLineInfoDO.setRemoveBlackReason(removeReason); + hyPartnerLineInfoDO.setDeleted(Boolean.TRUE); + hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); + + + HyPartnerLineInfoDO newHyPartnerLineInfoDO = new HyPartnerLineInfoDO(); + hyPartnerLineInfoDO.setPartnerId(hyPartnerLineInfoDO.getPartnerId()); + hyPartnerLineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode()); + hyPartnerLineInfoDO.setWorkflowStatus(WorkflowStatusEnum.INTENT_0.getCode()); + hyPartnerLineInfoDO.setLineStatus(0); + hyPartnerLineInfoDAO.batchInsert(Arrays.asList(newHyPartnerLineInfoDO)); + return Boolean.TRUE; + } + + + /** + * convertPartnerBlackListDTOToVo + * @param partnerBlackListDTO + * @return + */ + public BlackListVO convertPartnerBlackListDTOToVo(PartnerBlackListDTO partnerBlackListDTO){ + BlackListVO blackListVO = new BlackListVO(); + blackListVO.setId(partnerBlackListDTO.getLineId()); + blackListVO.setPartnerUserId(partnerBlackListDTO.getPartnerId()); + blackListVO.setPartnerUserName(partnerBlackListDTO.getPartnerUserName()); + blackListVO.setPartnerUserPhone(partnerBlackListDTO.getMobile()); + blackListVO.setCreateTime(partnerBlackListDTO.getCreateTime()); + blackListVO.setCloseTime(partnerBlackListDTO.getCloseTime()); + blackListVO.setJoinBlackReason(partnerBlackListDTO.getJoinBlackReason()); + blackListVO.setCloseUserId(partnerBlackListDTO.getCloseUserId()); + return blackListVO; + } + + + /** * convertPartnerLineInfoAndBaseInfoDTOToVo diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index db46b3dd1..5221de357 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -4,6 +4,7 @@ import com.cool.store.Service.DeskService; import com.cool.store.Service.HyPartnerIntentInfoService; import com.cool.store.Service.HyPartnerInterviewPlanService; import com.cool.store.Service.HyPartnerLineInfoService; +import com.cool.store.enums.LineStatusEnum; import com.cool.store.request.*; import com.cool.store.response.ResponseResult; import com.cool.store.vo.*; @@ -200,7 +201,7 @@ public class DeskController { @ApiOperation("黑名单列表") public ResponseResult> queryBlackList(@RequestBody LineRequest LineRequest){ - return ResponseResult.success(); + return ResponseResult.success(hyPartnerLineInfoService.getBlackList(LineRequest)); } @@ -208,16 +209,14 @@ public class DeskController { @ApiOperation("移出黑名单") public ResponseResult removeBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){ - - return ResponseResult.success(); + return ResponseResult.success(hyPartnerLineInfoService.removeBlackList(lineBlackListRequest.getLineId(), LineStatusEnum.PUBLIC_SEAS.getCode(),lineBlackListRequest.getCause())); } @PostMapping(path = "/joinBlackList") @ApiOperation("加入黑名单") public ResponseResult joinBlackList(@RequestBody LineBlackListRequest lineBlackListRequest){ - - return ResponseResult.success(); + return ResponseResult.success(hyPartnerLineInfoService.joinBlackList(lineBlackListRequest.getLineId(),LineStatusEnum.BLACKLIST.getCode(),lineBlackListRequest.getCause())); } @@ -244,15 +243,17 @@ public class DeskController { return ResponseResult.success(); } - @GetMapping(path = "/queryPartnerIntentApplyInfo") - @ApiOperation("查看意向审核信息") - @ApiImplicitParams({ - @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), - }) - public ResponseResult queryPartnerIntentApplyInfo(@RequestParam(value = "lineId",required = false)Long lineId){ - return ResponseResult.success(); - } + // TODO: 2023/6/13 添加根据线索查询店员接口列表接口 +// @GetMapping(path = "/queryPartnerIntentApplyInfo") +// @ApiOperation("查看意向审核信息") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "lineId", value = "线索ID", required = false), +// }) +// public ResponseResult queryPartnerIntentApplyInfo(@RequestParam(value = "lineId",required = false)Long lineId){ +// +// return ResponseResult.success(); +// } @@ -293,14 +294,12 @@ public class DeskController { return ResponseResult.success(); } - - @GetMapping(path = "/getZoneList") @ApiOperation("战区列表") @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false), }) - public ResponseResult> getZoneList(@RequestParam(value = "type",required = false)String type, + public ResponseResult> getZoneList(@RequestParam(value = "type",required = false)String type, @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ return ResponseResult.success(); @@ -312,7 +311,7 @@ public class DeskController { @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "意向区域-intent 开发区域=dev", required = false), }) - public ResponseResult> deletedZoneList(@RequestParam(value = "id",required = false)Long id){ + public ResponseResult deletedZoneList(@RequestParam(value = "id",required = false)Long id){ return ResponseResult.success(); }