工作流待阅

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl

@@ -755,7 +755,12 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
     private Map<String,Map<String,Object>> fillWFTaskContext(${item.getCodeName()}SearchContext context){
         Map<String, Map<String, Object>> businessKeys = null;
         if (!StringUtils.isEmpty(context.getSrfDynaInstId())) {
-            businessKeys= ibzwfFeignClient.getDynaBusinesskeysByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", context.getSrfDynaInstId());
+            if (!ObjectUtils.isEmpty(context.getSrfWF()) && "toread".equals(context.getSrfWF())) {
+                businessKeys= ibzwfFeignClient.getTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", context.getSrfDynaInstId());
+            }
+            else if (!ObjectUtils.isEmpty(context.getSrfWF()) && "todo".equals(context.getSrfWF())) {
+                businessKeys= ibzwfFeignClient.getUnReadTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", context.getSrfDynaInstId());
+            }
             if(!ObjectUtils.isEmpty(businessKeys)){
                 context.getSelectCond().in("${keyfield.name?lower_case}",businessKeys.keySet());
             }

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZWFFallback.java.ftl

@@ -41,7 +41,12 @@ public class IBZWFFallback implements IBZWFFeignClient {
     <#if isDynaSys>
 
     @Override
-    public Map<String, Map<String, Object>> getDynaBusinesskeysByUserId(String system, String userId, String entity, String dynainstid) {
+    public Map<String, Map<String, Object>> getTaskByUserId(String system, String userId, String entity, String dynainstid) {
+        return null;
+    }
+
+    @Override
+    public Map<String, Map<String, Object>> getUnReadTaskByUserId(String system, String userId, String entity, String dynainstid) {
         return null;
     }
     </#if>

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZWFFeignClient.java.ftl

@@ -36,9 +36,14 @@ public interface IBZWFFeignClient
 	JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
 					   @PathVariable("entity") String entity,
 					   @PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
+
 	<#if isDynaSys>
 	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{dynainstid}/{entity}/tasks")
-	Map<String,Map<String,Object>> getDynaBusinesskeysByUserId(@PathVariable("system") String system,@PathVariable("userId") String userId,
+	Map<String,Map<String,Object>> getTaskByUserId(@PathVariable("system") String system,@PathVariable("userId") String userId,
+										 @PathVariable("entity") String entity,@PathVariable("dynainstid") String dynainstid);
+
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{dynainstid}/{entity}/unread")
+	Map<String,Map<String,Object>> getUnReadTaskByUserId(@PathVariable("system") String system,@PathVariable("userId") String userId,
 										 @PathVariable("entity") String entity,@PathVariable("dynainstid") String dynainstid);
 	</#if>
 }

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/filter/SearchContextBase.java.ftl

@@ -96,6 +96,7 @@ public class SearchContextBase implements ISearchContext{
     public BoolQueryBuilder esCond=new BoolQueryBuilder();
     </#if>
     <#if isDynaSys>
+
     /**
      * 动态实例标识
      */
@@ -111,7 +112,14 @@ public class SearchContextBase implements ISearchContext{
             return srfDynaInstId;
         }
     }
+
+    /**
+     * 工作流待办/待阅标识
+     */
+    @JsonProperty("srfwf")
+    public String srfWF;
     </#if>
+
     /**
      * 获取工作流步骤标识
      */