Explorar o código

公出打卡小程序,全部,审核,通过列表的优化修改

anderx hai 2 semanas
pai
achega
a0c16647c9

+ 5 - 3
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -714,6 +714,7 @@
         </if>
         <if test="type==1">
             left join admin_public_reviewer apr on a.aid=apr.aid
+            left join public_release_log prl on a.id=prl.prid and prl.aid=#{aid}
         </if>
         <if test="type==7">
             left join t_order_public_release_count opc on a.order_no=opc.order_no
@@ -759,6 +760,7 @@
             </if>
         </if>
         <if test="type==1">
+            and apr.reviewer_id = #{aid}
             and a.public_type in (0,2)
             and a.assist in(0,1)
             and a.tech_start_process in (0,2)
@@ -766,14 +768,14 @@
             <if test="status == 1">
                 and a.status = 1 and  a.assist_process in (0,1)
                 and ((apr.type=0 and a.process_status in (0,1)) or(apr.type=4 and a.process_status in (2)))
-                and apr.reviewer_id = #{aid}
+
             </if>
             <if test="status == 2">
                 and a.status in(1,2) and  a.assist_process in (0,2,3,4)
                 and apr.type in (0,4)
-                and a.process_status in (0,4)
-                and apr.reviewer_id = #{aid}
+                and prl.status=2
             </if>
+
         </if>
         <if test="type==2">
             and a.public_type in (0,2)