suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

请求修改请求方式

Browse Source
This commit is contained in:
苏竹红
2023-08-16 17:15:31 +08:00
parent b9215bce78
commit 4d95784cb3
6 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java
View File

@@ -42,7 +42,7 @@ public class HyPartnerIntentInfoDAO {
public List<PartnerIntentApplyInfoDTO> selectPartnerIntentApplyInfoList(String userId, String workflowStage, String workflowStatus, String keyword, Integer callStatus,
List<String> userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, String userChannelIdList){
List<String> userPortraitIdList, String lastFollowStartTime, String lastFollowEndTime, List<Long> userChannelIdList){
if (StringUtils.isEmpty(userId)){
return new ArrayList<>();
}

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerIntentInfoMapper.java
View File

@@ -45,7 +45,7 @@ public interface HyPartnerIntentInfoMapper {
@Param("userPortraitIdList") List<String> userPortraitIdList,
@Param("lastFollowStartTime") String lastFollowStartTime,
@Param("lastFollowEndTime") String lastFollowEndTime,
@Param("userChannelIdList") String userChannelIdList);
@Param("userChannelIdList") List<Long> userChannelIdList);
/**
* 根据线索ID查询数据

28
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentApplyRequest.java Normal file
View File

@@ -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<String> userPortraitIdList;
private Long lastFollowStartTime;
private Long lastFollowEndTime;
private List<Long> userChannelIdList;
private Integer pageNumber = 1;
private Integer pageSize = 10;
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerIntentInfoService.java
View File

@@ -29,7 +29,7 @@ public interface HyPartnerIntentInfoService {
* @return
*/
PageInfo<PartnerIntentApplyInfoVO> getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus,
List<String> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, String userChannelIdList);
List<String> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List<Long> userChannelIdList);
/**
* 根据线索查询加盟商意向申请信息

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
View File

@@ -81,8 +81,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
@Override
public PageInfo<PartnerIntentApplyInfoVO> getPartnerIntentApplyList(String userId, String type, Integer pageSize, Integer pageNumber,String keyword, Integer callStatus,
List<String> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, String userChannelIdList) {
PartnerIntentApplyInfoVO partnerIntentApplyInfoVO = new PartnerIntentApplyInfoVO();
List<String> userPortraitIdList, Long lastFollowStartTime, Long lastFollowEndTime, List<Long> userChannelIdList) {
String workflowStatus = "";
if (CommonConstants.PENDING.equals(type)) {
workflowStatus = WorkflowStatusEnum.INTENT_1.getCode();

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

@@ -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<PageInfo<PartnerIntentApplyInfoVO>> 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<String> 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<PageInfo<PartnerIntentApplyInfoVO>> 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()));
}