fix colunm新增字段表.字段名

boman-api/boman-domain/src/main/java/com.boman.domain/GenTableColumn.java

@@ -167,6 +167,18 @@ public class GenTableColumn extends BaseEntity
      * 前端单对象展示样式
      */
     private String cssClass;
+    /**
+     * 表.字段全称
+     */
+    private String tableColumnName;
+
+    public String getTableColumnName() {
+        return tableColumnName;
+    }
+
+    public void setTableColumnName(String tableColumnName) {
+        this.tableColumnName = tableColumnName;
+    }
 
     public String getCssClass() {
         return cssClass;

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableColumnServiceImpl.java

@@ -125,6 +125,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
      */
     @Override
     public int insertGenTableColumn(GenTableColumn genTableColumn) {
+        genTableColumn.setTableColumnName(genTableColumn.getTableName()+"."+genTableColumn.getColumnName());
         int i = genTableColumnMapper.insertGenTableColumn(genTableColumn);
         List<GenTableColumn> list = new ArrayList<>();
         list.add(genTableColumn);

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -455,7 +455,7 @@ public class GenTableServiceImpl implements IGenTableService {
         //新增表成功的时候,新增字段公共字段
         int i = genTableMapper.insertGenTable(genTable);
         if (i > 0) {
-            Long id = insertCommonColumn(genTable.getId());
+            Long id = insertCommonColumn(genTable);
             if (id != -1) {
                 genTable.setTablePrimaryKey(id);
                 genTableMapper.updateGenTable(genTable);
@@ -474,14 +474,14 @@ public class GenTableServiceImpl implements IGenTableService {
     /**
      * 新建表时新增对应公共字段
      *
-     * @param tableId
+     * @param genTable
      */
-    public Long insertCommonColumn(Long tableId) {
+    public Long insertCommonColumn(GenTable genTable) {
         int num = 1000;
         GenTableColumn genTableColumnLog = new GenTableColumn();
         GenTableColumn genTableColumnBaseInfo = new GenTableColumn();
 
-        genTableColumnLog.setTableId(tableId);
+        genTableColumnLog.setTableId(genTable.getId());
         genTableColumnLog.setColumnName("log_info");
         genTableColumnLog.setColumnComment("日志信息");
         genTableColumnLog.setColumnType("varchar(255)");
@@ -494,10 +494,11 @@ public class GenTableServiceImpl implements IGenTableService {
         genTableColumnLog.setCreateBy("admin");
         genTableColumnLog.setHtmlType("HR");
         genTableColumnLog.setMask("000000");
+        genTableColumnLog.setTableColumnName(genTable.getTableName()+".log_info");
         genTableColumnLog.setCreateTime(DateUtils.getNowDate());
         genTableColumnMapper.insertGenTableColumn(genTableColumnLog);
 
-        genTableColumnBaseInfo.setTableId(tableId);
+        genTableColumnBaseInfo.setTableId(genTable.getId());
         genTableColumnBaseInfo.setColumnName("base_info");
         genTableColumnBaseInfo.setColumnComment("基本信息");
         genTableColumnBaseInfo.setColumnType("varchar(255)");
@@ -510,6 +511,7 @@ public class GenTableServiceImpl implements IGenTableService {
         genTableColumnBaseInfo.setCreateBy("admin");
         genTableColumnBaseInfo.setHtmlType("HR");
         genTableColumnBaseInfo.setMask("000000");
+        genTableColumnBaseInfo.setTableColumnName(genTable.getTableName()+".base_info");
         genTableColumnBaseInfo.setCreateTime(DateUtils.getNowDate());
         genTableColumnMapper.insertGenTableColumn(genTableColumnBaseInfo);
 
@@ -521,7 +523,7 @@ public class GenTableServiceImpl implements IGenTableService {
         String[] htmlType = new String[]{"input", "input", "datetime", "input", "datetime", "select"};
         for (int i = 0; i < columnName.length; i++) {
             GenTableColumn genTableColumn = new GenTableColumn();
-            genTableColumn.setTableId(tableId);
+            genTableColumn.setTableId(genTable.getId());
             genTableColumn.setColumnName(columnName[i]);
             genTableColumn.setColumnComment(columnComment[i]);
             genTableColumn.setColumnType(columnType[i]);
@@ -534,6 +536,7 @@ public class GenTableServiceImpl implements IGenTableService {
             genTableColumn.setCreateTime(DateUtils.getNowDate());
             genTableColumn.setHrParentId(genTableColumnLog.getId());
             genTableColumn.setMask("000000");
+            genTableColumn.setTableColumnName(genTable.getTableName()+"."+columnName[i]);
             if (i == 0) {
                 genTableColumn.setSort(1);
                 genTableColumn.setIsPk("1");

boman-modules/boman-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -38,10 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isIn"     column="is_in"    />
         <result property="isOut"     column="is_out"    />
         <result property="regular"     column="regular"    />
+        <result property="tableColumnName"     column="table_column_name"    />
     </resultMap>
 	
 	<sql id="selectGenTableColumnVo">
-        select id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, foreign_key, dict_type, sort, create_by, create_time, update_by, update_time, hr_parent_id, mask, default_value, num_rows, num_columns, field_translator, extended_attributes, is_in, is_out, regular from gen_table_column
+        select id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, foreign_key, dict_type, sort, create_by, create_time, update_by, update_time, hr_parent_id, mask, default_value, num_rows, num_columns, field_translator, extended_attributes, is_in, is_out, regular, table_column_name from gen_table_column
     </sql>
 	
     <select id="selectGenTableColumnListByTableId" parameterType="GenTableColumn" resultMap="GenTableColumnResult">
@@ -122,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="isIn != null and isIn != ''">is_in,</if>
 			<if test="isOut != null and isOut != ''">is_out,</if>
 			<if test="regular != null and regular != ''">regular,</if>
+			<if test="tableColumnName != null and tableColumnName != ''">table_column_name,</if>
 			create_time
          )values(
 			<if test="tableId != null and tableId != ''">#{tableId},</if>
@@ -153,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="isIn != null and isIn != ''">#{isIn},</if>
 			<if test="isOut != null and isOut != ''">#{isOut},</if>
 			<if test="regular != null and regular != ''">#{regular},</if>
+			<if test="tableColumnName != null and tableColumnName != ''">#{tableColumnName},</if>
 			sysdate()
          )
     </insert>