添加“景区内容（成片、未成片模版、源素材)列表”接口

src/main/resources/mapper/pc/OrderMapper.xml

@@ -46,6 +46,7 @@
         <result column="cancel_at" property="cancelAt"/>
         <result column="create_at" property="createAt"/>
         <result column="update_at" property="updateAt"/>
+        <result column="cover_url" property="coverUrl"/>
         <collection property="orderItemList" ofType="com.ycwl.basic.model.pc.order.resp.OrderItemVO">
             <result column="oiId" property="id"/>
             <result column="id" property="orderId"/>
@@ -258,7 +259,7 @@
     <select id="appList" resultMap="AppBaseResultMap">
         select o.id, o.member_id,m.nickname ,m.real_name , o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
         refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at,oi.id oiId, o.goods_type, oi.goods_id,
-        sc.name scenicName,
+        sc.name scenicName,t.cover_url coverUrl,
         if(o.goods_type='1',t.name,(select count(1) from order_item oi2  where oi2.order_id=o.id)) as goodsName,
         if(o.goods_type='1',vd.video_url,sr.video_url) videoUrl,
         if(o.goods_type='2',sr.url,null) imgUrl,
@@ -274,60 +275,6 @@
             <if test="memberId!=null">
                 and o.member_id=#{memberId}
             </if>
-            <if test="memberNickname!= null and memberNickname!=''">
-                and m.nickname like concat('%',#{memberNickname},'%')
-            </if>
-            <if test="memberRealName!= null and memberRealName!=''">
-                and m.real_name like concat('%',#{memberRealName},'%')
-            </if>
-            <if test="price!= null ">
-                and o.price = #{price}
-            </if>
-            <if test="payPrice!= null ">
-                and pay_price = #{payPrice}
-            </if>
-            <if test="remark!= null and remark!= ''">
-                and remark like concat('%',#{remark},'%')
-            </if>
-            <if test="brokerId!= null ">
-                and o.broker_id = #{brokerId}
-            </if>
-            <if test="promoCode!= null and promoCode!= ''">
-                and o.promo_code like concat('%',#{promoCode},'%')
-            </if>
-            <if test="refundReason!= null and refundReason!= ''">
-                and refund_reason like concat('%',#{refundReason},'%')
-            </if>
-            <if test="refundStatus!= null ">
-                and refund_status = #{refundStatus}
-            </if>
-            <if test="status!= null ">
-                and o.`status` = #{status}
-            </if>
-            <if test="startCreateTime!= null ">
-                and o.create_at >= #{startCreateTime}
-            </if>
-            <if test="endCreateTime!= null ">
-                and o.create_at &lt;= #{endCreateTime}
-            </if>
-            <if test="startPayTime!= null ">
-                and pay_at &gt;= #{startPayTime}
-            </if>
-            <if test="endPayTime!= null ">
-                and pay_at &lt;= #{endPayTime}
-            </if>
-            <if test="startRefundTime!= null ">
-                and refund_at &gt;= #{startRefundTime}
-            </if>
-            <if test="endRefundTime!= null ">
-                and refund_at &lt;= #{endRefundTime}
-            </if>
-            <if test="startCancelTime!= null ">
-                and cancel_at &gt;= #{startCancelTime}
-            </if>
-            <if test="endCancelTime!= null ">
-                and cancel_at &lt;= #{endCancelTime}
-            </if>
             <if test="type!= null ">
                 <if test="type== 0 ">
                     and o.goods_type = 1

src/main/resources/mapper/pc/TaskMapper.xml

@@ -70,4 +70,16 @@ from task
         from task
         where status = 0 and worker_id is null
     </select>
+    <select id="countTask" resultType="java.lang.Integer">
+        select count(1) from task
+        <where>
+            <if test="workerId!= null">and worker_id = #{workerId} </if>
+            <if test="memberId!= null">and member_id = #{memberId} </if>
+            <if test="templateId!= null">and template_id = #{templateId} </if>
+            <if test="scenicId!= null">and scenic_id = #{scenicId} </if>
+            <if test="status!= null">and `status` = #{status} </if>
+            <if test="startTime!= null">and create_time &gt;= #{startTime} </if>
+            <if test="endTime!= null">and create_time &lt;= #{endTime} </if>
+        </where>
+    </select>
 </mapper>

src/main/resources/mapper/pc/TemplateMapper.xml

@@ -48,7 +48,12 @@
         select t.id, t.scenic_id, s.name as scenic_name, t.`name`, cover_url, t.status, t.create_time, t.update_time
         from template t left join scenic s on s.id = t.scenic_id
         <where>
-            pid = 0
+            <if test="pid!=null" >
+                pid = #{pid}
+            </if>
+            <if test="scenicId!=null" >
+                and scenic_id = #{scenicId}
+            </if>
             <if test="name!= null">and locate(#{name},t.`name`) > 0 </if>
             <if test="isPlaceholder!= null">and is_placeholder = #{isPlaceholder} </if>
             <if test="status!= null">and t.`status` = #{status} </if>