修改积木模块

boman-report/src/main/java/com/boman/report/mapper/GenTableColumnMapper.java

@@ -7,7 +7,8 @@ package com.boman.report.mapper;
 
 import java.util.List;
 
-import com.boman.domain.GenTableColumn;
+
+import com.boman.report.domain.GenTableColumn;
 import org.apache.ibatis.annotations.Param;
 
 /**

boman-report/src/main/java/com/boman/report/mapper/GenTableMapper.java

@@ -1,9 +1,7 @@
 package com.boman.report.mapper;
 
-import com.boman.domain.GenTable;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
+import com.boman.report.domain.GenTable;
 
 /**
  * 业务 数据层

boman-report/src/main/java/com/boman/report/service/IGenTableColumnService.java

@@ -1,6 +1,8 @@
 package com.boman.report.service;
 
-import com.boman.domain.GenTableColumn;
+
+
+import com.boman.report.domain.GenTableColumn;
 
 import java.util.List;
 

boman-report/src/main/java/com/boman/report/service/impl/GenTableColumnServiceImpl.java

@@ -1,7 +1,8 @@
 package com.boman.report.service.impl;
 
-import com.boman.domain.GenTable;
-import com.boman.domain.GenTableColumn;
+
+import com.boman.report.domain.GenTable;
+import com.boman.report.domain.GenTableColumn;
 import com.boman.report.mapper.GenTableColumnMapper;
 import com.boman.report.mapper.GenTableMapper;
 import com.boman.report.service.IGenTableColumnService;

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/service/a/JmReportDbService.java

@@ -25,7 +25,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.servlet.http.HttpServletRequest;
 
-import com.boman.domain.GenTableColumn;
+
+import com.boman.report.domain.GenTableColumn;
 import com.boman.report.service.IGenTableColumnService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

boman-report/src/main/resources/mapper/GenTableMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.boman.report.mapper.GenTableMapper">
 
 	<resultMap type="com.boman.report.domain.GenTable" id="GenTableResult">
-	    <id     property="id"        column="id"          />
+	    <id     property="id"        column="table_id"          />
 		<result property="tableName"      column="table_name"        />
 		<result property="tableComment"   column="table_comment"     />
 		<result property="subTableName"   column="sub_table_name"    />
@@ -25,20 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateBy"       column="update_by"         />
 		<result property="updateTime"     column="update_time"       />
 		<result property="remark"         column="remark"            />
-		<result property="isMenu"         column="is_menu"            />
-		<result property="menuRole"         column="menu_role"            />
-		<result property="akColumn"         column="ak_column"            />
-		<result property="dkColumn"         column="dk_column"            />
-		<result property="triggerCreate"         column="trigger_create"            />
-		<result property="triggerRetrieve"         column="trigger_retrieve"            />
-		<result property="triggerUpdate"         column="trigger_update"            />
-		<result property="triggerDelete"         column="trigger_delete"            />
-		<result property="triggerSubmit"         column="trigger_submit"            />
-		<result property="realTableName"         column="real_table_name"            />
-		<result property="filterConditions"         column="filter_conditions"            />
-		<result property="extendedAttributes"         column="extended_attributes"            />
-		<result property="tablePrimaryKey"         column="table_primary_key"            />
-		<result property="tableColumn"         column="table_column"            />
 		<collection  property="columns"  javaType="java.util.List"  resultMap="GenTableColumnResult" />
 	</resultMap>
 	
@@ -68,15 +54,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectGenTableVo">
-        select id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options,
+        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options,
          create_by, create_time, update_by, update_time, remark, is_menu, menu_role, ak_column, dk_column, trigger_create, trigger_retrieve, trigger_update, trigger_delete, trigger_submit, real_table_name, filter_conditions, extended_attributes, table_primary_key, table_column from gen_table
     </sql>
 
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-		SELECT t.id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark, t.is_menu, t.menu_role, t.ak_column, t.dk_column, t.trigger_create, t.trigger_retrieve, t.trigger_update, t.trigger_delete, t.trigger_submit, t.real_table_name, t.filter_conditions, t.extended_attributes, t.table_primary_key, t.table_column,
-			   c.id as c_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
+		SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+			   c.column_id as c_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
-				 LEFT JOIN gen_table_column c ON t.id = c.table_id
+				 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
 		where t.table_name = #{tableName} order by c.sort
 	</select>