查询工作流步骤待办

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

@@ -763,11 +763,15 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
             String instTag = context.getSrfInstTag();
             String instTag2 = context.getSrfInstTag2();
             String srfWF = context.getSrfWF();
+            String wfstep = context.getSrfwfstep();
             if ("toread".equals(srfWF)) {
                 businessKeys= ibzwfFeignClient.getUnReadTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", instTag, instTag2);
             }
             else if ("todo".equals(srfWF)) {
-                businessKeys= ibzwfFeignClient.getTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", instTag, instTag2);
+                if(!StringUtils.isEmpty(wfstep))
+                    businessKeys= ibzwfFeignClient.getTaskByStep("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", instTag, instTag2, wfstep);
+                else
+                    businessKeys= ibzwfFeignClient.getTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", instTag, instTag2);
             }
             else if ("done".equals(srfWF)) {
                 businessKeys= ibzwfFeignClient.getDoneTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", instTag, instTag2);

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

@@ -45,6 +45,11 @@ public class IBZWFFallback implements IBZWFFeignClient {
         return null;
     }
 
+    @Override
+    public Map<String, Map<String, Object>> getTaskByStep(String system, String userId, String entity, String instTag, String instTag2 , String srfwfstep) {
+        return null;
+    }
+
     @Override
     public Map<String, Map<String, Object>> getUnReadTaskByUserId(String system, String userId, String entity, String instTag, String instTag2) {
         return null;

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

@@ -42,6 +42,14 @@ public interface IBZWFFeignClient
 	Map<String, Map<String, Object>> getTaskByUserId(@PathVariable("system") String system, @PathVariable("userId") String userId,
 													 @PathVariable("entity") String entity, @PathVariable("insttag") String instTag, @PathVariable("insttag2") String instTag2);
 
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{insttag}/{insttag2}/{entity}/tasks")
+	Map<String, Map<String, Object>> getTaskByUserId(@PathVariable("system") String system, @PathVariable("userId") String userId,
+													 @PathVariable("entity") String entity, @PathVariable("insttag") String instTag, @PathVariable("insttag2") String instTag2);
+
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{insttag}/{insttag2}/{entity}/tasks")
+	Map<String, Map<String, Object>> getTaskByStep(@PathVariable("system") String system, @PathVariable("userId") String userId,
+													 @PathVariable("entity") String entity, @PathVariable("insttag") String instTag, @PathVariable("insttag2") String instTag2 ,@RequestParam("n_taskdefinitionkey_eq") String srfwfstep);
+
 	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{insttag}/{insttag2}/{entity}/tasks/unread")
 	Map<String, Map<String, Object>> getUnReadTaskByUserId(@PathVariable("system") String system, @PathVariable("userId") String userId,
 														   @PathVariable("entity") String entity, @PathVariable("insttag") String instTag, @PathVariable("insttag2") String instTag2);

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

@@ -132,6 +132,12 @@ public class SearchContextBase implements ISearchContext{
      */
     @JsonProperty("srfwf")
     public String srfWF;
+
+    /**
+     * 工作流步骤标识
+     */
+    @JsonProperty("srfwfstep")
+    public String srfwfstep;
     </#if>
 
     /**