diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java index c79338443..8585eab56 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java @@ -42,7 +42,7 @@ public class HyPartnerIntentInfoDAO { public List selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus, String keyword, Integer callStatus, - List userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, String userChannelIdList){ + List userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, List userChannelIdList){ if (StringUtils.isEmpty(userId)){ return new ArrayList<>(); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java index cbce0e3a8..f4fd4f339 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java @@ -45,7 +45,7 @@ public interface HyPartnerIntentInfoMapper { @Param("userPortraitIdList") List userPortraitIdList, @Param("lastFollowStartTime") String lastFollowStartTime, @Param("lastFollowEndTime") String lastFollowEndTime, - @Param("userChannelIdList") String userChannelIdList); + @Param("userChannelIdList") List userChannelIdList); /** * 根据线索ID查询数据 diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java new file mode 100644 index 000000000..4d99f9302 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java @@ -0,0 +1,28 @@ +package com.cool.store.request; + +import io.swagger.annotations.ApiModel; +import lombok.Data; +import org.springframework.boot.context.properties.bind.DefaultValue; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2023/8/16 16:57 + * @Version 1.0 + */ +@Data +@ApiModel +public class PartnerIntentApplyRequest { + private String type; + private String keyword; + private Integer callStatus; + private List userPortraitIdList; + private Long lastFollowStartTime; + private Long lastFollowEndTime; + private List userChannelIdList; + + private Integer pageNumber = 1; + private Integer pageSize = 10; +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java index 1a4c58015..ce2888e4f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java @@ -29,7 +29,7 @@ public interface HyPartnerIntentInfoService { * @return */ PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus, - List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, String userChannelIdList); + List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List userChannelIdList); /** * 根据线索查询加盟商意向申请信息 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java index cf0306790..efe59875a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java @@ -81,8 +81,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic @Override public PageInfo getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus, - List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, String userChannelIdList) { - PartnerIntentApplyInfoVO partnerIntentApplyInfoVO = new PartnerIntentApplyInfoVO(); + List userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List userChannelIdList) { String workflowStatus = ""; if (CommonConstants.PENDING.equals(type)) { workflowStatus = WorkflowStatusEnum.INTENT_1.getCode(); 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 0b1ba7c4b..943f98bee 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 @@ -99,25 +99,12 @@ public class DeskController { } - @GetMapping(path = "/queryIntentApplyList") + @PostMapping(path = "/queryIntentApplyList") @ApiOperation("招商经理视角===意向申请审核列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "type", value = "类型 待处理-pending 待跟进-follow", required = false), - @ApiImplicitParam(name = "pageNumber", value = "1", required = false), - @ApiImplicitParam(name = "pageSize", value = "10", required = false), - }) - public ResponseResult> queryIntentApplyList(@RequestParam(value = "type",required = false)String type, - @RequestParam(value = "keyword",required = false)String keyword, - @RequestParam(value = "callStatus",required = false)Integer callStatus, - @RequestParam(value = "userPortraitIdList",required = false)List userPortraitIdList, - @RequestParam(value = "lastFollowStartTime",required = false)Long lastFollowStartTime, - @RequestParam(value = "lastFollowEndTime",required = false)Long lastFollowEndTime, - @RequestParam(value = "userChannelIdList",required = false)String userChannelIdList, - @RequestParam(value = "pageNumber",required = false,defaultValue = "1")Integer pageNumber, - @RequestParam(value = "pageSize",required = false,defaultValue = "10")Integer pageSize){ + public ResponseResult> queryIntentApplyList(@RequestBody PartnerIntentApplyRequest req){ String userId = CurrentUserHolder.getUserId(); - return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyList(userId,type,pageSize,pageNumber,keyword,callStatus,userPortraitIdList, - lastFollowStartTime,lastFollowEndTime,userChannelIdList)); + return ResponseResult.success(hyPartnerIntentInfoService.getPartnerIntentApplyList(userId,req.getType(),req.getPageSize(),req.getPageNumber(),req.getKeyword(),req.getCallStatus(),req.getUserPortraitIdList(),req.getLastFollowStartTime() + ,req.getLastFollowEndTime(),req.getUserChannelIdList())); }