Merge #13 into master from cc_20251211_jinjian

feat:进件

* cc_20251211_jinjian: (3 commits squashed)

  - feat:进件

  - Merge branch 'master' into cc_20251211_jinjian

  - feat:进件

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/13

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java

@@ -7,6 +7,7 @@ import com.cool.store.enums.OpenStatusEnum;
 import com.cool.store.enums.PlatformBuildEnum;
 import com.cool.store.enums.ShopAccountEnum;
 import com.cool.store.mapper.ShopAccountMapper;
+import com.cool.store.request.DeskRequest;
 import com.cool.store.utils.StringUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.ibatis.annotations.Param;
@@ -191,4 +192,14 @@ public class ShopAccountDAO {
         List<ShopAccountDO> shopAccountDOS = shopAccountMapper.selectAll();
         return new ArrayList<>(shopAccountDOS.stream().map(ShopAccountDO::getShopId).collect(Collectors.toSet())) ;
     }
+
+    /**
+     * 进件待办列表
+     * @param deskRequest
+     * @param systemName
+     * @return
+     */
+    public List<ShopAccountDO> getEntryPendingList(DeskRequest deskRequest, String systemName){
+        return shopAccountMapper.getEntryPendingList(deskRequest,systemName);
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java

@@ -1,6 +1,7 @@
 package com.cool.store.mapper;
 
 import com.cool.store.entity.ShopAccountDO;
+import com.cool.store.request.DeskRequest;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 import tk.mybatis.mapper.common.Mapper;
@@ -101,5 +102,13 @@ public interface ShopAccountMapper extends Mapper<ShopAccountDO> {
 
     Integer updateStatusDataHandle(@Param("list") List<Long> shopIds);
 
+    /**
+     * 进件待办列表
+     * @param request
+     * @param systemName
+     * @return
+     */
+    List<ShopAccountDO> getEntryPendingList(@Param("request") DeskRequest request, @Param("systemName") String systemName);
+
 
 }

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

@@ -214,4 +214,52 @@
         WHERE `password` is null and `system_name` = '火码POS'
 
     </select>
+
+
+    <select id="getEntryPendingList" resultMap="BaseResultMap">
+        select
+        *
+        from xfsg_shop_account a
+        left join xfsg_shop_info si on a.shop_id = si.id
+        <if test="request.signTypes != null and request.signTypes.size() >0">
+            left join xfsg_sign_franchise sign on a.shop_id = sign.shop_id
+        </if>
+        <where>
+            si.deleted = 0 and si.shop_status !=2 and a.`entry_status` in (2,3,4,6)
+            <if test="systemName!=null and systemName!=''">
+                and a.system_name = #{systemName}
+            </if>
+            <if test="request.shopKeyword !=null and request.shopKeyword !=''">
+                and (si.shop_name like concat('%',#{request.shopKeyword},'%') or si.shop_code like concat('%',#{request.shopKeyword},'%'))
+            </if>
+            <if test="request.regionIds !=null and request.regionIds.size()>0">
+                and si.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 si.store_type in
+                <foreach collection="request.storeTypes" item="storeType" index="index" open="(" separator="," close=")">
+                    #{storeType}
+                </foreach>
+            </if>
+            <if test="request.signTypes !=null and request.signTypes.size()>0">
+                and sign.sign_type in
+                <foreach collection="request.signTypes" item="signType" index="index" open="(" separator="," close=")">
+                    #{signType}
+                </foreach>
+            </if>
+            <if test="request.supervisorId != null and request.supervisorId!= ''">
+                and si.investment_manager = #{request.supervisorId}
+            </if>
+            <if test="request.joinModes !=null and request.joinModes.size()>0">
+                and si.join_mode in
+                <foreach collection="request.joinModes" item="joinMode" index="index" open="(" separator="," close=")">
+                    #{joinMode}
+                </foreach>
+            </if>
+            order by a.create_time desc
+        </where>
+    </select>
 </mapper>