工作流

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

@@ -764,27 +764,12 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
             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)) {
-                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);
-            }
-            else if ("finish".equals(srfWF)) {
-                businessKeys= ibzwfFeignClient.getFinishTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", instTag, instTag2);
-            }
-            else if ("all".equals(srfWF)) {
-                businessKeys= ibzwfFeignClient.getAllTaskByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", instTag, instTag2);
-            }
-            else if ("cc".equals(srfWF)) {
-                businessKeys= ibzwfFeignClient.getSendCopyTask("${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, srfWF, wfstep);
+            else
+                businessKeys= ibzwfFeignClient.getTask("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}", instTag, instTag2, srfWF);
+
             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,38 +41,14 @@ public class IBZWFFallback implements IBZWFFeignClient {
     <#if isDynaSys>
 
     @Override
-    public Map<String, Map<String, Object>> getTaskByUserId(String system, String userId, String entity, String instTag, String instTag2) {
+    public Map<String, Map<String, Object>> getTask(String system, String userId, String entity, String instTag, String instTag2 ,String taskType) {
         return null;
     }
 
     @Override
-    public Map<String, Map<String, Object>> getTaskByStep(String system, String userId, String entity, String instTag, String instTag2 , String srfwfstep) {
+    public Map<String, Map<String, Object>> getTaskByStep(String system, String userId, String entity, String instTag, String instTag2 , String taskType, String srfwfstep) {
         return null;
     }
 
-    @Override
-    public Map<String, Map<String, Object>> getUnReadTaskByUserId(String system, String userId, String entity, String instTag, String instTag2) {
-        return null;
-    }
-
-    @Override
-    public Map<String, Map<String, Object>> getDoneTaskByUserId(String system, String userId, String entity, String instTag, String instTag2) {
-        return null;
-    }
-
-    @Override
-    public Map<String, Map<String, Object>> getFinishTaskByUserId(String system, String userId, String entity, String instTag, String instTag2) {
-        return null;
-    }
-
-    @Override
-    public Map<String, Map<String, Object>> getAllTaskByUserId(String system, String userId, String entity, String instTag, String instTag2) {
-        return null;
-    }
-
-    @Override
-    public Map<String, Map<String, Object>> getSendCopyTask(String system, String userId, String entity, String instTag, String instTag2) {
-        return null;
-    }
     </#if>
 }

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

@@ -39,33 +39,12 @@ public interface IBZWFFeignClient
 
 	<#if isDynaSys>
 	@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);
+	Map<String, Map<String, Object>> getTask(@PathVariable("system") String system, @PathVariable("userId") String userId,
+													 @PathVariable("entity") String entity, @PathVariable("insttag") String instTag, @PathVariable("insttag2") String instTag2, @RequestParam("srfwf") String taskType);
 
 	@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);
+													 @PathVariable("entity") String entity, @PathVariable("insttag") String instTag, @PathVariable("insttag2") String instTag2 , @RequestParam("srfwf") String taskType, @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);
-
-	@RequestMapping(method = RequestMethod.POST, value = "/{system}-user-{userId}/{insttag}/{insttag2}/{entity}/tasks/done")
-	Map<String, Map<String, Object>> getDoneTaskByUserId(@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/finish")
-	Map<String, Map<String, Object>> getFinishTaskByUserId(@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/all")
-	Map<String,Map<String,Object>> getAllTaskByUserId(@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/sendcopy")
-	Map<String,Map<String,Object>> getSendCopyTask(@PathVariable("system") String system,@PathVariable("userId")String userId,
-													  @PathVariable("entity") String entity,@PathVariable("insttag")String instTag,
-													  @PathVariable("insttag2") String instTag2);
 	</#if>
 }