[新增] 工作流工作台 及权限申请流程

adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -141,7 +141,13 @@
                 #{id}
             </foreach>
         </if>
-
+        <!--id搜索-->
+        <if test="Vo.ids !=null and Vo.ids.size() > 0">
+            and Vo.ids in
+            <foreach collection="Vo.ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
 
         <!--用户搜索-->
         <if test="Vo.usid != null and Vo.usid != ''">
@@ -164,11 +170,28 @@
 
 
     <select id="getAddReportPage" resultType="com.adc.da.report.vo.ReportVo">
-        select * from TT_REPORT_MANAGE
+        SELECT a.*
+        from (
+          select * from TT_REPORT_MANAGE eo
+                            LEFT JOIN tr_report_user ru on eo.id = ru.reportId
+          WHERE eo.DEL_FLAG = 0 and ru.userId != #{pageVO.usid}
+
+        <if test="pageVO.name !='' and pageVO.name != null">
+            and name like  CONCAT(CONCAT('%',#{pageVO.name}),'%')
+        </if>
+        <!--年份搜索-->
+        <if test="pageVO.year != null and pageVO.year.size() > 0">
+            and year in
+            <foreach collection="pageVO.year" item="year" open="(" separator="," close=")">
+                #{year}
+            </foreach>
+        </if>
+                      ) a
+
+       LEFT JOIN power_apply pa on pa.report_id = a.id
+        where
+            pa.user_id is null or pa.user_id != #{pageVO.usid}
 
-        <where>
-            del = 0
-        </where>
     </select>
 
 </mapper>