11482-【CR】【投资系统】增加审批流程-我的任务-已办任务查询和数量

ruoyi-system/src/main/resources/mapper/invest/ApprovalMapper.xml

@@ -121,27 +121,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         p.START_USER_ID_ AS 'startUserId',
         uu.nick_name AS 'startUserName',
         dd.dept_name AS 'startDeptName',
-        ht.ID_ AS 'taskId',
-        ht.NAME_ AS 'taskName',
-        ht.ASSIGNEE_ AS 'assignee',
+        t.ID_ AS 'taskId',
+        t.NAME_ AS 'taskName',
+        t.ASSIGNEE_ AS 'assignee',
         ui.nick_name AS 'assigneeName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
         rp.DEPLOYMENT_ID_ AS 'deployId'
         from t_project_approval a
         left join t_project_pool tp on tp.id=a.project_pool_id
-        left join ACT_HI_TASKINST ht on a.proc_inst_id = ht.PROC_INST_ID_
-        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (select * from ACT_HI_PROCINST limit 10000000) p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        LEFT JOIN ACT_RU_IDENTITYLINK ru on a.proc_inst_id = ru.PROC_INST_ID_
         LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
         LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
-        left join (select * from sys_user limit 100000) ui on ht.ASSIGNEE_ = ui.user_id
-        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
-        left join act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
-        where
-        ht.ASSIGNEE_ =  #{userId}
-        AND ht.END_TIME_ IS NOT NULL
-        and a.del_flag="0"
+        LEFT JOIN (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where ru.USER_ID_ = #{userId} and a.del_flag="0"
         <include refid="where_sql"></include>
         GROUP BY a.id
-        ORDER BY ht.END_TIME_ DESC;
+        order by a.create_time desc
     </select>
     <select id="getMyList" resultMap="ProjectApprovalVoResult">
         select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,

ruoyi-system/src/main/resources/mapper/invest/DecisionMapper.xml

@@ -115,24 +115,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         p.START_USER_ID_ AS 'startUserId',
         uu.nick_name AS 'startUserName',
         dd.dept_name AS 'startDeptName',
-        ht.ID_ AS 'taskId',
-        ht.NAME_ AS 'taskName',
-        ht.ASSIGNEE_ AS 'assignee',
+        t.ID_ AS 'taskId',
+        t.NAME_ AS 'taskName',
+        t.ASSIGNEE_ AS 'assignee',
         ui.nick_name AS 'assigneeName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
         rp.DEPLOYMENT_ID_ AS 'deployId'
         from t_project_decision a
-        left join t_project_pool tp on tp.id=a.project_pool_id
-        left join ACT_HI_TASKINST ht on a.proc_inst_id = ht.PROC_INST_ID_
-        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN t_project_pool tp on tp.id=a.project_pool_id
+        LEFT JOIN (select * from ACT_HI_PROCINST limit 10000000) p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        LEFT JOIN ACT_RU_IDENTITYLINK ru on a.proc_inst_id = ru.PROC_INST_ID_
         LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
         LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
-        left join (select * from sys_user limit 100000) ui on ht.ASSIGNEE_ = ui.user_id
-        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
-        left join act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
-        where
-        ht.ASSIGNEE_ =  #{userId}
-        AND ht.END_TIME_ IS NOT NULL
-        and a.del_flag="0"
+        LEFT JOIN (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where ru.USER_ID_ = #{userId} and a.del_flag="0"
         <include refid="where_sql"></include>
         GROUP BY a.id
         order by a.create_time desc

ruoyi-system/src/main/resources/mapper/invest/InvestmentOpportunityMapper.xml

@@ -305,29 +305,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         p.START_USER_ID_ AS 'startUserId',
         uu.nick_name AS 'startUserName',
         dd.dept_name AS 'startDeptName',
-        ht.ID_ AS 'taskId',
-        ht.NAME_ AS 'taskName',
-        ht.ASSIGNEE_ AS 'assignee',
+        t.ID_ AS 'taskId',
+        t.NAME_ AS 'taskName',
+        t.ASSIGNEE_ AS 'assignee',
         ui.nick_name AS 'assigneeName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
         rp.DEPLOYMENT_ID_ AS 'deployId'
         from t_project_pool a
         left join t_project_company b ON a.id = b.project_pool_id
         left join t_project_contacts c ON a.project_contacts = c.id
         left join t_project_channel d ON a.channel = d.id
-        left join ACT_HI_TASKINST ht on a.proc_inst_id = ht.PROC_INST_ID_
-        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (select * from ACT_HI_PROCINST limit 10000000) p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        LEFT JOIN ACT_RU_IDENTITYLINK ru on a.proc_inst_id = ru.PROC_INST_ID_
         LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
         LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
-        left join (select * from sys_user limit 100000) ui on ht.ASSIGNEE_ = ui.user_id
-        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
-        left join act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
-        where
-        ht.ASSIGNEE_ =  #{userId}
-        AND ht.END_TIME_ IS NOT NULL
-        and a.del_flag="0"
+        LEFT JOIN (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where ru.USER_ID_ = #{userId} and a.del_flag="0"
         <include refid="where_sql"></include>
         GROUP BY a.id
-        ORDER BY ht.END_TIME_ DESC;
+        order by a.create_time desc
     </select>
     <select id="getMyList" resultMap="TProjectPoolVoResult">
         select a.id,a.proc_inst_id,a.project_name, d.channel_group project_group, a.record_date, a.project_code, a.channel, a.contact_date, a.project_date, a.decision_date, a.industry, a.company, a.description, a.project_contacts,

ruoyi-system/src/main/resources/mapper/invest/TerminationMapper.xml

@@ -151,24 +151,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         p.START_USER_ID_ AS 'startUserId',
         uu.nick_name AS 'startUserName',
         dd.dept_name AS 'startDeptName',
-        ht.ID_ AS 'taskId',
-        ht.NAME_ AS 'taskName',
-        ht.ASSIGNEE_ AS 'assignee',
+        t.ID_ AS 'taskId',
+        t.NAME_ AS 'taskName',
+        t.ASSIGNEE_ AS 'assignee',
         ui.nick_name AS 'assigneeName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
         rp.DEPLOYMENT_ID_ AS 'deployId'
         from t_project_termination a
         left join t_project_pool tp on tp.id=a.project_pool_id
-        left join ACT_HI_TASKINST ht on a.proc_inst_id = ht.PROC_INST_ID_
-        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (select * from ACT_HI_PROCINST limit 10000000) p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        LEFT JOIN ACT_RU_IDENTITYLINK ru on a.proc_inst_id = ru.PROC_INST_ID_
         LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
         LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
-        left join (select * from sys_user limit 100000) ui on ht.ASSIGNEE_ = ui.user_id
-        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
-        left join act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
-        where
-        ht.ASSIGNEE_ =  #{userId}
-        AND ht.END_TIME_ IS NOT NULL
-        and a.del_flag="0"
+        LEFT JOIN (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where ru.USER_ID_ = #{userId} and a.del_flag="0"
         <include refid="where_sql"></include>
         GROUP BY a.id
         order by a.create_time desc

ruoyi-ui/src/views/project/approval/myTask.vue

@@ -294,7 +294,7 @@
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="处理节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
                 <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName}}
@@ -304,7 +304,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName}}
@@ -331,8 +331,8 @@
           </el-table>
           <!-- 分页 -->
           <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
+            v-show="myDoneTaskTotal > 0"
+            :total="myDoneTaskTotal"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getMyDoneTaskList"

ruoyi-ui/src/views/project/decision/myTask.vue

@@ -268,7 +268,7 @@
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="处理节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
                 <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName}}
@@ -278,7 +278,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName}}
@@ -305,8 +305,8 @@
           </el-table>
           <!-- 分页 -->
           <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
+            v-show="myDoneTaskTotal > 0"
+            :total="myDoneTaskTotal"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getMyDoneTaskList"
@@ -462,25 +462,12 @@
 import { getMyTaskList,getMyDoneTaskList,getMyList } from "@/api/project/decision/pool";
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { listChannel } from "@/api/invest/channel";
-import dueDiligenceList from "../../invest/components/dueDiligenceList.vue";
-import followList from "../../invest/components/followList.vue";
-import meetingList from "../../invest/components/meetingList.vue";
-import businessUpdate from "../../invest/components/businessUpdate.vue";
 import flow from '@/views/flowable/task/todo/detail/flow';
-import {
-  getPool
-} from "@/api/invest/pool";
-
+import { getPool } from "@/api/invest/pool";
 import { mapGetters } from "vuex";
 export default {
   dicts: ["project_group", "project_stage", "project_state", "CUSTOMER_TRADE"],
-  components: {
-    dueDiligenceList,
-    followList,
-    meetingList,
-    businessUpdate,
-    flow
-  },
+  components: { flow },
   data() {
     return {
       // 当前激活的 Tab

ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -398,7 +398,7 @@
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="处理节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
                 <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName}}
@@ -408,7 +408,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName}}
@@ -434,8 +434,8 @@
           </el-table>
           <!-- 分页 -->
           <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
+            v-show="myDoneTaskTotal > 0"
+            :total="myDoneTaskTotal"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getMyDoneTaskList"

ruoyi-ui/src/views/project/termination/myTask.vue

@@ -266,7 +266,7 @@
                 <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="处理节点" align="center" prop="taskName">
+            <el-table-column label="当前节点" align="center" prop="taskName">
               <template slot-scope="scope">
                 <div  v-if="scope.row.deployId !== null && scope.row.deployId !== undefined && scope.row.deployId !== ''"  :title="scope.row.taskName" class="public-text-blue public-cursor" @click="handleReadImage(scope.row)">
                   {{ scope.row.taskName}}
@@ -276,7 +276,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="处理人" align="center" prop="assigneeName">
+            <el-table-column label="当前处理人" align="center" prop="assigneeName">
               <template slot-scope="scope">
                 <div :title="scope.row.assigneeName">
                   {{ scope.row.assigneeName}}
@@ -302,8 +302,8 @@
           </el-table>
           <!-- 分页 -->
           <pagination
-            v-show="myTotal > 0"
-            :total="myTotal"
+            v-show="myDoneTaskTotal > 0"
+            :total="myDoneTaskTotal"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getMyDoneTaskList"