合并表单设计代码

huigou-form/src/main/java/com/huigou/uasp/meta/controller/MetaDataController.java

 package com.huigou.uasp.meta.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.huigou.cache.SystemCache;
-import com.huigou.uasp.bmp.configuration.domain.model.CodeBuildRule;
+import com.huigou.uasp.annotation.ControllerMapping;
 import com.huigou.uasp.bmp.configuration.domain.model.SysDictionary;
+import com.huigou.uasp.client.CommonController;
 import com.huigou.uasp.meta.application.MetaDataApplication;
 import com.huigou.uasp.meta.domain.model.BusinessType;
 import com.huigou.uasp.meta.domain.model.MetaData;
@@ -17,19 +13,18 @@ import com.huigou.uasp.meta.repository.BusinessTypeRepository;
 import com.huigou.uasp.meta.repository.MetaDataDICTRepository;
 import com.huigou.uasp.meta.repository.MetaDataRepository;
 import com.huigou.uasp.meta.repository.QueryCodeBuildRuleRepository;
-import com.huigou.uasp.util.Constant;
 import com.huigou.util.ClassHelper;
-
+import com.huigou.util.SDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-
-import com.huigou.uasp.annotation.ControllerMapping;
-import com.huigou.uasp.client.CommonController;
-import com.huigou.util.SDO;
-
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author BySystem
  * @date 2019年10月17日
@@ -77,30 +72,10 @@ public class MetaDataController extends CommonController {
         String fullId = sdo.getString("fullId");//业务树的全路径
         Map<String, Object> data;
         MetaDataQueryRequest queryRequest = sdo.toQueryRequest(MetaDataQueryRequest.class);
-        //根据全路径去进行模糊查询包含当前fullId下面的所有子类。
-        List<BusinessType> mdmBusinessType = mdmBusinessTypeRepository.findByFullId(fullId);
-        //创建一个收集MdmBusinessType的id容器
-        List<String> ids = new ArrayList<>(mdmBusinessType.size());
-        for (BusinessType type : mdmBusinessType) {
-            ids.add(type.getId());
-        }
-        if (ids.size() > 0) {
-            //查询以MdmBusinessType的id为父类的所有MdmMetaData对象
-            List<MetaData> byClassifyIdIn = mdmMetaDataRepository.findByClassifyIdIn(ids);
-            //创建一个收集MdmMetaData的id容器
-            List<String> mdmMetaDataIds = new ArrayList<>(byClassifyIdIn.size());
-            for (MetaData m : byClassifyIdIn) {
-                mdmMetaDataIds.add(m.getId());
-            }
-           // queryRequest.setClassifyId(String.join(",", ids));
-            queryRequest.setId(String.join(",", mdmMetaDataIds));
-            Map<String, Object> Map1 = this.mdmMetaDataApplication.queryMdmMetaDataDICT(queryRequest);
-//            data = this.mdmMetaDataApplication.queryMdmMetaData(queryRequest);
-            return toResult(Map1);
-        } else {
-            data = this.mdmMetaDataApplication.queryMdmMetaData(queryRequest);
-            return toResult(data);
-        }
+
+        data = this.mdmMetaDataApplication.queryMdmMetaData(queryRequest);
+        return toResult(data);
+
     }
 
     //跳转新增页面

huigou-form/src/main/resources/content/easysearch/easy-search-saf.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<easy-search-mappings>
+ 	 
+	<easy-search name="selectConstructUnits_kk" desc="选择单位">
+		<sql>
+		   select t.id,t.unit_name,t.unit_type  from PM_CONSTRUCT_UNITS t where 1=1  
+		</sql>
+		<field name="id" code="id" type="hidden" />
+		<field name="单位名称" code="unitName" width="140" />
+		<field name="单位类别" code="unitType" width="120" />
+		<condition column="project_id" name="projectId" type="java.lang.String" symbol="=" alias="t"/>
+	   <orderby>unit_name asc</orderby>
+	</easy-search>
+	
+	 <easy-search name="selectTableFields" desc="查询表的字段">
+		 <sql>
+		select s.id,s.field_name,s.field_code,s.is_hidden,m.nums,t.name
+		  from saf_tables t ,saf_tables_meta m,saf_meta_data s
+         where   m.table_id=t.id and  s.id=m.meta_id  
+         and s.field_code!='id' and s.field_code!='form_id'  
+         and s.field_code!='status' and  s.field_code!='created_date' and  s.field_code!='created_by_id'
+         and s.field_code!='created_by_name'
+		</sql>
+		<field name="id" code="id" type="hidden" />
+		<field name="表名称" code="name" width="140" />
+		<field name="字段编码" code="fieldCode" width="140" />
+		<field name="字段名称" code="fieldName" width="120" />
+		<condition column="TABLE_ID" name="tableId" type="java.lang.String" symbol="=" alias="m"/>
+		<condition column="TABLE_NAME" name="tableName" type="java.lang.String" symbol="in" alias="t"/>
+		<condition column="IS_HIDDEN" name="isHidden" type="java.lang.Integer" symbol="=" alias="s"/>
+		 <orderby>name,nums asc</orderby>
+    </easy-search>
+	 <easy-search name="queryFormExistTables" desc="查询表单存在的表">
+		 <sql>
+	        select a.table_id,a.form_id,a.table_name,b.name,a.table_type from saf_form_tables a,saf_tables b,saf_form_list c 
+          where c.id=a.form_id and a.table_id=b.id  
+          </sql>
+          <field name="tableId" code="table_id" type="hidden" />
+		  <field name="表名称" code="tableName" width="140" />
+	 	  <field name="中文名称" code="name" width="160" />
+	     <condition column="form_no" name="formNo" type="java.lang.String" symbol="=" alias="c"/>
+	 
+     </easy-search>
+	
+    <easy-search name="selectDictNames" desc="查询数据字典名称">
+        <sql>
+            select t.name as dict_name , t.code as dict_code, folder_id from SA_Dictionary t where 1=1 <!--and folder_id='96C29E77F2BD1EB9E050007F010054FC'-->
+        </sql>
+        <field name="数据字典编号" code="dictCode" width="140" />
+        <field name="数据字典名称" code="dictName" width="140" />
+        <condition column="dict_name" name="dictName" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="dict_code" name="dictCode" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="folder_id" name="folderId" type="java.lang.String" symbol="in" alias="t"/>
+            <!--t.folder_id in (select id from SA_CommonTree t start with name = :dictFolderName connect by t.parent_id = prior id)
+        </condition>-->
+            <!--t.folder_id='96C29E77F2BD1EB9E050007F010054FC'-->
+    </easy-search>
+    
+    
+     <easy-search name="selectDictValueByCode" desc="查询数据字典指定名称的值">
+        <sql>
+            select t.value,t.name,s.code  from sa_dictionary s,sa_dictionarydetail t where  t.dictionary_id=s.id
+        </sql>
+        
+         <field name="数据字典名称" code="name" width="100" />
+         <field name="数据字典值" code="value" width="100" />
+        <condition column="name" name="name" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="code" name="code" type="java.lang.String" symbol="like" alias="s"/>
+    </easy-search>
+
+    <easy-search name="selectMetaCodeNames" desc="查询编码规则">
+        <sql>
+            select t.name as meta_Name , t.code as meta_Code  from sa_codebuildrule t where 1=1
+        </sql>
+        <field name="编码规则编号" code="metaCode" width="140" />
+        <field name="编码规则名称" code="metaName" width="140" />
+        <condition column="meta_Name" name="metaName" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="meta_Code" name="metaCode" type="java.lang.String" symbol="like" alias="t"/>
+        <condition column="folder_id" name="folderId" type="java.lang.String" symbol="" alias="t">
+            t.folder_id='96C29648FD62DA58E050007F01005397'
+        </condition>
+
+    </easy-search>
+      
+    <easy-search name="selectSortTypes" desc="查询排序模型类型">
+        <sql>
+            select d.value as sort_type, d.name as sort_type_text_view
+                   from sa_dictionarydetail d
+                 where 1=1
+                 and d.dictionary_id in
+                 (select t.id from sa_dictionary t where code = 'sortTypes')
+        </sql>
+        <field name="编码" code="sortType" width="150" />
+        <field name="值" code="sortTypeTextView" width="150" />
+    </easy-search>
+
+    
+
+
+
+</easy-search-mappings>
+