From fbc03a864c8031d0004f703267c448b76c167950 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Mon, 21 Aug 2023 12:00:53 +0800
Subject: [PATCH] updates

---
 pom.xml                                       | 27 +++++++++++++++++++
 .../java/org/yangliu/codegenerate/Main.java   |  2 +-
 .../resources/yangliu/XXXEntityQueryVO.javai  |  7 +++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 61b705c..293a96c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,8 +72,35 @@
             <artifactId>fastjson</artifactId>
             <version>2.0.1</version>
         </dependency>
+
+        <!--<dependency>
+            <groupId>com.github.shibing624</groupId>
+            <artifactId>similarity</artifactId>
+            <version>1.1.6</version>
+        </dependency>-->
+
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>yangliu</id>
+            <name>yangliu Repository</name>
+            <url>http://106.14.42.180:8088/repository/yangliu/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+
+        <repository>
+            <id>aliyun</id>
+            <name>aliyun Repository</name>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
diff --git a/src/main/java/org/yangliu/codegenerate/Main.java b/src/main/java/org/yangliu/codegenerate/Main.java
index 68d71ae..0ad07ca 100644
--- a/src/main/java/org/yangliu/codegenerate/Main.java
+++ b/src/main/java/org/yangliu/codegenerate/Main.java
@@ -70,7 +70,7 @@ public class Main {
         String password = "Nomi1234";
             //2.选择表配置
         //String json="{\"oqc_spot_check_record\":\"抽检记录\",\"oqc_shipment_record\":\"成品出货记录\",\"oqc_1008_record\":\"1008仓台账\",\"oqc_after_sales_record\":\"售后记录\",\"oqc_special_sample\":\"特殊样件\",\"oqc_product_record\":\"产品追溯\",\"oqc_ncr_record\":\"NCR明细\",\"oqc_qrqc_record\":\"QRQC明细\"}";
-        String json="{\"oqc_b_product_warehouse_inspection\":\"B品仓检验\"}";
+        String json="{\"oqc_report_template_detail\":\"报告模板明细\"}";
         JSONObject tables = JSONObject.parseObject(json);
         for (String table : tables.keySet()) {
             String entityName = TableFieldUtil.tableNameToEntityName(table);
diff --git a/src/main/resources/yangliu/XXXEntityQueryVO.javai b/src/main/resources/yangliu/XXXEntityQueryVO.javai
index 8e4cae1..1d59ff2 100644
--- a/src/main/resources/yangliu/XXXEntityQueryVO.javai
+++ b/src/main/resources/yangliu/XXXEntityQueryVO.javai
@@ -23,9 +23,11 @@ import java.util.Date;
 @ApiModel(value="查询${entityName}对象", description="${tableVo.ftlDescription}")
 public class Query${entityName}VO implements Serializable{
     <#list originalColumns as po>
+<#if po.fieldName == 'creatorId' || po.fieldName == 'createBy' || po.fieldName == 'createTime' || po.fieldName == 'updaterId' || po.fieldName == 'updateBy' || po.fieldName == 'updateTime' || po.fieldName == 'tenantId'>
+<#else>
 	/**${po.fieldComment}*/
-	<#if po.fieldName == primaryKeyField>
-	<#else>
+    <#if po.fieldName == primaryKeyField>
+    <#else>
     <#if po.fieldType =='Date'>
 	<#if po.fieldDbType =='date'>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@@ -44,6 +46,7 @@ public class Query${entityName}VO implements Serializable{
     <#if po.fieldName == 'delFlag'>
     </#if>
 	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
+</#if>
 	</#list>
 	@ApiModelProperty(value = "批量选择参数")
 	private String ids;