项目管理模糊查询

neim-biz/src/main/java/com/jiayue/biz/controller/ProjectController.java

@@ -55,8 +55,8 @@ public class ProjectController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('dataQuery:project:list')")
     @GetMapping("/list")
-    public TableDataInfo list() {
-        List<ProjectDto> list = iProjectService.getProject();
+    public TableDataInfo list(Project project) {
+        List<ProjectDto> list = iProjectService.getProject(project);
         return getDataTable(list);
     }
 

neim-biz/src/main/java/com/jiayue/biz/service/ProjectService.java

@@ -18,7 +18,7 @@ public interface ProjectService extends IService<Project> {
     Page getByProjectName(Integer current, Integer size,String projectName);
 
     //查询组装项目列表
-    List<ProjectDto> getProject();
+    List<ProjectDto> getProject(Project project);
 
     //修改项目
     void updateProject(ProjectDto projectDto);

neim-biz/src/main/java/com/jiayue/biz/service/impl/ProjectServiceImpl.java

@@ -55,7 +55,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
 
     //查询组装项目列表
-    public List<ProjectDto> getProject() {
+    public List<ProjectDto> getProject(Project project) {
         List<ProjectInfo> projectInfoList = projectInfoService.getProjectInfoList();
         ArrayList<ProjectDto> projectList = new ArrayList<>();
         for (ProjectInfo projectInfo : projectInfoList) {
@@ -87,6 +87,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
             projectList.add(projectDto);
         }
+        if(project.getProjectName() != null){
+            return projectList.stream().filter(p -> p.getProjectName().contains(project.getProjectName())).collect(Collectors.toList());
+        }
         return projectList;
     }
 

neim-ui/src/views/dataQuery/project/index.vue

@@ -161,16 +161,16 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
-      // queryParams: {
-      //   pageNum: 1,
-      //   pageSize: 10,
-      //   projectName: null,
-      //   company: null,
-      //   province: null,
-      //   startDate: null,
-      //   endDate: null,
-      //   status: null
-      // },
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectName: null,
+        company: null,
+        province: null,
+        startDate: null,
+        endDate: null,
+        status: null
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -230,14 +230,14 @@ export default {
     },
     /*条件查询*/
     selectList() {
-      // if (this.projectName !== null && this.projectList !== undefined && this.projectList !== '')
-      //   this.queryParams.projectName = this.projectName
-      this.getList()
+      if (this.projectName !== null && this.projectList !== undefined && this.projectList !== '')
+        this.queryParams.projectName = this.projectName
+      this.getList(this.queryParams)
     },
     /** 查询项目列表 */
-    getList() {
+    getList(data) {
       this.loading = true;
-      listProject().then(response => {
+      listProject(data).then(response => {
         this.projectList = response.rows;
         this.total = response.total;
         this.loading = false;