From 532a6d00ce2912cd66b3d85ad6bbfde199918754 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Mon, 29 Aug 2022 09:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ResourceBasicInfoService.java            | 11 +++++++++++
 .../service/impl/ResourceBasicInfoServiceImpl.java   | 12 ++++++++++++
 .../web/ResourceBasicInfoController.java             | 12 ++++++++++++
 .../wrapper/ResourceBasicInfoWrapper.java            |  4 ++++
 4 files changed, 39 insertions(+)

diff --git a/src/com/engine/organization/service/ResourceBasicInfoService.java b/src/com/engine/organization/service/ResourceBasicInfoService.java
index 2a5f44bd..44cb6f63 100644
--- a/src/com/engine/organization/service/ResourceBasicInfoService.java
+++ b/src/com/engine/organization/service/ResourceBasicInfoService.java
@@ -83,6 +83,7 @@ public interface ResourceBasicInfoService {
 
     /**
      * 分类，新增编辑表单
+     *
      * @param params
      * @return
      */
@@ -90,6 +91,7 @@ public interface ResourceBasicInfoService {
 
     /**
      * 新增分类
+     *
      * @param itemClassPO
      * @return
      */
@@ -97,6 +99,7 @@ public interface ResourceBasicInfoService {
 
     /**
      * 更新分类
+     *
      * @param itemClassPO
      * @return
      */
@@ -104,9 +107,17 @@ public interface ResourceBasicInfoService {
 
     /**
      * 删除分类
+     *
      * @param fid
      * @return
      */
     int deleteResourceItemClass(Integer fid);
 
+    /**
+     * 搜索条件
+     *
+     * @return
+     */
+    List<SearchConditionGroup> getSearchCondition();
+
 }
diff --git a/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java b/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java
index 12b4f0ec..eb9dab63 100644
--- a/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ResourceBasicInfoServiceImpl.java
@@ -202,6 +202,18 @@ public class ResourceBasicInfoServiceImpl extends Service implements ResourceBas
         return getResourceBasicInfoMapper().deleteResourceItemClass(fid);
     }
 
+    @Override
+    public List<SearchConditionGroup> getSearchCondition() {
+        List<SearchConditionGroup> addGroups = new ArrayList<>();
+        List<SearchConditionItem> conditionItems = new ArrayList<>();
+        SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "名称", "fname");
+        SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "编号", "fno");
+        conditionItems.add(schemeNameCondition);
+        conditionItems.add(schemeNoCondition);
+        addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
+        return addGroups;
+    }
+
     private String buildSqlWhere(Map<String, Object> params) {
         DBType dbType = DBType.get(new RecordSet().getDBType());
         String sqlWhere = " where 1 = 1 ";
diff --git a/src/com/engine/organization/web/ResourceBasicInfoController.java b/src/com/engine/organization/web/ResourceBasicInfoController.java
index 99e53cb3..559b188f 100644
--- a/src/com/engine/organization/web/ResourceBasicInfoController.java
+++ b/src/com/engine/organization/web/ResourceBasicInfoController.java
@@ -184,4 +184,16 @@ public class ResourceBasicInfoController {
         }
     }
 
+    @GET
+    @Path("/getSearchCondition")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult getSearchCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            return ReturnResult.successed(getResourceBasicInfoWrapper(user).getSearchCondition());
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
+
 }
diff --git a/src/com/engine/organization/wrapper/ResourceBasicInfoWrapper.java b/src/com/engine/organization/wrapper/ResourceBasicInfoWrapper.java
index aec06084..23692dcc 100644
--- a/src/com/engine/organization/wrapper/ResourceBasicInfoWrapper.java
+++ b/src/com/engine/organization/wrapper/ResourceBasicInfoWrapper.java
@@ -147,4 +147,8 @@ public class ResourceBasicInfoWrapper extends OrganizationWrapper {
 
         return result;
     }
+
+    public List<SearchConditionGroup> getSearchCondition() {
+        return getResourceBasicInfoService(user).getSearchCondition();
+    }
 }