From bb71b47a43244e6db57cbc3cd0223bc5a64023d7 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期五, 10 十一月 2023 10:40:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm --- src/main/resources/mapper/PriOnline2Mapper.xml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mapper/PriOnline2Mapper.xml b/src/main/resources/mapper/PriOnline2Mapper.xml index d1a7bd1..dee724a 100644 --- a/src/main/resources/mapper/PriOnline2Mapper.xml +++ b/src/main/resources/mapper/PriOnline2Mapper.xml @@ -19,6 +19,11 @@ <result column="check_data" property="checkData" /> <result column="settle" property="settle" /> <result column="settle_size" property="settleSize" /> + <result column="assistant_plan_id" property="assistantPlanId" /> + <result column="host_plan_id" property="hostPlanId" /> + <result column="assistant_pri_id" property="assistantPriId" /> + <result column="host_pri_id" property="hostPriId" /> + <result column="assistant_host_sign" property="assistantHostSign" /> </resultMap> <!-- 鏌ヨ缁撴灉涓嶅寘鍚玡xcel鏁版嵁data锛屼互鍏嶇粨鏋滈泦杩囧ぇ --> @@ -36,6 +41,14 @@ <result column="update_time" property="updateTime" /> <result column="settle" property="settle" /> <result column="settle_size" property="settleSize" /> + <result column="assistant_plan_id" property="assistantPlanId" /> + <result column="host_plan_id" property="hostPlanId" /> + <result column="assistant_host_sign" property="assistantHostSign" /> + <result column="assistant_plan_id" property="assistantPlanId" /> + <result column="host_plan_id" property="hostPlanId" /> + <result column="assistant_pri_id" property="assistantPriId" /> + <result column="host_pri_id" property="hostPriId" /> + <result column="assistant_host_sign" property="assistantHostSign" /> </resultMap> <select id="listByPage" resultMap="NoDataResultMap"> @@ -62,4 +75,36 @@ ORDER BY id DESC </select> + <select id="listByAll" resultMap="NoDataResultMap"> + SELECT + * + FROM man_pri_online2 mp + WHERE 1=1 + and + mp.id in + ( + select + pri_online2_id + from man_pri_online2_foll + where 1=1 + and user_id = #{userId} + ) + ORDER BY id DESC + </select> + + <select id="listByAllTotal" resultType="java.lang.Integer"> + SELECT + count (1) + FROM man_pri_online2 mp + WHERE 1=1 + and + mp.id in + ( + select + pri_online2_id + from man_pri_online2_foll + where 1=1 + and user_id = #{userId} + ) + </select> </mapper> -- Gitblit v1.9.1