优化查询待办

java110-bean/src/main/java/com/java110/entity/audit/AuditUser.java

@@ -29,6 +29,7 @@ public class AuditUser extends PageDto implements Serializable {
 
     private String processDefinitionKey;
 
+    private String flowId;
 
     public String getObjCode() {
         return objCode;
@@ -93,4 +94,12 @@ public class AuditUser extends PageDto implements Serializable {
     public void setProcessDefinitionKey(String processDefinitionKey) {
         this.processDefinitionKey = processDefinitionKey;
     }
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
 }

service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java

@@ -108,7 +108,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
      */
     public long getUserTaskCount(@RequestBody AuditUser user) {
         TaskService taskService = processEngine.getTaskService();
-        TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getProcessDefinitionKey()));
+        TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getFlowId()));
         query.taskAssignee(user.getUserId());
         return query.count();
     }
@@ -120,8 +120,8 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
      */
     public List<JSONObject> getUserTasks(@RequestBody AuditUser user) {
         TaskService taskService = processEngine.getTaskService();
-        TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getProcessDefinitionKey()));
-        ;
+        TaskQuery query = taskService.createTaskQuery().processDefinitionKey(getWorkflowDto(user.getFlowId()));
+
         query.taskAssignee(user.getUserId());
         query.orderByTaskCreateTime().desc();
         List<Task> list = null;
@@ -160,7 +160,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
 //                .taskAssignee(user.getUserId());
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
-                .processDefinitionKey(getWorkflowDto(user.getProcessDefinitionKey()))
+                .processDefinitionKey(getWorkflowDto(user.getFlowId()))
                 .taskAssignee(user.getUserId())
                 .finished();
         if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {
@@ -183,7 +183,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         HistoryService historyService = processEngine.getHistoryService();
 
         HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
-                .processDefinitionKey(getWorkflowDto(user.getProcessDefinitionKey()))
+                .processDefinitionKey(getWorkflowDto(user.getFlowId()))
                 .taskAssignee(user.getUserId())
                 .finished();
         if (!StringUtil.isEmpty(user.getAuditLink()) && "START".equals(user.getAuditLink())) {

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java

@@ -179,6 +179,7 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
 
         AuditUser auditUser = new AuditUser();
         auditUser.setProcessDefinitionKey(oaWorkflowDtos.get(0).getProcessDefinitionKey());
+        auditUser.setFlowId(paramIn.getString("flowId"));
         auditUser.setUserId(paramIn.getString("userId"));
         auditUser.setStoreId(paramIn.getString("storeId"));
         auditUser.setPage(paramIn.getInteger("page"));
@@ -219,6 +220,7 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
 
         AuditUser auditUser = new AuditUser();
         auditUser.setProcessDefinitionKey(oaWorkflowDtos.get(0).getProcessDefinitionKey());
+        auditUser.setFlowId(paramIn.getString("flowId"));
         auditUser.setUserId(paramIn.getString("userId"));
         auditUser.setStoreId(paramIn.getString("storeId"));
         auditUser.setPage(paramIn.getInteger("page"));