Merge remote-tracking branch 'origin/master'

src/main/java/org/rcisoft/business/memInfo/entity/MemInfo.java

@@ -326,6 +326,12 @@ public class MemInfo  extends CyIdIncreEntity<MemInfo> {
      @Schema(name = "wxOpenid", description = "微信openid", required = false, type = "string")
      private String wxOpenid;
 
+     @Schema(name = "sort", description = "排序")
+     private Integer sort;
+
+     @Schema(name = "isRecommended", description = "是否为推荐（1是、0否）")
+     private Integer isRecommended;
+
      /**
      * 开始时间
      */
@@ -449,5 +455,21 @@ public class MemInfo  extends CyIdIncreEntity<MemInfo> {
       */
      @TableField(exist = false)
      private String avatarUrl;
+
+     /**
+      * @desc 会员号直等筛选
+      * @column memCodeStr
+      * @default
+      */
+     @TableField(exist = false)
+     private String memCodeStr;
+
+     /**
+      * @desc 微信号直等筛选
+      * @column memWxCodeStr
+      * @default
+      */
+     @TableField(exist = false)
+     private String memWxCodeStr;
 }
 

src/main/java/org/rcisoft/business/memInfo/service/impl/MemInfoServiceImpl.java

@@ -119,6 +119,8 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         memInfo.setMemCode(memCode);
         //增加操作
         memInfo.setUserId(userRbac.getBusinessId());
+        memInfo.setSort(0);
+        memInfo.setIsRecommended(0);
         int line = baseMapper.insert(memInfo);
         log.debug(CyUserUtil.getAuthenUsername()+"新增了ID为"+
             memInfo.getBusinessId()+"的会员表信息");

src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml

@@ -41,6 +41,8 @@
         <result column="mem_code_level" jdbcType="VARCHAR" property="memCodeLevel"/>
         <result column="avatar" jdbcType="INTEGER" property="avatar"/>
         <result column="wx_openid" jdbcType="VARCHAR" property="wxOpenid"/>
+        <result column="sort" jdbcType="INTEGER" property="sort"/>
+        <result column="is_recommended" jdbcType="INTEGER" property="isRecommended"/>
         <result column="flag" jdbcType="CHAR" property="flag"/>
         <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
         <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
@@ -176,7 +178,7 @@
         m.mem_native_city,m.mem_introduce,m.mem_hobby,m.mem_future_plan,m.mem_half_desire,m.mem_marriage,m.mem_marriage_remarks,
         m.mem_mbti,m.mem_wx_code,m.mem_real_authen,m.mem_real_authen_date,m.mem_level,m.mem_level_begin_date,m.mem_level_end_date,
         m.mem_nick_name,m.mem_code_level,m.flag,m.del_flag,m.create_by,m.create_date,m.update_by,m.update_date,m.remarks,m.mem_nation,m.wx_openid,m.avatar,
-        oi.url as avatarUrl
+        oi.url as avatarUrl,m.sort,m.is_recommended
         from mem_info m
         left join oss_info oi on oi.business_id = m.avatar
         where 1=1
@@ -190,6 +192,9 @@
             <if test="entity.memCode !=null and entity.memCode != '' ">
                 and m.mem_code like concat('%',#{entity.memCode},'%')
             </if>
+            <if test="entity.memCodeStr !=null and entity.memCodeStr != '' ">
+                and m.mem_code = #{entity.memCodeStr}
+            </if>
             <if test="entity.memSex !=null and entity.memSex != '' ">
                 and m.mem_sex = #{entity.memSex}
             </if>
@@ -248,16 +253,28 @@
                 and m.mem_work_place like concat('%',#{entity.memWorkPlace},'%')
             </if>
             <if test="entity.memResidenceProvince !=null and entity.memResidenceProvince != '' ">
-                and m.mem_residence_province like concat('%',#{entity.memResidenceProvince},'%')
+                and m.mem_residence_province in
+                <foreach collection="entity.memResidenceProvince.split(',')" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="entity.memResidenceCity !=null and entity.memResidenceCity != '' ">
-                and m.mem_residence_city like concat('%',#{entity.memResidenceCity},'%')
+                and m.mem_residence_city in
+                <foreach collection="entity.memResidenceCity.split(',')" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="entity.memNativeProvince !=null and entity.memNativeProvince != '' ">
-                and m.mem_native_province like concat('%',#{entity.memNativeProvince},'%')
+                and m.mem_native_province in
+                <foreach collection="entity.memNativeProvince.split(',')" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="entity.memNativeCity !=null and entity.memNativeCity != '' ">
-                and m.mem_native_city like concat('%',#{entity.memNativeCity},'%')
+                and m.mem_native_city in
+                <foreach collection="entity.memNativeCity.split(',')" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="entity.memIntroduce !=null and entity.memIntroduce != '' ">
                 and m.mem_introduce like concat('%',#{entity.memIntroduce},'%')
@@ -283,6 +300,9 @@
             <if test="entity.memWxCode !=null and entity.memWxCode != '' ">
                 and m.mem_wx_code like concat('%',#{entity.memWxCode},'%')
             </if>
+            <if test="entity.memWxCodeStr !=null and entity.memWxCodeStr != '' ">
+                and m.mem_wx_code = #{entity.memWxCodeStr}
+            </if>
             <if test="entity.memRealName !=null and entity.memRealName != '' ">
                 and m.mem_real_name like concat('%',#{entity.memRealName},'%')
             </if>
@@ -322,7 +342,7 @@
             <if test="entity.endTime !=null and entity.endTime != '' ">
                 and m.create_date &lt;=  #{entity.endTime}
             </if>
-        ORDER BY m.business_id DESC
+        ORDER BY m.mem_level desc,m.mem_real_authen desc,m.is_recommended desc,m.sort,m.mem_code desc,m.business_id DESC
     </select>
 
 
@@ -348,7 +368,7 @@
                m.mem_native_city,m.mem_introduce,m.mem_hobby,m.mem_future_plan,m.mem_half_desire,m.mem_marriage,m.mem_marriage_remarks,
                m.mem_mbti,m.mem_wx_code,m.mem_real_authen,m.mem_real_authen_date,m.mem_level,m.mem_level_begin_date,m.mem_level_end_date,
                m.mem_nick_name,m.mem_code_level,m.flag,m.del_flag,m.create_by,m.create_date,m.update_by,m.update_date,m.remarks,m.mem_nation,m.wx_openid,m.avatar,
-               oi.url as avatarUrl
+               oi.url as avatarUrl,m.sort,m.is_recommended
         from mem_info m
         left join oss_info oi on oi.business_id = m.avatar
         where  m.business_id = #{businessId}