wf统一待办

ibzwf-core/src/main/resources/mapper/workflow/wfcore/WFCoreMapper.xml

@@ -4,10 +4,12 @@
 <mapper	namespace="cn.ibizlab.core.workflow.mapper.WFCoreMapper">
 
     <select id="searchMyTask"  parameterType="cn.ibizlab.core.workflow.filter.WFTaskSearchContext"  resultType="cn.ibizlab.core.workflow.domain.WFTask">
-        select t1.* from (
-            select res.ID_ as Id,res.PROC_DEF_ID_ as ProcessDefinitionId,arp.NAME_ as ProcessDefinitionKey,arp.KEY_ as ProcessDefinitionName,
-            res.PROC_INST_ID_ as ProcessInstanceId,res.NAME_ as Name,res.TASK_DEF_KEY_ as TaskDefinitionKey,res.CATEGORY_ as ProcessInstanceBusinessKey,
-            res.DESCRIPTION_ as Description,res.CREATE_TIME_ as CreateTime from ACT_RU_TASK RES inner join act_re_procdef arp on RES.PROC_DEF_ID_ = arp.ID_
+        select   t1.TaskId as Id, t1.DefinitionId as ProcessDefinitionId, t1.DefinitionName as ProcessDefinitionName, t1.DefinitionKey as ProcessDefinitionKey, t1.InstanceId as ProcessInstanceId,
+        t1.TaskName as Name, t1.TaskDefinitionKey, t1.BusinessKey as ProcessInstanceBusinessKey, t1.Description, t1.CreateTime from (
+        select res.ID_ as TaskId,res.PROC_DEF_ID_ as DefinitionId,arp.NAME_ as DefinitionName,arp.KEY_ as DefinitionKey,
+        res.PROC_INST_ID_ as  InstanceId,res.NAME_ as TaskName,res.TASK_DEF_KEY_ as TaskDefinitionKey,res.CATEGORY_ as BusinessKey,
+        res.DESCRIPTION_ as Description,res.CREATE_TIME_ as CreateTime
+        from ACT_RU_TASK RES inner join act_re_procdef arp on RES.PROC_DEF_ID_ = arp.ID_
             where
             exists (select LINK.ID_ from  ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_  and LINK.USER_ID_ = #{srf.sessioncontext.srfuserid})
         ) t1
@@ -17,16 +19,14 @@
 
 
     <select  id="searchMyTaskCnt"  parameterType="cn.ibizlab.core.workflow.filter.WFTaskSearchContext"  resultType="cn.ibizlab.core.workflow.domain.WFProcessNode">
-        select t.ProcessDefinitionId,t.ProcessDefinitionKey,t.ProcessDefinitionName,t.TaskDefinitionKey as UserTaskId,concat(concat(t.Name,' v'),t.version) as UserTaskName,count(1) as cnt from
-        (select * from
+        select t.ProcessDefinitionId,t.ProcessDefinitionKey,t.ProcessDefinitionName,
+        t.TaskDefinitionKey as UserTaskId,t.Name as UserTaskName,t.version ,count(1) as Cnt from
+        (select t1.TaskId as Id, t1.DefinitionId as ProcessDefinitionId, t1.DefinitionName as ProcessDefinitionName, t1.DefinitionKey as ProcessDefinitionKey, t1.InstanceId as ProcessInstanceId,
+        t1.TaskName as Name, t1.TaskDefinitionKey, t1.BusinessKey as ProcessInstanceBusinessKey, t1.Description, t1.CreateTime,version from
         (
-        select res.ID_ as Id,
-        res.PROC_DEF_ID_ as ProcessDefinitionId,
-        arp.NAME_ as ProcessDefinitionKey,
-        arp.KEY_ as ProcessDefinitionName,
-        arp.VERSION_ as version,
-        res.NAME_ as Name,
-        res.TASK_DEF_KEY_ as TaskDefinitionKey
+        select res.ID_ as TaskId,res.PROC_DEF_ID_ as DefinitionId,arp.NAME_ as DefinitionName,arp.KEY_ as DefinitionKey,arp.VERSION_ as version,
+        res.PROC_INST_ID_ as  InstanceId,res.NAME_ as TaskName,res.TASK_DEF_KEY_ as TaskDefinitionKey,res.CATEGORY_ as BusinessKey,
+        res.DESCRIPTION_ as Description,res.CREATE_TIME_ as CreateTime
         from ACT_RU_TASK RES
         inner join act_re_procdef arp on RES.PROC_DEF_ID_ = arp.ID_
         where exists (select LINK.ID_