diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java index 399a461a2..ccb80fe9c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestController.java @@ -8,12 +8,12 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.Collection; -import java.util.List; @Slf4j @@ -30,7 +30,7 @@ public class InvestController extends InvestBaseController { */ @ApiOperation("招商人员列表") @SystemControllerLog(description = "招商人员列表") - @PostMapping("/users") + @GetMapping("/users") public InvestResultData> userList() { return execute(null, p -> bizService.queryUserList()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java index 7d9233bc7..8e42fc21e 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Arrays; - +import java.util.Collection; /** @@ -47,11 +47,19 @@ public class InvestOperateRecordController extends InvestBaseController { } + /** + * 信息 + */ + @GetMapping("/listById") + public InvestResultData> listById(InvestOperateRecordQuery params) { + return execute(params, p -> bizService.findOperateListById(p)); + } + /** * 信息 */ @GetMapping("/info") - public InvestResultData info(InvestOperateRecordQuery params) { + public InvestResultData> info(InvestOperateRecordQuery params) { return execute(params, p -> bizService.findOperateById(p)); } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumInvestUserType.java b/mallinkService/src/main/java/com/iformall/enums/EnumInvestUserType.java index b424fe97b..170f202b0 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumInvestUserType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumInvestUserType.java @@ -4,6 +4,7 @@ package com.iformall.enums; public enum EnumInvestUserType { MANAGER(0, "招商管理人员"), USER(1, "招商人员"), + ALL(10, "招商权限"), ; public static EnumInvestUserType getEnum(Integer code) { 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 a49831d0b..d01a83ce0 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java @@ -48,6 +48,8 @@ public interface InvestBizService { Collection findOperateById(InvestOperateRecordQuery params) ; + InvestPageResult findOperateListById(InvestOperateRecordQuery params) ; + InvestFollowRecordVo findFollowRecordById(Long id) ; } 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 318376cb0..536e99d2d 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 @@ -376,13 +376,14 @@ public class InvestBizServiceImpl implements InvestBizService { @Override public List queryUserList() { - return queryUserList(EnumInvestUserType.USER); + return queryUserList(EnumInvestUserType.ALL); } public List queryUserList(EnumInvestUserType userType) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(MallUserInfo::getStatus, 1); if (Objects.nonNull(userType)) { - queryWrapper.eq(MallUserInfo::getInvestRule, userType.getCode()); + queryWrapper.in(MallUserInfo::getInvestRule, EnumInvestUserType.MANAGER.getCode(), EnumInvestUserType.USER.getCode()); } return userInfoService.selectList(queryWrapper); } @@ -462,9 +463,16 @@ public class InvestBizServiceImpl implements InvestBizService { @Override public Collection findOperateById(InvestOperateRecordQuery params) { + params.setPageSize(Integer.MAX_VALUE); + return findOperateListById(params).getRecords(); + } + + @Override + public InvestPageResult findOperateListById(InvestOperateRecordQuery params) { InvestHelper.notNull(params, params.getRecordType(), params.getTid()); + InvestPageResult investPage = new InvestPageResult<>(); LambdaQueryWrapper recordQueryWrapper = new LambdaQueryWrapper<>(); - InvestDemandEntity demandEntity = null; + InvestDemandEntity demandEntity; List demandRecord = new ArrayList<>(); if (Objects.equals(params.getRecordType(), EnumFollowType.DEMAND)) { InvestCustomerEntity customerEntity = customerService.getByIdNotNull(params.getTid()); @@ -483,7 +491,7 @@ public class InvestBizServiceImpl implements InvestBizService { List recordPage = operateRecordService.list(recordQueryWrapper); recordPage.addAll(demandRecord); if (CollectionUtils.isEmpty(recordPage)) { - return resultList; + return investPage; } List mixRecordPage = recordPage.parallelStream().sorted((o1, o2) -> { if (Objects.equals(o1.getCreateDate(), o2.getCreateDate())) { @@ -500,7 +508,7 @@ public class InvestBizServiceImpl implements InvestBizService { List record = JSONArray.parseArray(recordEntity.getContent(), TableTriple.class); resultList.addAll(getRecordList(recordEntity, record, usersMap.get(recordEntity.getOperator()))); } - return resultList; + return investPage; } private List getRecordList(InvestOperateRecordEntity recordEntity, Collection contentList, MallUserInfo userInfo) {