release:8.1.8.567.20

ibiz-boot-starter-parent/pom.xml

@@ -14,16 +14,16 @@
     <packaging>pom</packaging>
     <artifactId>ibiz-boot-starter-parent</artifactId>
     <groupId>net.ibizsys.plugin</groupId>
-    <version>8.1.0.567.17</version>
+    <version>8.1.0.567.20</version>
     <name>iBiz Boot Starter Parent</name>
     <description>iBiz Boot Starter Parent</description>
 
 
     <properties>
-        <revision>8.1.0.567.17</revision>
+        <revision>8.1.0.567.20</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ibiz-boot-starter.version>8.1.0.567.17</ibiz-boot-starter.version>
-        <ibiz.cloud.version>8.1.0.567.17</ibiz.cloud.version>
+        <ibiz-boot-starter.version>8.1.0.567.20</ibiz-boot-starter.version>
+        <ibiz.cloud.version>8.1.0.567.20</ibiz.cloud.version>
         <spring-cloud.version>2020.0.1</spring-cloud.version>
         <spring-cloud-starter-bootstrap.version>3.0.1</spring-cloud-starter-bootstrap.version>
         <fastjson.version>1.2.83</fastjson.version>

ibiz-boot-starter/pom.xml

@@ -6,14 +6,14 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ibiz-boot-starter</artifactId>
     <groupId>net.ibizsys.plugin</groupId>
-    <version>8.1.0.567.17</version>
+    <version>8.1.0.567.20</version>
     <name>iBiz Boot Starter</name>
     <description>iBiz Boot Starter</description>
 
     <parent>
         <groupId>net.ibizsys.plugin</groupId>
         <artifactId>ibiz-boot-starter-parent</artifactId>
-        <version>8.1.0.567.17</version>
+        <version>8.1.0.567.20</version>
         <relativePath>../ibiz-boot-starter-parent/pom.xml</relativePath>
     </parent>
 
@@ -53,6 +53,11 @@
             <artifactId>ibiz-plugin-liquibase</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>net.ibizsys.plugin</groupId>
+            <artifactId>ibiz-plugin-groovy</artifactId>
+        </dependency>
+
         <!--  Lombok -->
         <dependency>
             <groupId>org.projectlombok</groupId>

ibiz-boot-starter/src/main/java/net/ibizsys/central/plugin/boot/core/filter/BaseFilter.java

@@ -25,6 +25,7 @@ import org.springframework.cglib.beans.BeanMap;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -39,6 +40,11 @@ import java.util.stream.Collectors;
 @Slf4j
 public class BaseFilter<T> extends BaseData implements ISearchContextDTO {
 
+    @JsonIgnore
+    private transient boolean bFillDynaFields = true;
+
+    @JsonIgnore
+    private transient boolean bFillComputedFields = true;
 
     @JsonIgnore
     @JSONField(serialize = false)
@@ -427,37 +433,80 @@ public class BaseFilter<T> extends BaseData implements ISearchContextDTO {
 
     @Override
     public net.ibizsys.central.util.ISearchGroupCond getSearchGroupCondByCat(String strCat) {
+        return getSearchGroupCondByCat(this, strCat);
+    }
+
+    @JsonIgnore
+    public static net.ibizsys.central.util.ISearchGroupCond getSearchGroupCondByCat(net.ibizsys.central.util.ISearchContext iSearchContext, String strCat) {
+        Assert.hasLength(strCat, "未传入条件分组");
+        List<ISearchCond> searchCondList = iSearchContext.getSearchConds();
+        if(!ObjectUtils.isEmpty(searchCondList)) {
+            for(ISearchCond iSearchCond : searchCondList) {
+                if(iSearchCond instanceof net.ibizsys.central.util.ISearchGroupCond) {
+                    net.ibizsys.central.util.ISearchGroupCond iSearchGroupCond = (net.ibizsys.central.util.ISearchGroupCond)iSearchCond;
+                    if(strCat.equals(iSearchGroupCond.getCat())) {
+                        return iSearchGroupCond;
+                    }
+                }
+            }
+        }
         return null;
     }
 
     @Override
     public net.ibizsys.central.util.ISearchGroupCond getGroupDataGroupCondByCat(String strCat) {
+        return getGroupDataGroupCondByCat(this, strCat);
+    }
+
+    @JsonIgnore
+    public static net.ibizsys.central.util.ISearchGroupCond getGroupDataGroupCondByCat(net.ibizsys.central.util.ISearchContext iSearchContext, String strCat) {
+        Assert.hasLength(strCat, "未传入条件分组");
+        List<ISearchCond> searchCondList = iSearchContext.getGroupDataConds();
+        if(!ObjectUtils.isEmpty(searchCondList)) {
+            for(ISearchCond iSearchCond : searchCondList) {
+                if(iSearchCond instanceof net.ibizsys.central.util.ISearchGroupCond) {
+                    net.ibizsys.central.util.ISearchGroupCond iSearchGroupCond = (net.ibizsys.central.util.ISearchGroupCond)iSearchCond;
+                    if(strCat.equals(iSearchGroupCond.getCat())) {
+                        return iSearchGroupCond;
+                    }
+                }
+            }
+        }
         return null;
     }
 
     @Override
     public ISearchContextDTO nestedfields(boolean bFillNestedFields) {
-        return null;
+        this.setFillNestedFields(bFillNestedFields);
+        return this;
     }
 
     @Override
     public ISearchContextDTO dynafields(boolean bFillDynaFields) {
-        return null;
+        this.setFillDynaFields(bFillDynaFields);
+        return this;
     }
 
     @Override
     public ISearchContextDTO computedfields(boolean bFillComputedFields) {
-        return null;
+        this.setFillComputedFields(bFillComputedFields);
+        return this;
     }
 
     @Override
     public ISearchContextDTO translatefields(boolean bTranslateFields) {
-        return null;
+        this.setTranslateFields(bTranslateFields);
+        return this;
     }
 
     @Override
     public ISearchContextDTO raw() {
-        return null;
+        this.setFillComputedFields(false);
+        this.setFillDynaFields(false);
+        this.setFillNestedFields(false);
+        this.setTranslateFields(false);
+        this.setCount(false);
+        return this;
     }
 
 
@@ -685,22 +734,22 @@ public class BaseFilter<T> extends BaseData implements ISearchContextDTO {
 
     @Override
     public boolean isFillDynaFields() {
-        return false;
+        return this.bFillDynaFields;
     }
 
     @Override
     public void setFillDynaFields(boolean bFillDynaFields) {
-
+        this.bFillDynaFields = bFillDynaFields;
     }
 
     @Override
     public boolean isFillComputedFields() {
-        return false;
+        return this.bFillComputedFields;
     }
 
     @Override
     public void setFillComputedFields(boolean bFillComputedFields) {
-
+        this.bFillComputedFields = bFillComputedFields;
     }
 
     @JsonIgnore

pom.xml

@@ -8,20 +8,20 @@
     <parent>
         <groupId>net.ibizsys.plugin</groupId>
         <artifactId>ibiz-boot-starter-parent</artifactId>
-        <version>8.1.0.567.17</version>
+        <version>8.1.0.567.20</version>
         <relativePath>ibiz-boot-starter-parent/pom.xml</relativePath>
     </parent>
 
 
     <groupId>net.ibizsys.plugin</groupId>
     <artifactId>ibiz-boot-starters</artifactId>
-    <version>8.1.0.567.17</version>
+    <version>8.1.0.567.20</version>
     <packaging>pom</packaging>
     <name>ibiz-boot-starters</name>
     <description>ibiz-boot-starters</description>
 
     <properties>
-        <revision>8.1.0.567.17</revision>
+        <revision>8.1.0.567.20</revision>
     </properties>
     <modules>
         <module>ibiz-boot-starter-parent</module>