修改终审列表

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -167,25 +167,34 @@
 		</where>
 	</sql>
 	<select id="listFinal" resultType="cn.jyjz.xiaoyao.ocr.dataobject.OcrTaskchildPicture" parameterType="java.util.Map">
-
         select tcp.*,pic.field11 reporttime from (
         select
         tc.*
         from ocr_taskchild_picture tc,OA_USERFINAL_T uf
         where tc.ID = uf.FORMID
-			<if test="thisLoginUserid != null"> and uf.USERID ${thisLoginUserid.dataOp} ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}</if>
+        <if test="thisLoginUserid != null">
+            and uf.USERID ${thisLoginUserid.dataOp}
+            ${thisLoginUserid.likestar}#{thisLoginUserid.value}${thisLoginUserid.likeend}
+        </if>
         UNION
         select
         tc.*
         from ocr_taskchild_picture tc
         where tc.STATES = 5
-		) as tcp,ocr_picture pic
-		where tcp.PICTUREID = pic.ID
-		<include refid="Base_Where_union"></include>
-		<if test="fromuptimeStart != null"> and tcp.fromuptime &gt;= ${fromuptimeStart}  </if>
-		<if test="fromuptimeEnd != null"> and tcp.fromuptime &lt;= ${fromuptimeEnd}  </if>
+        ) as tcp left join ocr_picture pic
+        on tcp.PICTUREID = pic.ID
+        <include refid="Base_Where_union">
+        </include>
+        <if test="fromuptimeStart != null">
+            and tcp.fromuptime &gt;= ${fromuptimeStart}
+        </if>
+        <if test="fromuptimeEnd != null">
+            and tcp.fromuptime &lt;= ${fromuptimeEnd}
+        </if>
         <if test="page != null">
-			<if test="page.sortname != null"> order by tcp.${page.sortname} ${page.sortorder}</if>
+            <if test="page.sortname != null">
+                order by tcp.${page.sortname} ${page.sortorder}
+            </if>
             limit ${page.start}, ${page.Pagesize}
         </if>
     </select>