From 26c048030d494a107447f0e93e7b64ace6b8de79 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 17 May 2022 19:07:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 4 +- .../mapper/ProjectLibraryBaseMapper.java | 3 + .../mapper/xml/ProjectLibraryBaseMapper.xml | 65 ++++++++++++++++++- .../service/IProjectLibraryBaseService.java | 2 +- .../impl/ProjectLibraryBaseServiceImpl.java | 5 +- .../impl/ProjectStatusBoardServiceImpl.java | 18 +++-- 6 files changed, 84 insertions(+), 13 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index 789f55ff8..f17b026db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -57,8 +57,8 @@ public class ProjectLibraryBaseController extends JeroController> queryList() { - List list = projectLibraryBaseService.queryList(); + public Result> queryList(ProjectLibraryBase projectLibraryBase) { + List list = projectLibraryBaseService.getList(projectLibraryBase); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java index 06e9bb28c..1611566e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/ProjectLibraryBaseMapper.java @@ -3,6 +3,7 @@ package com.jero.modules.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.project.entity.ProjectLibraryBase; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -17,6 +18,8 @@ public interface ProjectLibraryBaseMapper extends BaseMapper /**分页列表*/ IPage queryPageList(IPage page, Map params); + List getList(@Param("projectLibraryBase") ProjectLibraryBase projectLibraryBase); + /**根据id查询*/ List queryById(String id); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml index f8e35c3f6..caae401ed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLibraryBaseMapper.xml @@ -109,6 +109,69 @@ order by plb.create_time desc + - \ No newline at end of file + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index abdee6784..cf0703eaf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -61,7 +61,7 @@ public interface IProjectLibraryBaseService extends IService * * @return */ - List queryList(); + List getList(ProjectLibraryBase projectLibraryBase); /** * 分页列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 8cb90354d..1c6dd825a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -138,8 +138,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl queryList() { - return list(); + public List getList(ProjectLibraryBase projectLibraryBase) { + List list = projectLibraryBaseMapper.getList(projectLibraryBase); + return list; } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index 19efebc90..1d801d957 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -63,10 +63,10 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService @Override public List> timelineList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap()); +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap()); //项目库信息 - List projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper); + List projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase); List> result = new ArrayList<>(); if(projectLibraryBaseList.size() != 0){ //项目库id @@ -85,12 +85,16 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService */ @Override public List> scheduleInfoList(ProjectLibraryBase projectLibraryBase, HttpServletRequest req) { + if(StringUtils.isNotBlank(projectLibraryBase.getProjectName())){ + projectLibraryBase.setProjectName(projectLibraryBase.getProjectName().replace("*","")); + } //目标市场数据字典 List dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region"); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); - //项目库信息 - List projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper); +// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLibraryBase, req.getParameterMap()); +// queryWrapper.orderByDesc("create_time"); +// //项目库信息 +// List projectLibraryBaseList = projectLibraryBaseService.list(queryWrapper); + List projectLibraryBaseList = projectLibraryBaseService.getList(projectLibraryBase); List> result = new ArrayList<>(); if(projectLibraryBaseList.size() != 0){ @@ -373,7 +377,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService }else{ calendarAfter.setTime(new Date()); } - calendarAfter.add(Calendar.YEAR, +6); + calendarAfter.add(Calendar.MONTH, +5); Date dateAfter = calendarAfter.getTime(); Calendar min = Calendar.getInstance();