From be195dfc2350babc0dc4eb3ef6f09f474dfb9595 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期六, 15 五月 2021 16:26:13 +0800
Subject: [PATCH] 项目接口更新
---
src/main/java/com/whyc/service/ProjectService.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProjectService.java b/src/main/java/com/whyc/service/ProjectService.java
index 5a3cd93..18d6d83 100644
--- a/src/main/java/com/whyc/service/ProjectService.java
+++ b/src/main/java/com/whyc/service/ProjectService.java
@@ -2,16 +2,22 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.api.R;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.whyc.dto.ProjectStatusCountDTO;
import com.whyc.dto.Response;
import com.whyc.mapper.ProjectMapper;
+import com.whyc.mapper.UserMapper;
import com.whyc.pojo.Project;
+import com.whyc.pojo.User;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -24,7 +30,8 @@
@Resource
private ProjectMapper mapper;
-
+ @Resource
+ private UserMapper userMapper;
public Response addProject(Project project){
@@ -63,10 +70,34 @@
}
- public Response<IPage<Project>> getPageByCondition(int pageNum,int pageSize,Project project){
+ public Response<PageInfo<Project>> getPageByCondition(int pageNum,int pageSize,Project project){
+ PageHelper.startPage(pageNum,pageSize);
QueryWrapper<Project> queryWrapper = new QueryWrapper<>(project);
- IPage<Project> page = mapper.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
- return new Response<IPage<Project>>().set(1, page);
+ List<Project> list = mapper.selectList(queryWrapper);
+ for (Project p:list) {
+ String managers = p.getManager();
+ if (StringUtils.isNotEmpty(managers)){
+ String[] strings = managers.split(",");
+ List<String> managerUser = new ArrayList<>();
+ for (int i = 0; i < strings.length; i++) {
+ User user = userMapper.selectById(strings[i]);
+ managerUser.add(user.getRealName());
+ }
+ p.setManagerInfo(managerUser);
+ }
+ String parters = p.getParter();
+ if (StringUtils.isNotEmpty(parters)){
+ String[] strings1 = parters.split(",");
+ List<String> parterUser = new ArrayList<>();
+ for (int i = 0; i < strings1.length; i++) {
+ User user = userMapper.selectById(strings1[i]);
+ parterUser.add(user.getRealName());
+ }
+ p.setParterInfo(parterUser);
+ }
+ }
+ PageInfo<Project> pageInfo = new PageInfo<>(list);
+ return new Response<PageInfo<Project>>().set(1, pageInfo);
}
public Response updateProject(Project project){
--
Gitblit v1.9.1