浏览代码

流程数据修改

wangliang 3 年之前
父节点
当前提交
1fbfbcded4
共有 1 个文件被更改,包括 131 次插入122 次删除
  1. 131 122
      distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

+ 131 - 122
distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -753,137 +753,146 @@
     </sql>
 
     <select id="getFlowTaskReadyList" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
-        select
-            et.id,
-            et.school_id schoolId,
-            et.org_id as orgId,
-            et.course_code courseCode,
-            et.course_name courseName,
-            et.specialty,
-            et.paper_number paperNumber,
-            et.card_rule_id cardRuleId,
-            case
-                et.card_rule_id when -1 then '全部通卡'
-                else b.name
-            end cardRuleName,
-            et.userId,
-            c.real_name userName,
-            et.start_time startTime,
-            et.end_time endTime,
-            et.flowStatus as status,
-            et.enable,
-            et.create_time createTime,
-            et.EXECUTION_ID_ as executionId,
-            et.flow_id as flowId,
-            et.NAME_ as taskName,
-            et.TASK_DEF_KEY_ as taskDefKey,
-            et.ID_ as taskId,
-            et.setup
-        from
-            (
-            select
-                et.*,
+          select
+                et.id,
+                et.school_id schoolId,
+                et.org_id as orgId,
+                et.course_code courseCode,
+                et.course_name courseName,
+                et.specialty,
+                et.paper_number paperNumber,
+                et.card_rule_id cardRuleId,
+                case
+                    et.card_rule_id when -1 then '全部通卡'
+                    else b.name
+                end cardRuleName,
+                art.ASSIGNEE_ as userId,
+                c.real_name userName,
+                et.start_time startTime,
+                et.end_time endTime,
+                tffa.status,
+                et.enable,
+                et.create_time createTime,
+                art.EXECUTION_ID_ as executionId,
+                et.flow_id as flowId,
+                art.NAME_ as taskName,
+                art.TASK_DEF_KEY_ as taskDefKey,
+                art.ID_ as taskId,
+                tffa.setup
+            from
+                ACT_RU_TASK art
+            left join exam_task et on
+                et.flow_id = art.PROC_INST_ID_
+            left join basic_card_rule b ON
+                et.card_rule_id = b.id
+            left join t_f_flow_approve tffa on
+                tffa.flow_id = et.flow_id
+            left join sys_user c ON
+                art.ASSIGNEE_ = c.id
+            where
+                 art.ASSIGNEE_ = #{userId}
+                and et.school_id = #{schoolId}
+            UNION all
+                    select
+                et.id,
+                et.school_id schoolId,
+                et.org_id as orgId,
+                et.course_code courseCode,
+                et.course_name courseName,
+                et.specialty,
+                et.paper_number paperNumber,
+                et.card_rule_id cardRuleId,
                 case
-                    when et.ariUserId is not null then
-                        et.ariUserId
-                    when et.assigneeId is not null then
-                        et.assigneeId
-                end as userId
+                    et.card_rule_id when -1 then '全部通卡'
+                    else b.name
+                end cardRuleName,
+                ari.USER_ID_ as userId,
+                c.real_name userName,
+                et.start_time startTime,
+                et.end_time endTime,
+                tffa.status,
+                et.enable,
+                et.create_time createTime,
+                art.EXECUTION_ID_ as executionId,
+                et.flow_id as flowId,
+                art.NAME_ as taskName,
+                art.TASK_DEF_KEY_ as taskDefKey,
+                art.ID_ as taskId,
+                tffa.setup
+            from
+                ACT_RU_TASK art
+            left join exam_task et on
+                et.flow_id = art.PROC_INST_ID_
+            left join act_ru_identitylink ari on
+                ari.TASK_ID_ = art.ID_
+            left join basic_card_rule b ON
+                et.card_rule_id = b.id
+            left join t_f_flow_approve tffa on
+                tffa.flow_id = et.flow_id
+            left join sys_user c ON
+                ari.USER_ID_ = c.id
+            where
+                art.ASSIGNEE_ is null
+                and ari.USER_ID_ = #{userId}
+                and ari.TYPE_ = 'candidate'
+                and et.school_id = #{schoolId}
+            union all
+                    select
+                et.id,
+                et.school_id schoolId,
+                et.org_id as orgId,
+                et.course_code courseCode,
+                et.course_name courseName,
+                et.specialty,
+                et.paper_number paperNumber,
+                et.card_rule_id cardRuleId,
+                case
+                    et.card_rule_id when -1 then '全部通卡'
+                    else b.name
+                end cardRuleName,
+                et.userId,
+                c.real_name userName,
+                et.start_time startTime,
+                et.end_time endTime,
+                et.flowStatus as status,
+                et.enable,
+                et.create_time createTime,
+                et.EXECUTION_ID_ as executionId,
+                et.flow_id as flowId,
+                et.NAME_ as taskName,
+                et.TASK_DEF_KEY_ as taskDefKey,
+                et.ID_ as taskId,
+                et.setup
             from
                 (
                 select
                     et.*,
-                    art.ASSIGNEE_ as assigneeId,
+                    et.user_id as userId
+                from
                     (
                     select
-                        ari.USER_ID_
+                        et.*,
+                        tffa.status as flowStatus,
+                        art.EXECUTION_ID_,
+                        art.NAME_,
+                        art.TASK_DEF_KEY_,
+                        art.ID_,
+                        tffa.setup
                     from
-                        act_ru_identitylink ari
+                        exam_task et
+                    left join ACT_RU_TASK art on
+                        et.flow_id = art.PROC_INST_ID_
+                    left join t_f_flow_approve tffa on
+                        tffa.flow_id = et.flow_id
                     where
-                        ari.TASK_ID_ = art.ID_
-                        and art.ASSIGNEE_ is null
-                        and ari.TYPE_ = 'candidate'
-                        and ari.USER_ID_ = #{userId}) as ariUserId,
-                    tffa.status as flowStatus,
-                    art.EXECUTION_ID_,
-                    art.NAME_,
-                    art.TASK_DEF_KEY_,
-                    art.ID_,
-                    tffa.setup
-                from
-                    exam_task et
-                left join ACT_RU_TASK art on
-                    et.flow_id = art.PROC_INST_ID_
-                left join t_f_flow_approve tffa on
-                    tffa.flow_id = et.flow_id
-                where
-                    et.school_id = 2
-                    and et.flow_id is not null) et
-             ) et
-        left join basic_card_rule b ON
-                    et.card_rule_id = b.id
-        left join sys_user c ON
-            et.userId = c.id
-        where
-            et.userId = #{userId}
-        union all
-        select
-            et.id,
-            et.school_id schoolId,
-            et.org_id as orgId,
-            et.course_code courseCode,
-            et.course_name courseName,
-            et.specialty,
-            et.paper_number paperNumber,
-            et.card_rule_id cardRuleId,
-            case
-                et.card_rule_id when -1 then '全部通卡'
-                else b.name
-            end cardRuleName,
-            et.userId,
-            c.real_name userName,
-            et.start_time startTime,
-            et.end_time endTime,
-            et.flowStatus as status,
-            et.enable,
-            et.create_time createTime,
-            et.EXECUTION_ID_ as executionId,
-            et.flow_id as flowId,
-            et.NAME_ as taskName,
-            et.TASK_DEF_KEY_ as taskDefKey,
-            et.ID_ as taskId,
-            et.setup
-        from
-            (
-            select
-                et.*,
-                et.user_id as userId
-            from
-                (
-                select
-                    et.*,
-                    tffa.status as flowStatus,
-                    art.EXECUTION_ID_,
-                    art.NAME_,
-                    art.TASK_DEF_KEY_,
-                    art.ID_,
-                    tffa.setup
-                from
-                    exam_task et
-                left join ACT_RU_TASK art on
-                    et.flow_id = art.PROC_INST_ID_
-                left join t_f_flow_approve tffa on
-                    tffa.flow_id = et.flow_id
-                where
-                    et.school_id = #{schoolId}
-                    and et.flow_id is null) et
-             ) et
-        left join basic_card_rule b ON
-                    et.card_rule_id = b.id
-        left join sys_user c ON
-            et.userId = c.id
-        where
-            et.userId = #{userId}
+                        et.school_id = #{schoolId}
+                        and et.user_id = #{userId}
+                        and et.flow_id is null) et
+                         ) et
+            left join basic_card_rule b ON
+                et.card_rule_id = b.id
+            left join sys_user c ON
+                et.userId = c.id
     </select>
 
     <select id="findByFlowStatus" resultType="com.qmth.distributed.print.business.entity.ExamTask">