待办fix 不查询结束跟进的门店

coolstore-partner-dao/src/main/resources/mapper/DecorationDesignInfoMapper.xml

@@ -55,6 +55,7 @@
     where a.design_user_id = #{userId}
     and b.shop_sub_stage_status = 901
     and c.deleted = 0
+    and c.shop_status !=2
     order by b.update_time desc
   </select>
 

coolstore-partner-dao/src/main/resources/mapper/DecorationMeasureMapper.xml

@@ -51,6 +51,7 @@
         where a.measure_user_id = #{measureUserId}
         and b.shop_sub_stage_status = 892
         and c.deleted = 0
+        and c.shop_status !=2
         order by b.update_time desc
     </select>
     <select id="getShopIdListByDesignUserIdAndShopStage"    resultType="com.cool.store.vo.desk.PreparationCommonPendingVO">
@@ -75,6 +76,7 @@
         where a.design_user_id = #{userId}
         and b.shop_sub_stage_status = 900
         and c.deleted = 0
+        and c.shop_status !=2
         order by b.update_time desc
     </select>
     <select id="getShopIdListByDesignUserIdOrQuotationAndShopStage" resultType="com.cool.store.vo.desk.PreparationCommonPendingVO">
@@ -99,7 +101,7 @@
         left join xfsg_decoration_design_info d on a.shop_id = d.shop_id
         where
          ((b.shop_sub_stage_status = 900 and a.design_user_id = #{userId}) or (b.shop_sub_stage_status = 901 and d.design_user_id = #{userId}))
-        and c.deleted = 0
+        and c.deleted = 0     and c.shop_status !=2
         order by b.update_time desc
 
     </select>

coolstore-partner-dao/src/main/resources/mapper/OperationLogMapper.xml

@@ -83,6 +83,7 @@
         left join xfsg_shop_info b on a.shop_id = b.id
         where
         b.deleted=0
+        and b.shop_status !=2
         and a.operator = #{userId}
         and a.shop_sub_stage_status in
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">

coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

@@ -305,7 +305,7 @@
         from xfsg_shop_stage_info a
            left join xfsg_shop_info si on a.shop_id = si.id
         <where>
-            si.deleted = 0 and a.is_terminated = 0
+            si.deleted = 0 and a.is_terminated = 0 and si.shop_status !=2
             <if test="shopIds != null and shopIds.size() > 0">
                 and a.shop_id in
                 <foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">