后台项目列表增加项目状态筛选

src/main/java/com/zhiwei/brandkbs2/controller/admin/ProjectController.java

@@ -83,8 +83,11 @@ public class ProjectController extends BaseController {
             @ApiImplicitParam(name = "size", value = "每页记录数", required = false, defaultValue = "10", paramType = "query", dataType = "int"),
             @ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false, defaultValue = "", paramType = "query", dataType = "string")})
     @GetMapping("/list")
-    public ResponseResult findProjectList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "size", defaultValue = "10") int size, @RequestParam(value = "keyword", defaultValue = "") String keyword) {
-        return ResponseResult.success(ProjectService.findProjectList(page, size, keyword));
+    public ResponseResult findProjectList(@RequestParam(value = "page", defaultValue = "1") int page,
+                                          @RequestParam(value = "size", defaultValue = "10") int size,
+                                          @RequestParam(value = "keyword", defaultValue = "") String keyword,
+                                          @RequestParam(value = "isStart", required = false) Boolean isStart) {
+        return ResponseResult.success(ProjectService.findProjectList(page, size, keyword, isStart));
     }
 
 
@@ -286,8 +289,9 @@ public class ProjectController extends BaseController {
     public ResponseResult findNonManualProjectList(@RequestParam(value = "page", defaultValue = "1") int page,
                                                    @RequestParam(value = "size", defaultValue = "10") int size,
                                                    @RequestParam(value = "sorter", defaultValue = "{\"cTime\":\"descend\"}") String sorter,
-                                                   @RequestParam(value = "keyword", defaultValue = "") String keyword) {
-        return ResponseResult.success(ProjectService.findNonManualProjectList(page, size, sorter, keyword));
+                                                   @RequestParam(value = "keyword", defaultValue = "") String keyword,
+                                                   @RequestParam(value = "isStart", required = false) Boolean isStart) {
+        return ResponseResult.success(ProjectService.findNonManualProjectList(page, size, sorter, keyword, isStart));
     }
 
     @ApiOperation("非人工项目-维护记录列表")

src/main/java/com/zhiwei/brandkbs2/service/ProjectService.java

@@ -32,7 +32,7 @@ public interface ProjectService {
      * @param keyword 关键字
      * @return 项目列表
      */
-    PageVO<JSONObject> findProjectList(int page, int size, String keyword);
+    PageVO<JSONObject> findProjectList(int page, int size, String keyword, Boolean isStart);
 
     /**
      * 根据项目ID获取该项目信息
@@ -171,7 +171,7 @@ public interface ProjectService {
      * @param keyword   关键词
      * @return
      */
-    PageVO<JSONObject> findNonManualProjectList(int page, int size, String sorter, String keyword);
+    PageVO<JSONObject> findNonManualProjectList(int page, int size, String sorter, String keyword, Boolean isStart);
 
     /**
      * 非人工项目剩余数据量调整记录列表

src/main/java/com/zhiwei/brandkbs2/service/impl/ProjectServiceImpl.java

@@ -143,13 +143,19 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public PageVO<JSONObject> findProjectList(int page, int size, String keyword) {
+    public PageVO<JSONObject> findProjectList(int page, int size, String keyword, Boolean isStart) {
         Query query = new Query();
+        // 人工项目
         query.addCriteria(Criteria.where("isManual").is(true));
-//        projectDao.addKeywordFuzz(query, keyword, "extraProjectName", "projectName");
+        // 状态
+        if (Objects.nonNull(isStart)){
+            query.addCriteria(Criteria.where("isStart").is(isStart));
+        }
+        if (StringUtils.isNotBlank(keyword)) {
             Criteria extraProjectName = Criteria.where("extraProjectName").regex(keyword, "i");
             Criteria projectName = Criteria.where("projectName").regex(keyword, "i");
             query.addCriteria(new Criteria().orOperator(extraProjectName, projectName));
+        }
         long count = projectDao.count(query);
         projectDao.addSort(query, "{\"cTime\":\"descend\"}");
         mongoUtil.start(page, size, query);
@@ -577,13 +583,19 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public PageVO<JSONObject> findNonManualProjectList(int page, int size, String sorter, String keyword) {
+    public PageVO<JSONObject> findNonManualProjectList(int page, int size, String sorter, String keyword, Boolean isStart) {
         Query query = new Query();
+        // 人工项目
         query.addCriteria(Criteria.where("isManual").is(false));
-//        projectDao.addKeywordFuzz(query, keyword, "extraProjectName", "projectName");
+        // 状态
+        if (Objects.nonNull(isStart)){
+            query.addCriteria(Criteria.where("isStart").is(isStart));
+        }
+        if (StringUtils.isNotBlank(keyword)) {
             Criteria extraProjectName = Criteria.where("extraProjectName").regex(keyword, "i");
             Criteria projectName = Criteria.where("projectName").regex(keyword, "i");
             query.addCriteria(new Criteria().orOperator(extraProjectName, projectName));
+        }
         long count = projectDao.count(query);
         if (Objects.isNull(sorter) || Objects.isNull(JSONObject.parseObject(sorter)) || JSONObject.parseObject(sorter).isEmpty()){
             projectDao.addSort(query, "{\"cTime\":\"descend\"}");