Merge branch 'cc_20250513_franchise_report' into cc_2250513_api

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

@@ -14,6 +14,7 @@
     <result column="join_mode" jdbcType="TINYINT" property="joinMode" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="group_name" jdbcType="VARCHAR" property="groupName" />
   </resultMap>
 
 

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

@@ -482,6 +482,30 @@
         a.create_time >= '2025-04-19 00:00:00'
         and b.downstream_system_salting is null;
     </select>
+    <select id="getShopFranchiseReportList" resultType="com.cool.store.dto.FranchiseReportDTO">
+        select
+        a.id as shopId,
+        a.region_id as regionId,
+        a.store_type as storeType
+        from  xfsg_shop_info a
+        left join xfsg_shop_stage_info b on a.id = b.shop_id
+        where
+        a.deleted = 0 and a.shop_status != 2 and a.franchise_brand = 1
+        and  b.shop_sub_stage = 150 and b.is_terminated = 1
+        <if test = "request.regionIds !=null and request.regionIds.size >0">
+            and a.region_id in
+            <foreach collection="request.regionIds" item="regionId" index="index" open="(" separator="," close=")">
+                #{regionId}
+            </foreach>
+        </if>
+        <if test = "request.storeTypes !=null and request.storeTypes.size >0">
+            and a.store_type in
+            <foreach collection="request.storeTypes" item="storeType" index="index" open="(" separator="," close=")">
+                #{storeType}
+            </foreach>
+        </if>
+       and  b.actual_completion_time >= #{request.buildStartTime} and b.actual_completion_time &lt;= #{request.buildEndTime}
+    </select>
 
     <update id="batchUpdate" parameterType="list">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">