| @@ -2,6 +2,7 @@ package com.iformall.controller.invest; | |||||
| import com.iformall.annotation.SystemServiceLog; | import com.iformall.annotation.SystemServiceLog; | ||||
| import com.iformall.common.InvestResultData; | import com.iformall.common.InvestResultData; | ||||
| import com.iformall.domain.dto.InvestTaskDto; | |||||
| import com.iformall.domain.po.invest.InvestTaskEntity; | import com.iformall.domain.po.invest.InvestTaskEntity; | ||||
| import com.iformall.domain.vo.invest.InvestPageQuery; | import com.iformall.domain.vo.invest.InvestPageQuery; | ||||
| import com.iformall.domain.vo.invest.InvestPageResult; | import com.iformall.domain.vo.invest.InvestPageResult; | ||||
| @@ -41,7 +42,7 @@ public class InvestTaskController extends InvestBaseController { | |||||
| @SystemServiceLog | @SystemServiceLog | ||||
| @ApiOperation("分页列表接口") | @ApiOperation("分页列表接口") | ||||
| @GetMapping("/list") | @GetMapping("/list") | ||||
| public InvestResultData<InvestPageResult<InvestTaskVo>> list(InvestPageQuery<InvestTaskEntity> params) { | |||||
| public InvestResultData<InvestPageResult<InvestTaskVo>> list(InvestPageQuery<InvestTaskDto> params) { | |||||
| return execute(params, p -> bizService.queryPageTask(p)); | return execute(params, p -> bizService.queryPageTask(p)); | ||||
| } | } | ||||
| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.service.invest; | package com.iformall.service.invest; | ||||
| import com.iformall.domain.dto.InvestCustomerDto; | import com.iformall.domain.dto.InvestCustomerDto; | ||||
| import com.iformall.domain.dto.InvestTaskDto; | |||||
| import com.iformall.domain.po.invest.InvestFollowRecordEntity; | import com.iformall.domain.po.invest.InvestFollowRecordEntity; | ||||
| import com.iformall.domain.po.invest.InvestTaskEntity; | import com.iformall.domain.po.invest.InvestTaskEntity; | ||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| @@ -12,7 +13,7 @@ public interface InvestBizService { | |||||
| InvestPageResult<InvestDemandVo> queryPageDemand(InvestPageQuery<InvestCustomerDto> params); | InvestPageResult<InvestDemandVo> queryPageDemand(InvestPageQuery<InvestCustomerDto> params); | ||||
| InvestPageResult<InvestTaskVo> queryPageTask(InvestPageQuery<InvestTaskEntity> params); | |||||
| InvestPageResult<InvestTaskVo> queryPageTask(InvestPageQuery<InvestTaskDto> params); | |||||
| InvestPageResult<InvestFollowRecordVo> queryPageFollowRecord(InvestPageQuery<InvestFollowRecordEntity> params); | InvestPageResult<InvestFollowRecordVo> queryPageFollowRecord(InvestPageQuery<InvestFollowRecordEntity> params); | ||||
| @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; | |||||
| import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | ||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ||||
| import com.iformall.domain.dto.InvestCustomerDto; | import com.iformall.domain.dto.InvestCustomerDto; | ||||
| import com.iformall.domain.dto.InvestTaskDto; | |||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.invest.InvestCustomerEntity; | import com.iformall.domain.po.invest.InvestCustomerEntity; | ||||
| import com.iformall.domain.po.invest.InvestDemandEntity; | import com.iformall.domain.po.invest.InvestDemandEntity; | ||||
| @@ -67,8 +68,14 @@ public class InvestBizServiceImpl implements InvestBizService { | |||||
| @Override | @Override | ||||
| public InvestPageResult<InvestTaskVo> queryPageTask(InvestPageQuery<InvestTaskEntity> params) { | |||||
| InvestPageResult<InvestTaskEntity> taskPage = taskService.queryPage(params); | |||||
| public InvestPageResult<InvestTaskVo> queryPageTask(InvestPageQuery<InvestTaskDto> params) { | |||||
| InvestTaskDto queryParams = params.getQueryData(); | |||||
| InvestTaskEntity queryTask = null; | |||||
| if (Objects.nonNull(queryParams)) { | |||||
| queryTask = new InvestTaskEntity(); | |||||
| } | |||||
| InvestPageResult<InvestTaskEntity> taskPage = taskService.queryPage(new InvestPageQuery<>(queryTask)); | |||||
| InvestPageResult<InvestTaskVo> investPage = new InvestPageResult<>(); | InvestPageResult<InvestTaskVo> investPage = new InvestPageResult<>(); | ||||
| if (CollectionUtils.isEmpty(taskPage.getRecords())) { | if (CollectionUtils.isEmpty(taskPage.getRecords())) { | ||||
| @@ -245,7 +252,7 @@ public class InvestBizServiceImpl implements InvestBizService { | |||||
| } | } | ||||
| if (CollectionUtils.isNotEmpty(ownerList)) { | if (CollectionUtils.isNotEmpty(ownerList)) { | ||||
| for (Object userId : ownerList) { | for (Object userId : ownerList) { | ||||
| ownerInfo.add(usersMap.get(userId)); | |||||
| ownerInfo.add(usersMap.get(Long.parseLong((String) userId))); | |||||
| } | } | ||||
| } | } | ||||
| return ownerInfo; | return ownerInfo; | ||||