Просмотр исходного кода

[招商]adjust

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
0d10e02090
3 измененных файлов: 14 добавлений и 5 удалений
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java
  2. +2
    -1
      mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java
  3. +10
    -3
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 2
- 1
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<InvestPageResult<InvestTaskVo>> list(InvestPageQuery<InvestTaskEntity> params) {
public InvestResultData<InvestPageResult<InvestTaskVo>> list(InvestPageQuery<InvestTaskDto> params) {
return execute(params, p -> bizService.queryPageTask(p));
}



+ 2
- 1
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<InvestDemandVo> queryPageDemand(InvestPageQuery<InvestCustomerDto> params);

InvestPageResult<InvestTaskVo> queryPageTask(InvestPageQuery<InvestTaskEntity> params);
InvestPageResult<InvestTaskVo> queryPageTask(InvestPageQuery<InvestTaskDto> params);

InvestPageResult<InvestFollowRecordVo> queryPageFollowRecord(InvestPageQuery<InvestFollowRecordEntity> params);



+ 10
- 3
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<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<>();
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;


Загрузка…
Отмена
Сохранить