修改前端生成页面

appbuild-manager/src/main/bin/start.sh

@@ -75,7 +75,7 @@ exec "$JAVACMD" $JAVA_OPTS \
 				-Dapp.port="$PORT" \
 				-Dbasedir="$BASEDIR" \
 				-Djava.io.tmpdir=$TEMP_PATH \
-				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6913 \
+				-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6913 \个大
 				-jar $MAIN_CLASS \
 				> /dev/null &
 				

appbuild-manager/src/main/resources/template/java/entityQuery.java.ftl

@@ -26,11 +26,16 @@ public class ${ClassName}Query extends ${ClassName}Entity {
     /** ${column.columnComment}列表 */
     private List <${column.javaType}> ${column.javaField}List;
 
+    /** ${column.columnComment}排除列表 */
+    private List <${column.javaType}> ${column.javaField}NotList;
+
 </#if>
 <#if column.javaType == "String">
     /** ${column.columnComment} */
     private List<${column.javaType}> ${column.javaField}List;
 
+    /** ${column.columnComment}排除列表 */
+    private List <${column.javaType}> ${column.javaField}NotList;
 </#if>
 <#if column.javaType == "Date">
     /** 开始 ${column.columnComment} */
@@ -115,6 +120,23 @@ public class ${ClassName}Query extends ${ClassName}Entity {
         this.${column.javaField}List = ${column.javaField}List;
     }
 
+    /**
+    * 获取 ${column.columnComment}
+    * @return ${column.javaField}NotList
+    */
+    public List<${column.javaType}> get${column.javaField?cap_first}NotList(){
+        return this.${column.javaField}NotList;
+    }
+
+    /**
+    * 设置 ${column.columnComment}
+    * @param ${column.javaField}NotList
+    */
+    public void set${column.javaField?cap_first}NotList(List<${column.javaType}> ${column.javaField}NotList){
+        this.${column.javaField}NotList = ${column.javaField}NotList;
+    }
+
+
     </#if>
     <#if column.javaType == "String">
     /**
@@ -132,6 +154,23 @@ public class ${ClassName}Query extends ${ClassName}Entity {
     public void set${column.javaField?cap_first}List(List<${column.javaType}> ${column.javaField}List){
         this.${column.javaField}List = ${column.javaField}List;
     }
+
+    /**
+    * 获取 ${column.columnComment}
+    * @return ${column.javaField}NotList
+    */
+    public List<${column.javaType}> get${column.javaField?cap_first}NotList(){
+        return this.${column.javaField}NotList;
+    }
+
+    /**
+    * 设置 ${column.columnComment}
+    * @param ${column.javaField}NotList
+    */
+    public void set${column.javaField?cap_first}NotList(List<${column.javaType}> ${column.javaField}NotList){
+        this.${column.javaField}NotList = ${column.javaField}NotList;
+    }
+
     </#if>
     <#if column.javaType == "Date">
     /**
@@ -214,6 +253,15 @@ public class ${ClassName}Query extends ${ClassName}Entity {
         this.${column.javaField}List = ${column.javaField}List;
 		return this;
         }
+
+        /**
+        * 设置 ${column.columnComment}
+        * @param ${column.javaField}NotList
+        */
+        public ${ClassName}Query ${column.javaField}NotList(List<${column.javaType}> ${column.javaField}NotList){
+        this.${column.javaField}NotList = ${column.javaField}NotList;
+        return this;
+        }
     </#if>
 
     <#if column.javaType  == "String">

appbuild-manager/src/main/resources/template/xml/sqlMap.xml.ftl

@@ -334,6 +334,12 @@
                     <#noparse>#{item}</#noparse>
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('${column.javaField}NotList')">
+                <#noparse>${_conditionType_}</#noparse> a.${column.columnName} not in
+                <foreach collection="conditionParamRef.${column.javaField}NotList" open="(" close=")" index="index" item="item" separator=",">
+                    <#noparse>#{item}</#noparse>
+                </foreach>
+            </if>
             <if test="conditionParamRef.containsKey('${column.javaField}Start') and conditionParamRef.${column.javaField}Start != null">
                 <#noparse>${_conditionType_}</#noparse> a.${column.columnName} <![CDATA[ >= ]]> <#noparse>#{${_conditionParam_}</#noparse>.${column.javaField}Start}
             </if>
@@ -357,6 +363,12 @@
                     <#noparse>#</#noparse>{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('${column.javaField}NotList')">
+                <#noparse>${_conditionType_}</#noparse> a.${column.columnName} not in
+                <foreach collection="conditionParamRef.${column.javaField}NotList" open="(" close=")" index="index" item="item" separator=",">
+                    <#noparse>#</#noparse>{item}
+                </foreach>
+            </if>
         </#if>
         <#if column.javaType == "Date">
             <if test="conditionParamRef.containsKey('${column.javaField}')">