提交merge1.3

openhis-server-new/core-generator/src/main/java/com/core/generator/util/GenUtils.java

@@ -52,6 +52,9 @@ public class GenUtils {
             case "yb":
                 genTable.setPackageName(GenConfig.getPackageName() + ".ybcatalog");
                 break;
+            case "lab":
+                genTable.setPackageName(GenConfig.getPackageName() + ".lab");
+                break;
             default:
                 genTable.setPackageName(GenConfig.getPackageName() + ".errortable");
         }

openhis-server-new/core-generator/src/main/resources/generator.yml

@@ -7,4 +7,4 @@ gen:
   # 自动去除表前缀，默认是false
   autoRemovePre: true
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: cod_,adm_,cli_,dia_,med_,wor_,fin_,def_,doc_,yb_
+  tablePrefix: cod_,adm_,cli_,dia_,med_,wor_,fin_,def_,doc_,yb_,lab_

openhis-server-new/core-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -99,14 +99,15 @@
 
     <select id="selectDbTableList" parameterType="map" resultMap="GenTableResult">
         SELECT
-        T1.table_name,
-        T2.description AS table_comment
+        T1.table_name
+               --,
+        --T2.description AS table_comment
         -- 移除 create_time，因为它在 information_schema.tables 中通常不存在
         -- 移除 update_time，因为它在 information_schema.tables 中通常不存在
         FROM information_schema.tables T1
-        LEFT JOIN pg_description T2
-        ON T2.objsubid = 0
-        AND T2.objoid = T1.table_name::regclass::oid
+       -- LEFT JOIN pg_description T2
+       -- ON T2.objsubid = 0
+        --AND T2.objoid = T1.table_name::regclass::oid
         WHERE table_schema = current_schema()
         AND table_name NOT LIKE 'qrtz\_%'
         AND table_name NOT LIKE 'gen\_%'