UAT问题清单 序号72 法规待办中心排序问题。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/mapper/xml/ProcessInfoEOMapper.xml

@@ -19,9 +19,10 @@
 
     <sql id="BaseQuerySql">
         <where>
-            <if test="params.querySource == '2'">
-                and project_name is not null
-            </if>
+            and temp.project_name is not null
+            <!--<if test="params.querySource == '2'">
+                and temp.project_name is not null
+            </if>-->
             <if test="params.projectName != null and params.projectName !=''">
                 and (
                     temp.project_name like CONCAT(CONCAT('%',#{params.projectName}),'%')
@@ -112,7 +113,10 @@
         order by temp.create_time desc
     </select>
     <select id="queryProjectProcessTodoTaskListList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
-        select temp.* from (
+        select
+               temp.*,
+               (case temp.flow_type when '10' THEN '1'  when '21' THEN '2'  when '2' THEN '3' when '4' THEN '4' END) as "flowTypeShowOrderBy"
+            from (
                SELECT
                    pi.id,
                    pi.project_library_id,
@@ -244,7 +248,15 @@
                     </foreach>
         )temp
         <include refid="BaseQuerySql"/>
-        order by temp.end_time ASC,temp.project_name ASC,standard_info ASC,temp.flow_type ASC
+        order by
+            temp.end_time IS NULL,
+            temp.end_time,
+            temp.project_name IS NULL,
+            temp.project_name,
+            standard_info IS NULL,
+            standard_info,
+            flowTypeShowOrderBy
+        ASC
     </select>
     <select id="queryLawsAssessPageList" resultType="com.jero.modules.todoCenter.vo.ProcessInfoVO">
         select temp.* from (
@@ -267,7 +279,8 @@
                 pi.prc_name,
                 pi.create_by,
                 pi.acti_proc_inst_id,
-                pi.create_time
+                pi.create_time,
+                "project_name" as project_name
             FROM
             process_info pi
             LEFT JOIN buss_document_library bdl ON pi.buss_document_library_id = bdl.id