24282 1 年之前
父节点
当前提交
fb4e7b7371

+ 4 - 3
my-test/src/main/java/org/example/join/domain/AbstractQueryColumn.java

@@ -173,9 +173,10 @@ public abstract class AbstractQueryColumn implements IFormat, IQueryColumn {
     }
 
     private AbstractQueryColumn compute(String symbol, Object obj) {
-        AbstractQueryColumn newQueryColumn = copy();
-        newQueryColumn.queryColumnComputeList.add(new QueryColumnCompute(symbol, obj));
-        return newQueryColumn;
+        AbstractQueryColumn queryColumn = copy();
+        queryColumn.queryColumnComputeList.addAll(queryColumnComputeList);
+        queryColumn.queryColumnComputeList.add(new QueryColumnCompute(symbol, obj));
+        return queryColumn;
     }
 
     protected String spliceCompute(String sql) {

+ 1 - 3
my-test/src/main/java/org/example/join/domain/QueryColumn.java

@@ -19,9 +19,7 @@ public class QueryColumn extends AbstractQueryColumn implements IFormat, IQueryC
 
     @Override
     protected QueryColumn copy() {
-        QueryColumn queryColumn = new QueryColumn(this.table, this.name);
-        queryColumn.queryColumnComputeList.addAll(queryColumnComputeList);
-        return queryColumn;
+        return new QueryColumn(this.table, this.name);
     }
 
     @Override

+ 7 - 3
my-test/src/main/java/org/example/join/domain/QueryColumnFunction.java

@@ -9,8 +9,14 @@ import java.util.StringJoiner;
 
 public class QueryColumnFunction extends AbstractQueryColumn implements IFormat, IQueryColumn {
 
+    /**
+     * 方法名
+     */
     private final String fnName;
 
+    /**
+     * 方法参数
+     */
     private final List<Object> columns;
 
     public QueryColumnFunction(String fnName, Object... columns) {
@@ -20,9 +26,7 @@ public class QueryColumnFunction extends AbstractQueryColumn implements IFormat,
 
     @Override
     protected QueryColumnFunction copy() {
-        QueryColumnFunction queryColumnFunction = new QueryColumnFunction(this.fnName, this.columns.toArray());
-        queryColumnFunction.queryColumnComputeList.addAll(queryColumnComputeList);
-        return queryColumnFunction;
+        return new QueryColumnFunction(this.fnName, this.columns.toArray());
     }
 
     @Override

+ 2 - 5
my-test/src/main/java/org/example/join/domain/Table.java

@@ -2,9 +2,11 @@ package org.example.join.domain;
 
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import org.example.join.sql.SqlContext;
 
 @Getter
+@RequiredArgsConstructor
 public class Table implements IFormat, ITable {
 
     private final String alias;
@@ -15,11 +17,6 @@ public class Table implements IFormat, ITable {
         this.name = name;
     }
 
-    public Table(String alias, String name) {
-        this.alias = alias;
-        this.name = name;
-    }
-
     @Override
     public String toSql() {
         return name + StringPool.SPACE + SqlContext.getTableAlias(this);