项目筛选

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -102,12 +102,15 @@ public class ProjectController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "项目信息表分页查询",  notes = "项目信息表分页查询")
-	public ResponseModel<Page<ProjectDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
+	public ResponseModel<Page<ProjectDto>> queryForPage(
+			@RequestParam(value = "current") int current,
+			@RequestParam(value = "size") int size,
+			@RequestParam(value = "name",required = false) String name,
+			@RequestParam(value = "constructionUnit",required = false) String constructionUnit) {
 	    Page<ProjectDto> page = new Page<ProjectDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(projectServiceImpl.queryForProjectPage(page));
+	    return ResponseHelper.buildResponse(projectServiceImpl.queryForProjectPage(page, name, constructionUnit));
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectMapper;
+import com.yeejoin.amos.boot.module.ugp.api.service.IProjectInitiationService;
 import com.yeejoin.amos.boot.module.ugp.api.service.IProjectService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,11 +21,12 @@ import java.util.List;
  */
 @Service
 public class ProjectServiceImpl extends BaseService<ProjectDto,Project,ProjectMapper> implements IProjectService {
+
     /**
      * 分页查询
      */
-    public Page<ProjectDto> queryForProjectPage(Page<ProjectDto> page)   {
-        return this.queryForPage(page, null, false);
+    public Page<ProjectDto> queryForProjectPage(Page<ProjectDto> page,String name, String constructionUnit)   {
+        return this.queryForPage(page, null, false,name, constructionUnit);
     }
 
     /**
@@ -30,4 +35,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto,Project,ProjectMa
     public List<ProjectDto> queryForProjectList()   {
         return this.queryForList("" , false);
     }
+
+
+
 }
\ No newline at end of file