From 0d10e02090beb517ef021f00cdddd91b2a97b040 Mon Sep 17 00:00:00 2001 From: Burce Date: Thu, 10 Oct 2019 17:00:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/invest/InvestTaskController.java | 3 ++- .../iformall/service/invest/InvestBizService.java | 3 ++- .../service/invest/impl/InvestBizServiceImpl.java | 13 ++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java index a937b5574..6727d9ddd 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -2,6 +2,7 @@ package com.iformall.controller.invest; import com.iformall.annotation.SystemServiceLog; import com.iformall.common.InvestResultData; +import com.iformall.domain.dto.InvestTaskDto; import com.iformall.domain.po.invest.InvestTaskEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; @@ -41,7 +42,7 @@ public class InvestTaskController extends InvestBaseController { @SystemServiceLog @ApiOperation("分页列表接口") @GetMapping("/list") - public InvestResultData> list(InvestPageQuery params) { + public InvestResultData> list(InvestPageQuery params) { return execute(params, p -> bizService.queryPageTask(p)); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java index 1d01c9274..f1090e76f 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java @@ -1,6 +1,7 @@ package com.iformall.service.invest; 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.InvestTaskEntity; import com.iformall.domain.po.MallUserInfo; @@ -12,7 +13,7 @@ public interface InvestBizService { InvestPageResult queryPageDemand(InvestPageQuery params); - InvestPageResult queryPageTask(InvestPageQuery params); + InvestPageResult queryPageTask(InvestPageQuery params); InvestPageResult queryPageFollowRecord(InvestPageQuery params); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 8dcc9b7c1..7201b339b 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.dto.InvestCustomerDto; +import com.iformall.domain.dto.InvestTaskDto; import com.iformall.domain.po.*; import com.iformall.domain.po.invest.InvestCustomerEntity; import com.iformall.domain.po.invest.InvestDemandEntity; @@ -67,8 +68,14 @@ public class InvestBizServiceImpl implements InvestBizService { @Override - public InvestPageResult queryPageTask(InvestPageQuery params) { - InvestPageResult taskPage = taskService.queryPage(params); + public InvestPageResult queryPageTask(InvestPageQuery params) { + InvestTaskDto queryParams = params.getQueryData(); + InvestTaskEntity queryTask = null; + if (Objects.nonNull(queryParams)) { + queryTask = new InvestTaskEntity(); + } + + InvestPageResult taskPage = taskService.queryPage(new InvestPageQuery<>(queryTask)); InvestPageResult investPage = new InvestPageResult<>(); if (CollectionUtils.isEmpty(taskPage.getRecords())) { @@ -245,7 +252,7 @@ public class InvestBizServiceImpl implements InvestBizService { } if (CollectionUtils.isNotEmpty(ownerList)) { for (Object userId : ownerList) { - ownerInfo.add(usersMap.get(userId)); + ownerInfo.add(usersMap.get(Long.parseLong((String) userId))); } } return ownerInfo;