Browse Source

创建数据库

xiaoqiao 1 year ago
parent
commit
df2ffd4d82

File diff suppressed because it is too large
+ 231 - 161
lib/华北油田Ai检索.PDM


File diff suppressed because it is too large
+ 231 - 161
lib/华北油田Ai检索.pdb


+ 10 - 0
src/main/java/com/bowintek/practice/model/SrSubject.java

@@ -19,6 +19,8 @@ public class SrSubject {
 
     private Integer status;
 
+    private Integer isReferences;
+
     private String execSql;
 
     public String getSubId() {
@@ -85,6 +87,14 @@ public class SrSubject {
         this.status = status;
     }
 
+    public Integer getIsReferences() {
+        return isReferences;
+    }
+
+    public void setIsReferences(Integer isReferences) {
+        this.isReferences = isReferences;
+    }
+
     public String getExecSql() {
         return execSql;
     }

+ 60 - 0
src/main/java/com/bowintek/practice/model/SrSubjectExample.java

@@ -635,6 +635,66 @@ public class SrSubjectExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsReferencesIsNull() {
+            addCriterion("isReferences is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesIsNotNull() {
+            addCriterion("isReferences is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesEqualTo(Integer value) {
+            addCriterion("isReferences =", value, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesNotEqualTo(Integer value) {
+            addCriterion("isReferences <>", value, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesGreaterThan(Integer value) {
+            addCriterion("isReferences >", value, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesGreaterThanOrEqualTo(Integer value) {
+            addCriterion("isReferences >=", value, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesLessThan(Integer value) {
+            addCriterion("isReferences <", value, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesLessThanOrEqualTo(Integer value) {
+            addCriterion("isReferences <=", value, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesIn(List<Integer> values) {
+            addCriterion("isReferences in", values, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesNotIn(List<Integer> values) {
+            addCriterion("isReferences not in", values, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesBetween(Integer value1, Integer value2) {
+            addCriterion("isReferences between", value1, value2, "isReferences");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsReferencesNotBetween(Integer value1, Integer value2) {
+            addCriterion("isReferences not between", value1, value2, "isReferences");
+            return (Criteria) this;
+        }
+
         public Criteria andExecSqlIsNull() {
             addCriterion("execSql is null");
             return (Criteria) this;

+ 10 - 0
src/main/java/com/bowintek/practice/model/SrTempdimension.java

@@ -9,6 +9,8 @@ public class SrTempdimension {
 
     private Short disOrder;
 
+    private String fieldCode;
+
     private String fieldName;
 
     private String fieldAlias;
@@ -47,6 +49,14 @@ public class SrTempdimension {
         this.disOrder = disOrder;
     }
 
+    public String getFieldCode() {
+        return fieldCode;
+    }
+
+    public void setFieldCode(String fieldCode) {
+        this.fieldCode = fieldCode == null ? null : fieldCode.trim();
+    }
+
     public String getFieldName() {
         return fieldName;
     }

+ 70 - 0
src/main/java/com/bowintek/practice/model/SrTempdimensionExample.java

@@ -374,6 +374,76 @@ public class SrTempdimensionExample {
             return (Criteria) this;
         }
 
+        public Criteria andFieldCodeIsNull() {
+            addCriterion("fieldCode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeIsNotNull() {
+            addCriterion("fieldCode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeEqualTo(String value) {
+            addCriterion("fieldCode =", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotEqualTo(String value) {
+            addCriterion("fieldCode <>", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeGreaterThan(String value) {
+            addCriterion("fieldCode >", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("fieldCode >=", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLessThan(String value) {
+            addCriterion("fieldCode <", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLessThanOrEqualTo(String value) {
+            addCriterion("fieldCode <=", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLike(String value) {
+            addCriterion("fieldCode like", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotLike(String value) {
+            addCriterion("fieldCode not like", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeIn(List<String> values) {
+            addCriterion("fieldCode in", values, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotIn(List<String> values) {
+            addCriterion("fieldCode not in", values, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeBetween(String value1, String value2) {
+            addCriterion("fieldCode between", value1, value2, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotBetween(String value1, String value2) {
+            addCriterion("fieldCode not between", value1, value2, "fieldCode");
+            return (Criteria) this;
+        }
+
         public Criteria andFieldNameIsNull() {
             addCriterion("fieldName is null");
             return (Criteria) this;

+ 20 - 0
src/main/java/com/bowintek/practice/model/SrTempfield.java

@@ -13,12 +13,16 @@ public class SrTempfield {
 
     private Integer disOrder;
 
+    private String fieldCode;
+
     private String fieldName;
 
     private String fieldAlias;
 
     private String dataType;
 
+    private String operation;
+
     public String getTempFeildId() {
         return tempFeildId;
     }
@@ -67,6 +71,14 @@ public class SrTempfield {
         this.disOrder = disOrder;
     }
 
+    public String getFieldCode() {
+        return fieldCode;
+    }
+
+    public void setFieldCode(String fieldCode) {
+        this.fieldCode = fieldCode == null ? null : fieldCode.trim();
+    }
+
     public String getFieldName() {
         return fieldName;
     }
@@ -90,4 +102,12 @@ public class SrTempfield {
     public void setDataType(String dataType) {
         this.dataType = dataType == null ? null : dataType.trim();
     }
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation == null ? null : operation.trim();
+    }
 }

+ 140 - 0
src/main/java/com/bowintek/practice/model/SrTempfieldExample.java

@@ -514,6 +514,76 @@ public class SrTempfieldExample {
             return (Criteria) this;
         }
 
+        public Criteria andFieldCodeIsNull() {
+            addCriterion("fieldCode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeIsNotNull() {
+            addCriterion("fieldCode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeEqualTo(String value) {
+            addCriterion("fieldCode =", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotEqualTo(String value) {
+            addCriterion("fieldCode <>", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeGreaterThan(String value) {
+            addCriterion("fieldCode >", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("fieldCode >=", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLessThan(String value) {
+            addCriterion("fieldCode <", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLessThanOrEqualTo(String value) {
+            addCriterion("fieldCode <=", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLike(String value) {
+            addCriterion("fieldCode like", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotLike(String value) {
+            addCriterion("fieldCode not like", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeIn(List<String> values) {
+            addCriterion("fieldCode in", values, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotIn(List<String> values) {
+            addCriterion("fieldCode not in", values, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeBetween(String value1, String value2) {
+            addCriterion("fieldCode between", value1, value2, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotBetween(String value1, String value2) {
+            addCriterion("fieldCode not between", value1, value2, "fieldCode");
+            return (Criteria) this;
+        }
+
         public Criteria andFieldNameIsNull() {
             addCriterion("fieldName is null");
             return (Criteria) this;
@@ -723,6 +793,76 @@ public class SrTempfieldExample {
             addCriterion("dataType not between", value1, value2, "dataType");
             return (Criteria) this;
         }
+
+        public Criteria andOperationIsNull() {
+            addCriterion("operation is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationIsNotNull() {
+            addCriterion("operation is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationEqualTo(String value) {
+            addCriterion("operation =", value, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationNotEqualTo(String value) {
+            addCriterion("operation <>", value, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationGreaterThan(String value) {
+            addCriterion("operation >", value, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationGreaterThanOrEqualTo(String value) {
+            addCriterion("operation >=", value, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationLessThan(String value) {
+            addCriterion("operation <", value, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationLessThanOrEqualTo(String value) {
+            addCriterion("operation <=", value, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationLike(String value) {
+            addCriterion("operation like", value, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationNotLike(String value) {
+            addCriterion("operation not like", value, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationIn(List<String> values) {
+            addCriterion("operation in", values, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationNotIn(List<String> values) {
+            addCriterion("operation not in", values, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationBetween(String value1, String value2) {
+            addCriterion("operation between", value1, value2, "operation");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationNotBetween(String value1, String value2) {
+            addCriterion("operation not between", value1, value2, "operation");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 30 - 10
src/main/java/com/bowintek/practice/model/SrTempmeasure.java

@@ -7,17 +7,21 @@ public class SrTempmeasure {
 
     private String fieldId;
 
-    private String functionId;
+    private String functionName;
 
     private Short disOrder;
 
+    private String fieldCode;
+
     private String fieldName;
 
     private String fieldAlias;
 
     private String dataType;
 
-    private String renameColumn;
+    private String displayName;
+
+    private String operation;
 
     public String getTempFeildId() {
         return tempFeildId;
@@ -43,12 +47,12 @@ public class SrTempmeasure {
         this.fieldId = fieldId == null ? null : fieldId.trim();
     }
 
-    public String getFunctionId() {
-        return functionId;
+    public String getFunctionName() {
+        return functionName;
     }
 
-    public void setFunctionId(String functionId) {
-        this.functionId = functionId == null ? null : functionId.trim();
+    public void setFunctionName(String functionName) {
+        this.functionName = functionName == null ? null : functionName.trim();
     }
 
     public Short getDisOrder() {
@@ -59,6 +63,14 @@ public class SrTempmeasure {
         this.disOrder = disOrder;
     }
 
+    public String getFieldCode() {
+        return fieldCode;
+    }
+
+    public void setFieldCode(String fieldCode) {
+        this.fieldCode = fieldCode == null ? null : fieldCode.trim();
+    }
+
     public String getFieldName() {
         return fieldName;
     }
@@ -83,11 +95,19 @@ public class SrTempmeasure {
         this.dataType = dataType == null ? null : dataType.trim();
     }
 
-    public String getRenameColumn() {
-        return renameColumn;
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName == null ? null : displayName.trim();
+    }
+
+    public String getOperation() {
+        return operation;
     }
 
-    public void setRenameColumn(String renameColumn) {
-        this.renameColumn = renameColumn == null ? null : renameColumn.trim();
+    public void setOperation(String operation) {
+        this.operation = operation == null ? null : operation.trim();
     }
 }

+ 196 - 56
src/main/java/com/bowintek/practice/model/SrTempmeasureExample.java

@@ -314,73 +314,73 @@ public class SrTempmeasureExample {
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdIsNull() {
-            addCriterion("functionId is null");
+        public Criteria andFunctionNameIsNull() {
+            addCriterion("functionName is null");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdIsNotNull() {
-            addCriterion("functionId is not null");
+        public Criteria andFunctionNameIsNotNull() {
+            addCriterion("functionName is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdEqualTo(String value) {
-            addCriterion("functionId =", value, "functionId");
+        public Criteria andFunctionNameEqualTo(String value) {
+            addCriterion("functionName =", value, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdNotEqualTo(String value) {
-            addCriterion("functionId <>", value, "functionId");
+        public Criteria andFunctionNameNotEqualTo(String value) {
+            addCriterion("functionName <>", value, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdGreaterThan(String value) {
-            addCriterion("functionId >", value, "functionId");
+        public Criteria andFunctionNameGreaterThan(String value) {
+            addCriterion("functionName >", value, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdGreaterThanOrEqualTo(String value) {
-            addCriterion("functionId >=", value, "functionId");
+        public Criteria andFunctionNameGreaterThanOrEqualTo(String value) {
+            addCriterion("functionName >=", value, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdLessThan(String value) {
-            addCriterion("functionId <", value, "functionId");
+        public Criteria andFunctionNameLessThan(String value) {
+            addCriterion("functionName <", value, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdLessThanOrEqualTo(String value) {
-            addCriterion("functionId <=", value, "functionId");
+        public Criteria andFunctionNameLessThanOrEqualTo(String value) {
+            addCriterion("functionName <=", value, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdLike(String value) {
-            addCriterion("functionId like", value, "functionId");
+        public Criteria andFunctionNameLike(String value) {
+            addCriterion("functionName like", value, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdNotLike(String value) {
-            addCriterion("functionId not like", value, "functionId");
+        public Criteria andFunctionNameNotLike(String value) {
+            addCriterion("functionName not like", value, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdIn(List<String> values) {
-            addCriterion("functionId in", values, "functionId");
+        public Criteria andFunctionNameIn(List<String> values) {
+            addCriterion("functionName in", values, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdNotIn(List<String> values) {
-            addCriterion("functionId not in", values, "functionId");
+        public Criteria andFunctionNameNotIn(List<String> values) {
+            addCriterion("functionName not in", values, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdBetween(String value1, String value2) {
-            addCriterion("functionId between", value1, value2, "functionId");
+        public Criteria andFunctionNameBetween(String value1, String value2) {
+            addCriterion("functionName between", value1, value2, "functionName");
             return (Criteria) this;
         }
 
-        public Criteria andFunctionIdNotBetween(String value1, String value2) {
-            addCriterion("functionId not between", value1, value2, "functionId");
+        public Criteria andFunctionNameNotBetween(String value1, String value2) {
+            addCriterion("functionName not between", value1, value2, "functionName");
             return (Criteria) this;
         }
 
@@ -444,6 +444,76 @@ public class SrTempmeasureExample {
             return (Criteria) this;
         }
 
+        public Criteria andFieldCodeIsNull() {
+            addCriterion("fieldCode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeIsNotNull() {
+            addCriterion("fieldCode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeEqualTo(String value) {
+            addCriterion("fieldCode =", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotEqualTo(String value) {
+            addCriterion("fieldCode <>", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeGreaterThan(String value) {
+            addCriterion("fieldCode >", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("fieldCode >=", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLessThan(String value) {
+            addCriterion("fieldCode <", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLessThanOrEqualTo(String value) {
+            addCriterion("fieldCode <=", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeLike(String value) {
+            addCriterion("fieldCode like", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotLike(String value) {
+            addCriterion("fieldCode not like", value, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeIn(List<String> values) {
+            addCriterion("fieldCode in", values, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotIn(List<String> values) {
+            addCriterion("fieldCode not in", values, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeBetween(String value1, String value2) {
+            addCriterion("fieldCode between", value1, value2, "fieldCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andFieldCodeNotBetween(String value1, String value2) {
+            addCriterion("fieldCode not between", value1, value2, "fieldCode");
+            return (Criteria) this;
+        }
+
         public Criteria andFieldNameIsNull() {
             addCriterion("fieldName is null");
             return (Criteria) this;
@@ -654,73 +724,143 @@ public class SrTempmeasureExample {
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnIsNull() {
-            addCriterion("renameColumn is null");
+        public Criteria andDisplayNameIsNull() {
+            addCriterion("displayName is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameIsNotNull() {
+            addCriterion("displayName is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameEqualTo(String value) {
+            addCriterion("displayName =", value, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameNotEqualTo(String value) {
+            addCriterion("displayName <>", value, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameGreaterThan(String value) {
+            addCriterion("displayName >", value, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameGreaterThanOrEqualTo(String value) {
+            addCriterion("displayName >=", value, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameLessThan(String value) {
+            addCriterion("displayName <", value, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameLessThanOrEqualTo(String value) {
+            addCriterion("displayName <=", value, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameLike(String value) {
+            addCriterion("displayName like", value, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameNotLike(String value) {
+            addCriterion("displayName not like", value, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameIn(List<String> values) {
+            addCriterion("displayName in", values, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameNotIn(List<String> values) {
+            addCriterion("displayName not in", values, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameBetween(String value1, String value2) {
+            addCriterion("displayName between", value1, value2, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andDisplayNameNotBetween(String value1, String value2) {
+            addCriterion("displayName not between", value1, value2, "displayName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperationIsNull() {
+            addCriterion("operation is null");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnIsNotNull() {
-            addCriterion("renameColumn is not null");
+        public Criteria andOperationIsNotNull() {
+            addCriterion("operation is not null");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnEqualTo(String value) {
-            addCriterion("renameColumn =", value, "renameColumn");
+        public Criteria andOperationEqualTo(String value) {
+            addCriterion("operation =", value, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnNotEqualTo(String value) {
-            addCriterion("renameColumn <>", value, "renameColumn");
+        public Criteria andOperationNotEqualTo(String value) {
+            addCriterion("operation <>", value, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnGreaterThan(String value) {
-            addCriterion("renameColumn >", value, "renameColumn");
+        public Criteria andOperationGreaterThan(String value) {
+            addCriterion("operation >", value, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnGreaterThanOrEqualTo(String value) {
-            addCriterion("renameColumn >=", value, "renameColumn");
+        public Criteria andOperationGreaterThanOrEqualTo(String value) {
+            addCriterion("operation >=", value, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnLessThan(String value) {
-            addCriterion("renameColumn <", value, "renameColumn");
+        public Criteria andOperationLessThan(String value) {
+            addCriterion("operation <", value, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnLessThanOrEqualTo(String value) {
-            addCriterion("renameColumn <=", value, "renameColumn");
+        public Criteria andOperationLessThanOrEqualTo(String value) {
+            addCriterion("operation <=", value, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnLike(String value) {
-            addCriterion("renameColumn like", value, "renameColumn");
+        public Criteria andOperationLike(String value) {
+            addCriterion("operation like", value, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnNotLike(String value) {
-            addCriterion("renameColumn not like", value, "renameColumn");
+        public Criteria andOperationNotLike(String value) {
+            addCriterion("operation not like", value, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnIn(List<String> values) {
-            addCriterion("renameColumn in", values, "renameColumn");
+        public Criteria andOperationIn(List<String> values) {
+            addCriterion("operation in", values, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnNotIn(List<String> values) {
-            addCriterion("renameColumn not in", values, "renameColumn");
+        public Criteria andOperationNotIn(List<String> values) {
+            addCriterion("operation not in", values, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnBetween(String value1, String value2) {
-            addCriterion("renameColumn between", value1, value2, "renameColumn");
+        public Criteria andOperationBetween(String value1, String value2) {
+            addCriterion("operation between", value1, value2, "operation");
             return (Criteria) this;
         }
 
-        public Criteria andRenameColumnNotBetween(String value1, String value2) {
-            addCriterion("renameColumn not between", value1, value2, "renameColumn");
+        public Criteria andOperationNotBetween(String value1, String value2) {
+            addCriterion("operation not between", value1, value2, "operation");
             return (Criteria) this;
         }
     }

+ 21 - 5
src/main/resources/mapping/SrSubjectMapper.xml

@@ -10,6 +10,7 @@
     <result column="modiTime" jdbcType="TIMESTAMP" property="modiTime" />
     <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="isReferences" jdbcType="INTEGER" property="isReferences" />
     <result column="execSql" jdbcType="VARCHAR" property="execSql" />
   </resultMap>
   <sql id="Example_Where_Clause">
@@ -71,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    subId, tabCode, tabName, tabDesc, createTime, modiTime, createdBy, status, execSql
+    subId, tabCode, tabName, tabDesc, createTime, modiTime, createdBy, status, isReferences, 
+    execSql
   </sql>
   <select id="selectByExample" parameterType="com.bowintek.practice.model.SrSubjectExample" resultMap="BaseResultMap">
     select
@@ -106,12 +108,12 @@
   <insert id="insert" parameterType="com.bowintek.practice.model.SrSubject">
     insert into sr_subject (subId, tabCode, tabName, 
       tabDesc, createTime, modiTime, 
-      createdBy, status, execSql
-      )
+      createdBy, status, isReferences, 
+      execSql)
     values (#{subId,jdbcType=VARCHAR}, #{tabCode,jdbcType=VARCHAR}, #{tabName,jdbcType=VARCHAR}, 
       #{tabDesc,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modiTime,jdbcType=TIMESTAMP}, 
-      #{createdBy,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{execSql,jdbcType=VARCHAR}
-      )
+      #{createdBy,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{isReferences,jdbcType=INTEGER}, 
+      #{execSql,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bowintek.practice.model.SrSubject">
     insert into sr_subject
@@ -140,6 +142,9 @@
       <if test="status != null">
         status,
       </if>
+      <if test="isReferences != null">
+        isReferences,
+      </if>
       <if test="execSql != null">
         execSql,
       </if>
@@ -169,6 +174,9 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="isReferences != null">
+        #{isReferences,jdbcType=INTEGER},
+      </if>
       <if test="execSql != null">
         #{execSql,jdbcType=VARCHAR},
       </if>
@@ -207,6 +215,9 @@
       <if test="row.status != null">
         status = #{row.status,jdbcType=INTEGER},
       </if>
+      <if test="row.isReferences != null">
+        isReferences = #{row.isReferences,jdbcType=INTEGER},
+      </if>
       <if test="row.execSql != null">
         execSql = #{row.execSql,jdbcType=VARCHAR},
       </if>
@@ -225,6 +236,7 @@
       modiTime = #{row.modiTime,jdbcType=TIMESTAMP},
       createdBy = #{row.createdBy,jdbcType=VARCHAR},
       status = #{row.status,jdbcType=INTEGER},
+      isReferences = #{row.isReferences,jdbcType=INTEGER},
       execSql = #{row.execSql,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -254,6 +266,9 @@
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
+      <if test="isReferences != null">
+        isReferences = #{isReferences,jdbcType=INTEGER},
+      </if>
       <if test="execSql != null">
         execSql = #{execSql,jdbcType=VARCHAR},
       </if>
@@ -269,6 +284,7 @@
       modiTime = #{modiTime,jdbcType=TIMESTAMP},
       createdBy = #{createdBy,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
+      isReferences = #{isReferences,jdbcType=INTEGER},
       execSql = #{execSql,jdbcType=VARCHAR}
     where subId = #{subId,jdbcType=VARCHAR}
   </update>

+ 20 - 5
src/main/resources/mapping/SrTempdimensionMapper.xml

@@ -6,6 +6,7 @@
     <result column="tempId" jdbcType="VARCHAR" property="tempId" />
     <result column="fieldId" jdbcType="VARCHAR" property="fieldId" />
     <result column="disOrder" jdbcType="DECIMAL" property="disOrder" />
+    <result column="fieldCode" jdbcType="VARCHAR" property="fieldCode" />
     <result column="fieldName" jdbcType="VARCHAR" property="fieldName" />
     <result column="fieldAlias" jdbcType="VARCHAR" property="fieldAlias" />
     <result column="dataType" jdbcType="VARCHAR" property="dataType" />
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    tempFeildId, tempId, fieldId, disOrder, fieldName, fieldAlias, dataType
+    tempFeildId, tempId, fieldId, disOrder, fieldCode, fieldName, fieldAlias, dataType
   </sql>
   <select id="selectByExample" parameterType="com.bowintek.practice.model.SrTempdimensionExample" resultMap="BaseResultMap">
     select
@@ -103,11 +104,11 @@
   </delete>
   <insert id="insert" parameterType="com.bowintek.practice.model.SrTempdimension">
     insert into sr_tempdimension (tempFeildId, tempId, fieldId, 
-      disOrder, fieldName, fieldAlias, 
-      dataType)
+      disOrder, fieldCode, fieldName, 
+      fieldAlias, dataType)
     values (#{tempFeildId,jdbcType=VARCHAR}, #{tempId,jdbcType=VARCHAR}, #{fieldId,jdbcType=VARCHAR}, 
-      #{disOrder,jdbcType=DECIMAL}, #{fieldName,jdbcType=VARCHAR}, #{fieldAlias,jdbcType=VARCHAR}, 
-      #{dataType,jdbcType=VARCHAR})
+      #{disOrder,jdbcType=DECIMAL}, #{fieldCode,jdbcType=VARCHAR}, #{fieldName,jdbcType=VARCHAR}, 
+      #{fieldAlias,jdbcType=VARCHAR}, #{dataType,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bowintek.practice.model.SrTempdimension">
     insert into sr_tempdimension
@@ -124,6 +125,9 @@
       <if test="disOrder != null">
         disOrder,
       </if>
+      <if test="fieldCode != null">
+        fieldCode,
+      </if>
       <if test="fieldName != null">
         fieldName,
       </if>
@@ -147,6 +151,9 @@
       <if test="disOrder != null">
         #{disOrder,jdbcType=DECIMAL},
       </if>
+      <if test="fieldCode != null">
+        #{fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="fieldName != null">
         #{fieldName,jdbcType=VARCHAR},
       </if>
@@ -179,6 +186,9 @@
       <if test="row.disOrder != null">
         disOrder = #{row.disOrder,jdbcType=DECIMAL},
       </if>
+      <if test="row.fieldCode != null">
+        fieldCode = #{row.fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="row.fieldName != null">
         fieldName = #{row.fieldName,jdbcType=VARCHAR},
       </if>
@@ -199,6 +209,7 @@
       tempId = #{row.tempId,jdbcType=VARCHAR},
       fieldId = #{row.fieldId,jdbcType=VARCHAR},
       disOrder = #{row.disOrder,jdbcType=DECIMAL},
+      fieldCode = #{row.fieldCode,jdbcType=VARCHAR},
       fieldName = #{row.fieldName,jdbcType=VARCHAR},
       fieldAlias = #{row.fieldAlias,jdbcType=VARCHAR},
       dataType = #{row.dataType,jdbcType=VARCHAR}
@@ -218,6 +229,9 @@
       <if test="disOrder != null">
         disOrder = #{disOrder,jdbcType=DECIMAL},
       </if>
+      <if test="fieldCode != null">
+        fieldCode = #{fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="fieldName != null">
         fieldName = #{fieldName,jdbcType=VARCHAR},
       </if>
@@ -235,6 +249,7 @@
     set tempId = #{tempId,jdbcType=VARCHAR},
       fieldId = #{fieldId,jdbcType=VARCHAR},
       disOrder = #{disOrder,jdbcType=DECIMAL},
+      fieldCode = #{fieldCode,jdbcType=VARCHAR},
       fieldName = #{fieldName,jdbcType=VARCHAR},
       fieldAlias = #{fieldAlias,jdbcType=VARCHAR},
       dataType = #{dataType,jdbcType=VARCHAR}

+ 38 - 7
src/main/resources/mapping/SrTempfieldMapper.xml

@@ -8,9 +8,11 @@
     <result column="value1" jdbcType="VARCHAR" property="value1" />
     <result column="value2" jdbcType="VARCHAR" property="value2" />
     <result column="disOrder" jdbcType="INTEGER" property="disOrder" />
+    <result column="fieldCode" jdbcType="VARCHAR" property="fieldCode" />
     <result column="fieldName" jdbcType="VARCHAR" property="fieldName" />
     <result column="fieldAlias" jdbcType="VARCHAR" property="fieldAlias" />
     <result column="dataType" jdbcType="VARCHAR" property="dataType" />
+    <result column="operation" jdbcType="VARCHAR" property="operation" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,7 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    tempFeildId, tempId, fieldId, value1, value2, disOrder, fieldName, fieldAlias, dataType
+    tempFeildId, tempId, fieldId, value1, value2, disOrder, fieldCode, fieldName, fieldAlias, 
+    dataType, operation
   </sql>
   <select id="selectByExample" parameterType="com.bowintek.practice.model.SrTempfieldExample" resultMap="BaseResultMap">
     select
@@ -106,12 +109,12 @@
   <insert id="insert" parameterType="com.bowintek.practice.model.SrTempfield">
     insert into sr_tempfield (tempFeildId, tempId, fieldId, 
       value1, value2, disOrder, 
-      fieldName, fieldAlias, dataType
-      )
+      fieldCode, fieldName, fieldAlias, 
+      dataType, operation)
     values (#{tempFeildId,jdbcType=VARCHAR}, #{tempId,jdbcType=VARCHAR}, #{fieldId,jdbcType=VARCHAR}, 
       #{value1,jdbcType=VARCHAR}, #{value2,jdbcType=VARCHAR}, #{disOrder,jdbcType=INTEGER}, 
-      #{fieldName,jdbcType=VARCHAR}, #{fieldAlias,jdbcType=VARCHAR}, #{dataType,jdbcType=VARCHAR}
-      )
+      #{fieldCode,jdbcType=VARCHAR}, #{fieldName,jdbcType=VARCHAR}, #{fieldAlias,jdbcType=VARCHAR}, 
+      #{dataType,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bowintek.practice.model.SrTempfield">
     insert into sr_tempfield
@@ -134,6 +137,9 @@
       <if test="disOrder != null">
         disOrder,
       </if>
+      <if test="fieldCode != null">
+        fieldCode,
+      </if>
       <if test="fieldName != null">
         fieldName,
       </if>
@@ -143,6 +149,9 @@
       <if test="dataType != null">
         dataType,
       </if>
+      <if test="operation != null">
+        operation,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="tempFeildId != null">
@@ -163,6 +172,9 @@
       <if test="disOrder != null">
         #{disOrder,jdbcType=INTEGER},
       </if>
+      <if test="fieldCode != null">
+        #{fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="fieldName != null">
         #{fieldName,jdbcType=VARCHAR},
       </if>
@@ -172,6 +184,9 @@
       <if test="dataType != null">
         #{dataType,jdbcType=VARCHAR},
       </if>
+      <if test="operation != null">
+        #{operation,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bowintek.practice.model.SrTempfieldExample" resultType="java.lang.Long">
@@ -201,6 +216,9 @@
       <if test="row.disOrder != null">
         disOrder = #{row.disOrder,jdbcType=INTEGER},
       </if>
+      <if test="row.fieldCode != null">
+        fieldCode = #{row.fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="row.fieldName != null">
         fieldName = #{row.fieldName,jdbcType=VARCHAR},
       </if>
@@ -210,6 +228,9 @@
       <if test="row.dataType != null">
         dataType = #{row.dataType,jdbcType=VARCHAR},
       </if>
+      <if test="row.operation != null">
+        operation = #{row.operation,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -223,9 +244,11 @@
       value1 = #{row.value1,jdbcType=VARCHAR},
       value2 = #{row.value2,jdbcType=VARCHAR},
       disOrder = #{row.disOrder,jdbcType=INTEGER},
+      fieldCode = #{row.fieldCode,jdbcType=VARCHAR},
       fieldName = #{row.fieldName,jdbcType=VARCHAR},
       fieldAlias = #{row.fieldAlias,jdbcType=VARCHAR},
-      dataType = #{row.dataType,jdbcType=VARCHAR}
+      dataType = #{row.dataType,jdbcType=VARCHAR},
+      operation = #{row.operation,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -248,6 +271,9 @@
       <if test="disOrder != null">
         disOrder = #{disOrder,jdbcType=INTEGER},
       </if>
+      <if test="fieldCode != null">
+        fieldCode = #{fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="fieldName != null">
         fieldName = #{fieldName,jdbcType=VARCHAR},
       </if>
@@ -257,6 +283,9 @@
       <if test="dataType != null">
         dataType = #{dataType,jdbcType=VARCHAR},
       </if>
+      <if test="operation != null">
+        operation = #{operation,jdbcType=VARCHAR},
+      </if>
     </set>
     where tempFeildId = #{tempFeildId,jdbcType=VARCHAR}
   </update>
@@ -267,9 +296,11 @@
       value1 = #{value1,jdbcType=VARCHAR},
       value2 = #{value2,jdbcType=VARCHAR},
       disOrder = #{disOrder,jdbcType=INTEGER},
+      fieldCode = #{fieldCode,jdbcType=VARCHAR},
       fieldName = #{fieldName,jdbcType=VARCHAR},
       fieldAlias = #{fieldAlias,jdbcType=VARCHAR},
-      dataType = #{dataType,jdbcType=VARCHAR}
+      dataType = #{dataType,jdbcType=VARCHAR},
+      operation = #{operation,jdbcType=VARCHAR}
     where tempFeildId = #{tempFeildId,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 60 - 30
src/main/resources/mapping/SrTempmeasureMapper.xml

@@ -5,12 +5,14 @@
     <id column="tempFeildId" jdbcType="VARCHAR" property="tempFeildId" />
     <result column="tempId" jdbcType="VARCHAR" property="tempId" />
     <result column="fieldId" jdbcType="VARCHAR" property="fieldId" />
-    <result column="functionId" jdbcType="VARCHAR" property="functionId" />
+    <result column="functionName" jdbcType="VARCHAR" property="functionName" />
     <result column="disOrder" jdbcType="DECIMAL" property="disOrder" />
+    <result column="fieldCode" jdbcType="VARCHAR" property="fieldCode" />
     <result column="fieldName" jdbcType="VARCHAR" property="fieldName" />
     <result column="fieldAlias" jdbcType="VARCHAR" property="fieldAlias" />
     <result column="dataType" jdbcType="VARCHAR" property="dataType" />
-    <result column="renameColumn" jdbcType="VARCHAR" property="renameColumn" />
+    <result column="displayName" jdbcType="VARCHAR" property="displayName" />
+    <result column="operation" jdbcType="VARCHAR" property="operation" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,8 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    tempFeildId, tempId, fieldId, functionId, disOrder, fieldName, fieldAlias, dataType, 
-    renameColumn
+    tempFeildId, tempId, fieldId, functionName, disOrder, fieldCode, fieldName, fieldAlias, 
+    dataType, displayName, operation
   </sql>
   <select id="selectByExample" parameterType="com.bowintek.practice.model.SrTempmeasureExample" resultMap="BaseResultMap">
     select
@@ -106,13 +108,13 @@
   </delete>
   <insert id="insert" parameterType="com.bowintek.practice.model.SrTempmeasure">
     insert into sr_tempmeasure (tempFeildId, tempId, fieldId, 
-      functionId, disOrder, fieldName, 
-      fieldAlias, dataType, renameColumn
-      )
+      functionName, disOrder, fieldCode, 
+      fieldName, fieldAlias, dataType, 
+      displayName, operation)
     values (#{tempFeildId,jdbcType=VARCHAR}, #{tempId,jdbcType=VARCHAR}, #{fieldId,jdbcType=VARCHAR}, 
-      #{functionId,jdbcType=VARCHAR}, #{disOrder,jdbcType=DECIMAL}, #{fieldName,jdbcType=VARCHAR}, 
-      #{fieldAlias,jdbcType=VARCHAR}, #{dataType,jdbcType=VARCHAR}, #{renameColumn,jdbcType=VARCHAR}
-      )
+      #{functionName,jdbcType=VARCHAR}, #{disOrder,jdbcType=DECIMAL}, #{fieldCode,jdbcType=VARCHAR}, 
+      #{fieldName,jdbcType=VARCHAR}, #{fieldAlias,jdbcType=VARCHAR}, #{dataType,jdbcType=VARCHAR}, 
+      #{displayName,jdbcType=VARCHAR}, #{operation,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bowintek.practice.model.SrTempmeasure">
     insert into sr_tempmeasure
@@ -126,12 +128,15 @@
       <if test="fieldId != null">
         fieldId,
       </if>
-      <if test="functionId != null">
-        functionId,
+      <if test="functionName != null">
+        functionName,
       </if>
       <if test="disOrder != null">
         disOrder,
       </if>
+      <if test="fieldCode != null">
+        fieldCode,
+      </if>
       <if test="fieldName != null">
         fieldName,
       </if>
@@ -141,8 +146,11 @@
       <if test="dataType != null">
         dataType,
       </if>
-      <if test="renameColumn != null">
-        renameColumn,
+      <if test="displayName != null">
+        displayName,
+      </if>
+      <if test="operation != null">
+        operation,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -155,12 +163,15 @@
       <if test="fieldId != null">
         #{fieldId,jdbcType=VARCHAR},
       </if>
-      <if test="functionId != null">
-        #{functionId,jdbcType=VARCHAR},
+      <if test="functionName != null">
+        #{functionName,jdbcType=VARCHAR},
       </if>
       <if test="disOrder != null">
         #{disOrder,jdbcType=DECIMAL},
       </if>
+      <if test="fieldCode != null">
+        #{fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="fieldName != null">
         #{fieldName,jdbcType=VARCHAR},
       </if>
@@ -170,8 +181,11 @@
       <if test="dataType != null">
         #{dataType,jdbcType=VARCHAR},
       </if>
-      <if test="renameColumn != null">
-        #{renameColumn,jdbcType=VARCHAR},
+      <if test="displayName != null">
+        #{displayName,jdbcType=VARCHAR},
+      </if>
+      <if test="operation != null">
+        #{operation,jdbcType=VARCHAR},
       </if>
     </trim>
   </insert>
@@ -193,12 +207,15 @@
       <if test="row.fieldId != null">
         fieldId = #{row.fieldId,jdbcType=VARCHAR},
       </if>
-      <if test="row.functionId != null">
-        functionId = #{row.functionId,jdbcType=VARCHAR},
+      <if test="row.functionName != null">
+        functionName = #{row.functionName,jdbcType=VARCHAR},
       </if>
       <if test="row.disOrder != null">
         disOrder = #{row.disOrder,jdbcType=DECIMAL},
       </if>
+      <if test="row.fieldCode != null">
+        fieldCode = #{row.fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="row.fieldName != null">
         fieldName = #{row.fieldName,jdbcType=VARCHAR},
       </if>
@@ -208,8 +225,11 @@
       <if test="row.dataType != null">
         dataType = #{row.dataType,jdbcType=VARCHAR},
       </if>
-      <if test="row.renameColumn != null">
-        renameColumn = #{row.renameColumn,jdbcType=VARCHAR},
+      <if test="row.displayName != null">
+        displayName = #{row.displayName,jdbcType=VARCHAR},
+      </if>
+      <if test="row.operation != null">
+        operation = #{row.operation,jdbcType=VARCHAR},
       </if>
     </set>
     <if test="example != null">
@@ -221,12 +241,14 @@
     set tempFeildId = #{row.tempFeildId,jdbcType=VARCHAR},
       tempId = #{row.tempId,jdbcType=VARCHAR},
       fieldId = #{row.fieldId,jdbcType=VARCHAR},
-      functionId = #{row.functionId,jdbcType=VARCHAR},
+      functionName = #{row.functionName,jdbcType=VARCHAR},
       disOrder = #{row.disOrder,jdbcType=DECIMAL},
+      fieldCode = #{row.fieldCode,jdbcType=VARCHAR},
       fieldName = #{row.fieldName,jdbcType=VARCHAR},
       fieldAlias = #{row.fieldAlias,jdbcType=VARCHAR},
       dataType = #{row.dataType,jdbcType=VARCHAR},
-      renameColumn = #{row.renameColumn,jdbcType=VARCHAR}
+      displayName = #{row.displayName,jdbcType=VARCHAR},
+      operation = #{row.operation,jdbcType=VARCHAR}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -240,12 +262,15 @@
       <if test="fieldId != null">
         fieldId = #{fieldId,jdbcType=VARCHAR},
       </if>
-      <if test="functionId != null">
-        functionId = #{functionId,jdbcType=VARCHAR},
+      <if test="functionName != null">
+        functionName = #{functionName,jdbcType=VARCHAR},
       </if>
       <if test="disOrder != null">
         disOrder = #{disOrder,jdbcType=DECIMAL},
       </if>
+      <if test="fieldCode != null">
+        fieldCode = #{fieldCode,jdbcType=VARCHAR},
+      </if>
       <if test="fieldName != null">
         fieldName = #{fieldName,jdbcType=VARCHAR},
       </if>
@@ -255,8 +280,11 @@
       <if test="dataType != null">
         dataType = #{dataType,jdbcType=VARCHAR},
       </if>
-      <if test="renameColumn != null">
-        renameColumn = #{renameColumn,jdbcType=VARCHAR},
+      <if test="displayName != null">
+        displayName = #{displayName,jdbcType=VARCHAR},
+      </if>
+      <if test="operation != null">
+        operation = #{operation,jdbcType=VARCHAR},
       </if>
     </set>
     where tempFeildId = #{tempFeildId,jdbcType=VARCHAR}
@@ -265,12 +293,14 @@
     update sr_tempmeasure
     set tempId = #{tempId,jdbcType=VARCHAR},
       fieldId = #{fieldId,jdbcType=VARCHAR},
-      functionId = #{functionId,jdbcType=VARCHAR},
+      functionName = #{functionName,jdbcType=VARCHAR},
       disOrder = #{disOrder,jdbcType=DECIMAL},
+      fieldCode = #{fieldCode,jdbcType=VARCHAR},
       fieldName = #{fieldName,jdbcType=VARCHAR},
       fieldAlias = #{fieldAlias,jdbcType=VARCHAR},
       dataType = #{dataType,jdbcType=VARCHAR},
-      renameColumn = #{renameColumn,jdbcType=VARCHAR}
+      displayName = #{displayName,jdbcType=VARCHAR},
+      operation = #{operation,jdbcType=VARCHAR}
     where tempFeildId = #{tempFeildId,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 70 - 0
vue/src/views/subject/detail.vue

@@ -0,0 +1,70 @@
+<template>
+  <div class="card-edit">
+    <a-divider orientation="left">学校信息</a-divider>
+    <a-descriptions title="" bordered>
+      <a-descriptions-item   :labelStyle="{'width':'12%'}" :contentStyle="{'width':'21%'}"  label="实习学年"> {{ dataModel.schoolYear }}</a-descriptions-item>
+      <a-descriptions-item  :labelStyle="{'width':'12%'}" :contentStyle="{'width':'21%'}"  label="专业"> {{ dataModel.majorGradeName }}</a-descriptions-item>
+      <a-descriptions-item  :labelStyle="{'width':'12%'}" :contentStyle="{'width':'21%'}"  label="基地类型"> {{ dataModel.practiceBaseTypeName }}</a-descriptions-item>
+    </a-descriptions>
+    <a-divider orientation="left">岗位信息</a-divider>
+    <a-descriptions title="" bordered>
+      <a-descriptions-item :labelStyle="{'width':'12%'}" :contentStyle="{'width':'21%'}"  label="单位" > {{ dataModel.practiceBaseName }}</a-descriptions-item>
+      <a-descriptions-item  :labelStyle="{'width':'12%'}" :contentStyle="{'width':'21%'}"  label="岗位名称"> {{ dataModel.name }}</a-descriptions-item>
+      <a-descriptions-item  :labelStyle="{'width':'12%'}" :contentStyle="{'width':'21%'}"  label="岗位数量"> {{ dataModel.qty }}</a-descriptions-item>
+    </a-descriptions>
+    <a-divider orientation="left">备注</a-divider>
+    <a-descriptions title="" bordered>
+      <a-descriptions-item  :labelStyle="{'width':'12%'}"  label="备注"> {{ dataModel.remark }}</a-descriptions-item>
+    </a-descriptions>
+    <a-form-item class="buttom-btns">
+      <a-button @click="onClose">关闭</a-button>
+    </a-form-item>
+  </div>
+</template>
+<script  lang="ts">
+import { ref,defineComponent} from 'vue';
+import {get} from "@/api/common";
+import {useTabsViewStore} from "@/store/modules/tabsView";
+import dayjs from "dayjs";
+
+export default defineComponent({
+  name: 'positiondetail',
+  setup() {
+    const tabsViewStore = useTabsViewStore();
+    const dataModel = ref({
+      schoolYearID: "",
+      majorGradeID: "",
+      practiceBaseTypeID: "",
+      practiceBaseID: "",
+      name: null,
+      qty: null,
+      remark: "",
+      practiceBaseName:"",
+      schoolYear:"",
+      practiceBaseTypeName:""
+    });
+    const loadData = async (id) => {
+      const reqData = await get('position/getPosition', {positionID: id});
+      (dataModel.value as any) = reqData;
+    }
+    loadData( history.state.params?.id);
+
+    const onClose = () => {
+      tabsViewStore.addTabByPath("/position/list",{});
+    };
+
+    return {
+      loadData,
+      onClose,
+      dataModel,
+      dayjs
+    };
+  },
+  created() {
+    const id = history.state.params?.id;
+    const approveKeyID =ref( history.state.params?.approveKeyID);
+    this.loadData(id ? id : approveKeyID.value);
+  }
+});
+</script>
+

+ 175 - 0
vue/src/views/subject/edit.vue

@@ -0,0 +1,175 @@
+<template>
+  <div class="card-edit">
+    <Form :model="formState" @finish="onFinish" autocomplete="off">
+      <a-divider orientation="left">学校信息</a-divider>
+      <Row :gutter="[16,8]">
+        <Col :span="8">
+          <a-form-item label="实习学年" :label-col="{span:6}" name="schoolYearID"
+                       :rules="[{ required: true, message: '请选择学年!' }]">
+            <a-select
+              ref="select" style="width: 200px"
+              v-model:value="formState.schoolYearID"
+              :options="schoolYearList"
+              :field-names="{label:'schoolYear',value:'schoolYearID'}"
+            >
+            </a-select>
+          </a-form-item>
+        </Col>
+        <a-col :span="8">
+          <a-form-item label="专业" :label-col="{span:6}" name="majorGradeID"
+                       :rules="[{ required: true, message: '请选择专业!' }]">
+            <a-select style="width: 200px"
+                      ref="select" show-search :filter-option="filterOption"
+                      v-model:value="formState.majorGradeID"
+                      :options="majorGradeList"
+                      :field-names="{label:'name',value:'majorGradeID'}"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="8">
+          <a-form-item label="基地类型" :label-col="{span:6}" name="practiceBaseTypeID"
+                       :rules="[{ required: true, message: '请选择基地类型!' }]">
+            <a-select style="width: 200px"
+                      ref="select"
+                      v-model:value="formState.practiceBaseTypeID"
+                      :options="practiceBaseTypeList" @change="loadPracticebaseList"
+                      :field-names="{label:'name',value:'value'}"
+            >
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </Row>
+      <a-divider orientation="left">岗位信息</a-divider>
+      <Row :gutter="[16,8]">
+        <Col :span="8">
+          <a-form-item label="单位" :label-col="{span:6}" name="practiceBaseID"
+                       :rules="[{ required: true, message: '请选择单位!' }]">
+            <a-select
+              ref="select" show-search :filter-option="filterOption"
+              v-model:value="formState.practiceBaseID"
+              :options="practicebaseList"
+              :field-names="{label:'name',value:'practiceBaseID'}"
+            >
+            </a-select>
+          </a-form-item>
+        </Col>
+        <Col :span="8">
+          <a-form-item :label-col="{span:6}" :rules="[{ required: true, message: '岗位名称为空!' }]" label="岗位名称" name="name">
+            <a-input v-model:value="formState.name" class="form-input">
+            </a-input>
+          </a-form-item>
+        </Col>
+        <Col :span="8">
+          <a-form-item :label-col="{span:6}" :rules="[{ required: true, message: '岗位数量为空!' }]" label="岗位数量" name="qty">
+            <a-input-number v-model:value="formState.qty" class="form-input">
+            </a-input-number>
+          </a-form-item>
+        </Col>
+      </Row>
+      <Row>
+        <Col class="table-bottom-a1">
+          <a-textarea v-model:value="formState.remark" placeholder="备注" :rows="5"/>
+        </Col>
+      </Row>
+      <Row>
+        <Col :span="24" style="text-align: right;margin: 20px;">
+          <Space>
+            <a-button type="primary" html-type="submit">提交</a-button>
+          </Space>
+        </Col>
+      </Row>
+    </Form>
+  </div>
+</template>
+
+<script  lang="ts">
+import {Form, Row, Col, Space} from 'ant-design-vue';
+import type {SelectProps} from 'ant-design-vue';
+import {ref,defineComponent} from "vue";
+import { useRoute} from 'vue-router';
+import {getDictionaryItemList, getMajorGradeList, getSchoolyearList} from "@/api/system/dictionary";
+import {get, save} from "@/api/common";
+import {useTabsViewStore} from "@/store/modules/tabsView";
+import BUploadFile from "@/components/file/uploadFile.vue";
+import Approve from "@/components/basic/approve/Approve.vue";
+import BApproveList from "@/components/basic/approve/ApproveList.vue";
+
+export default defineComponent({
+  name: 'positionedit',
+  components: {BUploadFile, Approve, BApproveList,Form, Row, Col, Space},
+  setup() {
+
+    const route = useRoute();
+    const tabsViewStore = useTabsViewStore();
+    const schoolYearList = ref<SelectProps['options']>();
+    const majorGradeList = ref<SelectProps['options']>();
+    const practiceBaseTypeList = ref<SelectProps['options']>();
+    const practicebaseList = ref<SelectProps['options']>();
+
+    const formState = ref({
+      schoolYearID: "",
+      majorGradeID: "",
+      practiceBaseTypeID: "",
+      practiceBaseID: "",
+      name: null,
+      qty: null,
+      remark: "",
+    });
+
+    getDictionaryItemList({code: "PracticeBaseType"}).then(x => {
+      practiceBaseTypeList.value = x.filter(f => f.value != 3);
+    })
+    getSchoolyearList().then(data => {
+      schoolYearList.value = data;
+    });
+
+    getMajorGradeList(formState.value.schoolYearID).then(data => {
+      majorGradeList.value = data;
+    });
+    const loadPracticebaseList = () => {
+      formState.value.practiceBaseID = "";
+      getPracticebaseList();
+    }
+    const getPracticebaseList = async function () {
+
+      if (formState.value.practiceBaseTypeID) {
+        const result: any = await get('practicebase/practicebase/getList', {
+          page: 1, rows: 999,
+          practiceBaseTypeID: formState.value.practiceBaseTypeID,
+          recordStatus: 1
+        });
+        practicebaseList.value = result.list;
+      }
+    }
+    const filterOption = (input: string, option: any) => {
+      return option.name.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    };
+
+    const loadData = async (id) => {
+      const reqData = await get('position/getPosition', {positionID: id});
+      (formState.value as any) = reqData;
+      getPracticebaseList();
+    }
+
+    const onFinish = () => {
+      save('position/savePosition', formState.value).then(result => {
+        if (result) {
+          tabsViewStore.addTabByPath('/position/list', {reload: 1});
+        }
+      });
+    };
+
+    return {
+      route, formState,tabsViewStore, schoolYearList, filterOption,majorGradeList,practiceBaseTypeList,practicebaseList,
+      loadPracticebaseList,
+      onFinish, loadData
+    };
+  },
+  created() {
+    if (history.state.params?.id ) {
+      this.loadData( history.state.params?.id);
+    }
+  }
+});
+</script>

+ 287 - 0
vue/src/views/subject/index.vue

@@ -0,0 +1,287 @@
+<template>
+  <div class="card-search">
+    <a-form
+      ref="formRef"
+      name="advanced_search"
+      class="ant-advanced-search-form"
+      :model="formState"
+      @finish="onFinish"
+    >
+      <a-row :gutter="24">
+        <a-col :span="6">
+          <a-form-item
+            name="practiceBaseName"
+            label="单位名称"
+            :label-col="{span:6}">
+            <a-input v-model:value="formState.practiceBaseName" style="width: 200px"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item
+            name="name"
+            label="岗位名称"
+            :label-col="{span:6}">
+            <a-input v-model:value="formState.name" style="width: 200px"></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :span="6">
+          <a-form-item
+            name="schoolYearID"
+            label="学年"
+            :label-col="{span:6}">
+            <a-select v-model:value="formState.schoolYearID"
+                      style="width: 200px" :allowClear="true"    ref="select"
+                      :options="schoolYearList">
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col  :span="6" style="text-align: left">
+          <a-button type="primary" html-type="submit" @click="onFinish">查询</a-button>
+          <a-button style="margin: 0 8px" @click="() => {formRef.resetFields();loadData()}">重置</a-button>
+          <a style="font-size: 12px" @click="expand = !expand">
+            <template v-if="expand">
+              <UpOutlined/>
+            </template>
+            <template v-else>
+              <DownOutlined/>
+            </template>
+            展开
+          </a>
+        </a-col>
+        <a-col v-show="expand" :span="6">
+          <a-form-item
+            name="majorGradeID"
+            label="年级专业"
+            :label-col="{span:6}">
+            <a-select v-model:value="formState.majorGradeID"  show-search :filter-option="filterOption"
+                      style="width: 200px" :allowClear="true"
+                      :options="majorGradeList"
+                      @change="loadData">
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col v-show="expand" :span="6">
+          <a-form-item
+            name="practiceBaseTypeID"
+            label="基地类型"
+            :label-col="{span:6}">
+            <a-select v-model:value="formState.practiceBaseTypeID"
+                      style="width: 200px" :allowClear="true"
+                      :options="practiceBaseTypeList"
+                      @change="loadData">
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row class="edit-operation">
+        <a-col :span="24" style="text-align: right">
+          <a-button type="primary" html-type="button" @click="add" functioncode="T010601">新增</a-button>
+          <BImportExcel :options="importOptions" @success="loadData" functioncode="T010602"></BImportExcel>
+          <BExportExcel :title="'导出'" :filename="'岗位信息'" :url="'position/getList'"
+                        :params="{...formState, isExport: true,rows:100000,positionIdList:selectedRowKeys.join(',')}"></BExportExcel>
+          <a-popconfirm placement="leftTop"
+            title="是否删除数据?"
+            @confirm="onDelete()">
+            <a-button type="primary" style="margin: 0 8px" html-type="button" functioncode="T010604">删除</a-button>
+          </a-popconfirm>
+        </a-col>
+      </a-row>
+    </a-form>
+    <div class="search-result-list">
+      <a-table :columns="columns" :data-source="data" :scroll="{ x:'100%', y: 500 }" :pagination="pagination"
+               :loading="loading"
+               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+               @change="handleTableChange" :row-key="record=>record.positionID"
+               bordered>
+        <template #bodyCell="{ column,record }">
+          <template v-if="column.key === 'operation'">
+            <a-button type="link" size="small" @click="detail(record.positionID)">查看
+            </a-button>
+            <a-button type="link" size="small" @click="edit(record.positionID)" functioncode="T010603">编辑
+            </a-button>
+          </template>
+        </template>
+      </a-table>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import {reactive, ref, defineComponent, computed} from 'vue';
+import type {FormInstance} from 'ant-design-vue';
+import type {TableColumnsType, TableProps,SelectProps} from 'ant-design-vue';
+import { get, postdel} from '@/api/common';
+import {useRoute, useRouter} from "vue-router";
+import {useTabsViewStore} from "@/store/modules/tabsView";
+import {getDictionaryItemList, getMajorGradeList, getSchoolyearList} from "@/api/system/dictionary";
+import {message} from "ant-design-vue";
+import {DownOutlined, UpOutlined} from "@ant-design/icons-vue";
+import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps";
+import BImportExcel from "@/components/basic/excel/importExcel/importExcel.vue";
+import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
+import {getPaginationTotalTitle} from "@/utils/common";
+
+export default defineComponent({
+  name: 'positionlist',
+  components: {DownOutlined, UpOutlined,BImportExcel,BExportExcel},
+  setup() {
+
+    const route = useRoute();
+    const router = useRouter();
+    const expand = ref(false);
+    const formRef = ref<FormInstance>();
+    const tabsViewStore = useTabsViewStore();
+    const selectedRowKeys =ref([]) ;
+    const formState = reactive({
+      page: 1, rows: 10, schoolYearID: '', majorGradeID: '', practiceBaseTypeID: null,
+      name: null, practiceBaseName: null, positionID: "", total: 0,isPostManage:true
+    });
+
+    const practiceBaseTypeList = ref([]);
+    const schoolYearList = ref<SelectProps['options']>();
+    const majorGradeList = ref<SelectProps['options']>();
+
+    const columns: TableColumnsType = [
+      {
+        title: '序号',
+        width: 60,
+        dataIndex: 'index',
+        key: 'index',
+        align: "center",
+        customRender: item => `${formState.rows * (formState.page - 1) + item.index + 1}`
+      },
+      {title: '实习学年', width: 120, dataIndex: 'schoolYear', key: 'schoolYear',align:"center"},
+      {title: '年级专业', dataIndex: 'majorGradeName', key: '1', width:180},
+      {title: '基地类型', dataIndex: 'practiceBaseTypeName', key: '2', width: 150, align: "center"},
+      {title: '单位名称', dataIndex: 'practiceBaseName', key: '3', width: 200},
+      {title: '岗位名称', dataIndex: 'name', key: '5', width: 120},
+      {title: '岗位数量', dataIndex: 'qty', key: '5', width: 100,align:"center"},
+      {title: '备注', dataIndex: 'remark', key: '5', width: 180,ellipsis: true},
+      {
+        title: '操作', key: 'operation', width: 120, align: "center"
+      },
+    ];
+
+    const importOptions = ref<ImportProps>({
+      title: "导入",
+      url: 'position/importData',
+      columns: [
+        {cnName: "实习开始年份", enName: "startYear",width:100},
+        {cnName: "年级专业名称", enName: "majorGradeName",width:200},
+        {cnName: "所属单位", enName: "practiceBaseName",width:200},
+        {cnName: "岗位名称", enName: "name",width:200},
+        {cnName: "岗位数量", enName: "qty",width:100},
+        {cnName: "备注", enName: "remark",width:150}],
+      template: {
+        tempFileName: "岗位导入模板.xlsx",
+        url: '',
+        params: null
+      }
+    });
+
+    getDictionaryItemList({code: "PracticeBaseType"}).then(x => {
+      practiceBaseTypeList.value = x.filter(f => f.value != 3).map(x => ({
+        label: x.name,
+        value: x.value
+      }));
+    })
+    getSchoolyearList().then(data => {
+      schoolYearList.value = data.map(x => ({
+        label: x.schoolYear,
+        value: x.schoolYearID
+      }));
+    });
+
+    const loadMajorGradeList = () => {
+      getMajorGradeList(formState.schoolYearID).then(data => {
+        majorGradeList.value = data.map(x => ({
+          label: x.name,
+          value: x.majorGradeID
+        }));
+        loadData();
+      });
+    }
+    loadMajorGradeList();
+
+    const filterOption = (input: string, option: any) => {
+      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    };
+
+    const data = ref([]);
+    const pagination = computed(() => ({
+      total: formState.total,
+      current: formState.page,
+      pageSize: formState.rows,
+      showSizeChanger: true,
+      showTotal: total => getPaginationTotalTitle(total)
+    }));
+    const loading = ref(false);
+
+    const handleTableChange: TableProps['onChange'] = (
+      pag: { pageSize: number; current: number },
+    ) => {
+      formState.page = pag.current;
+      formState.rows = pag.pageSize;
+      loadData();
+    };
+
+    const onFinish = () => {
+      loadData();
+    }
+
+    const loadData = async function () {
+      loading.value = true;
+      const result: any = await get('position/getList', formState);
+
+      data.value = result.list;
+      formState.total = result.total;
+      loading.value = false;
+    }
+    const onDelete = () => {
+      if (selectedRowKeys.value.length <= 0) {
+        message.warning('请选择需要删除的数据!');
+        return false;
+      }
+      postdel('position/deletePosition', selectedRowKeys.value).then(() => {
+        loadData();
+      })
+    };
+    const detail = (key: string) => {
+      tabsViewStore.addTabByPath('/position/detail', {id: key});
+    };
+    const add = () => {
+      tabsViewStore.addTabByPath('/position/edit', {});
+    };
+    const edit = (key: string) => {
+      tabsViewStore.addTabByPath('/position/edit', {id: key});
+    };
+    const onSelectChange = (keys: any) => {
+      selectedRowKeys.value = keys;
+    };
+    return {
+      router,
+      route,
+      expand,
+      formRef,
+      formState,
+      columns,data,loading,selectedRowKeys,
+      pagination,practiceBaseTypeList,majorGradeList,schoolYearList,
+      handleTableChange,
+      onSelectChange,
+      onFinish,
+      loadData,
+      detail,
+      add,
+      edit,onDelete,filterOption,
+      importOptions
+    };
+  },
+  created() {
+    this.loadData();
+  },
+  activated() {
+    if (history.state.params?.reload)
+      this.loadData();
+  }
+});
+</script>