ibizdev提交

config.xml

@@ -42,7 +42,7 @@
       cd ibzou-provider/ibzou-provider-api
       mvn -Papi docker:build
       mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml dev --with-registry-auth      
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzou-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZDepartmentSearchContext.java

 package cn.ibizlab.core.ou.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZEmployeeSearchContext.java

 package cn.ibizlab.core.ou.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzou-core/src/main/java/cn/ibizlab/core/ou/filter/IBZOrganizationSearchContext.java

 package cn.ibizlab.core.ou.filter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZDepartmentServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.ou.mapper.IBZDepartmentMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[部门] 服务对象接口实现
@@ -171,6 +172,7 @@ public class IBZDepartmentServiceImpl extends ServiceImpl<IBZDepartmentMapper, I
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZEmployeeServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.ou.mapper.IBZEmployeeMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[人员] 服务对象接口实现
@@ -172,6 +173,7 @@ public class IBZEmployeeServiceImpl extends ServiceImpl<IBZEmployeeMapper, IBZEm
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzou-core/src/main/java/cn/ibizlab/core/ou/service/impl/IBZOrganizationServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.HashMap;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
+import java.math.BigInteger;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -34,7 +35,7 @@ import cn.ibizlab.core.ou.mapper.IBZOrganizationMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.alibaba.fastjson.JSONObject;
-
+import org.springframework.util.StringUtils;
 
 /**
  * 实体[单位机构] 服务对象接口实现
@@ -182,6 +183,7 @@ public class IBZOrganizationServiceImpl extends ServiceImpl<IBZOrganizationMappe
     }
 
 
+
     @Override
     public List<JSONObject> select(String sql){
         return this.baseMapper.selectBySQL(sql);

ibzou-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java

+package cn.ibizlab.util.client;
+
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+@Component
+public class IBZWFFallback implements IBZWFFeignClient {
+
+    @Override
+    public List<String> getbusinesskeys(String system, String appname, String entity, String processDefinitionKey, String taskDefinitionKey) {
+        return null;
+    }
+
+    @Override
+    public List<String> getbusinesskeysByUserId(String system, String userId, String entity, String processDefinitionKey, String taskDefinitionKey) {
+        return null;
+    }
+}

ibzou-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

+package cn.ibizlab.util.client;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+@FeignClient(value = "ibzwf-api",fallback = IBZWFFallback.class)
+public interface IBZWFFeignClient
+{
+	@RequestMapping(method = RequestMethod.GET, value = "/{system}-app-{appname}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks")
+	List<String> getbusinesskeys(@PathVariable("system") String system, @PathVariable("appname") String appname,
+														@PathVariable("entity") String entity, @PathVariable("processDefinitionKey") String processDefinitionKey, @PathVariable("taskDefinitionKey") String taskDefinitionKey);
+
+
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks")
+	List<String> getbusinesskeysByUserId(@PathVariable("system") String system,@PathVariable("userId") String userId,
+																@PathVariable("entity") String entity,@PathVariable("processDefinitionKey") String processDefinitionKey,@PathVariable("taskDefinitionKey") String taskDefinitionKey);
+}

ibzou-util/src/main/java/cn/ibizlab/util/domain/EntityBase.java

@@ -72,6 +72,8 @@ public class EntityBase implements Serializable {
         Hashtable<String,String> keys=DEFieldCacheMap.getFieldKeys(this.getClass().getName());
         if(keys.containsKey(field))
             return getMap().get(keys.get(field));
+        else if(keys.containsKey(field.replace("_","")))
+            return getMap().get(keys.get(field.replace("_","")));
         else
             return this.extensionparams.get(field);
     }
@@ -88,6 +90,8 @@ public class EntityBase implements Serializable {
         Hashtable<String,String> keys=DEFieldCacheMap.getFieldKeys(this.getClass().getName());
         if(keys.containsKey(field))
             getMap().put(keys.get(field),value);
+        else if(keys.containsKey(field.replace("_","")))
+            getMap().put(keys.get(field.replace("_","")),value);
         else
             this.extensionparams.put(field,value);
     }

ibzou-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -55,6 +55,14 @@ public class SearchContextBase implements ISearchContext{
      * 排序对象
      */
     public Sort pageSort;
+    /**
+     * 工作流步骤标识
+     */
+    public String userTaskId;
+    /**
+     * 工作流流程标识
+     */
+    public String processDefinitionKey;
     /**
      * 获取分页参数
      * @return