Merge remote-tracking branch 'origin/master'

pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.91isoft</groupId>
             <artifactId>91isoft_spbt</artifactId>
-            <version>3.3.0_core_alpha5</version>
+            <version>3.3.0_core_alpha6</version>
             <!--            <version>3.0.0_nlt.25</version>-->
             <!-- 排除oracle12的驱动，此处代码不能提交，测试使用的是12，生产为11 -->
         </dependency>

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

@@ -319,8 +319,8 @@ public class MemInfo  extends CyIdIncreEntity<MemInfo> {
       * @column avatar
       * @default
       */
-     @Schema(name = "avatar", description = "头像地址", required = false, type = "string")
-     private String avatar;
+     @Schema(name = "avatar", description = "头像地址", required = false)
+     private Integer avatar;
 
 
      @Schema(name = "wxOpenid", description = "微信openid", required = false, type = "string")
@@ -441,5 +441,13 @@ public class MemInfo  extends CyIdIncreEntity<MemInfo> {
       */
      @TableField(exist = false)
      private Integer maxAge;
+
+     /**
+      * @desc 头像地址
+      * @column avatar
+      * @default
+      */
+     @TableField(exist = false)
+     private String avatarUrl;
 }
 

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

@@ -104,7 +104,7 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         userRbac.setFlag(CyFlagStaCons.NORMAL.getStatus());
         userRbac.setDelFlag(CyDelStaCons.NORMAL.getStatus());
         userRbac.setWxOpenid(memInfo.getWxOpenid());
-        userRbac.setAvatar(memInfo.getAvatar());
+//        userRbac.setAvatar(memInfo.getAvatar());
         userRbac.setNickName(memInfo.getMemNickName());
         sysUserRbacRepository.insert(userRbac);
         //查询会员角色
@@ -184,7 +184,7 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         userRbac.setPhone(memInfo.getMemPhone());
         userRbac.setSex(memInfo.getMemSex());
         userRbac.setIdNumber(memInfo.getMemIdcard());
-        userRbac.setAvatar(memInfo.getAvatar());
+//        userRbac.setAvatar(memInfo.getAvatar());
         userRbac.setNickName(memInfo.getMemNickName());
         sysUserRbacRepository.updateById(userRbac);
         int line = baseMapper.updateById(memInfo);

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

@@ -39,7 +39,7 @@
         <result column="mem_level_end_date" jdbcType="TIMESTAMP" property="memLevelEndDate"/>
         <result column="mem_nick_name" jdbcType="VARCHAR" property="memNickName"/>
         <result column="mem_code_level" jdbcType="VARCHAR" property="memCodeLevel"/>
-        <result column="avatar" jdbcType="VARCHAR" property="avatar"/>
+        <result column="avatar" jdbcType="INTEGER" property="avatar"/>
         <result column="wx_openid" jdbcType="VARCHAR" property="wxOpenid"/>
         <result column="flag" jdbcType="CHAR" property="flag"/>
         <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
@@ -48,6 +48,7 @@
         <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
         <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
         <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
+        <result column="avatarUrl" jdbcType="VARCHAR" property="avatarUrl"/>
     </resultMap>
 
     <!--<cache type="${corePackag!}.util.RedisCache"/>-->
@@ -170,156 +171,158 @@
     </select>
 
     <select id="queryMemInfosPaged" resultMap="BaseResultMap">
-        select business_id,user_id,mem_code,mem_sex,mem_birthday,mem_constellation,mem_height,mem_weight,mem_max_education,
-        mem_college,mem_career,mem_year_income,mem_work_place,mem_residence_province,mem_residence_city,mem_native_province,
-        mem_native_city,mem_introduce,mem_hobby,mem_future_plan,mem_half_desire,mem_marriage,mem_marriage_remarks,
-        mem_mbti,mem_wx_code,mem_real_authen,mem_real_authen_date,mem_level,mem_level_begin_date,mem_level_end_date,
-        mem_nick_name,mem_code_level,flag,del_flag,create_by,create_date,update_by,update_date,remarks,mem_nation,wx_openid,avatar
-        from mem_info
+        select m.business_id,m.user_id,m.mem_code,m.mem_sex,m.mem_birthday,m.mem_constellation,m.mem_height,m.mem_weight,m.mem_max_education,
+        m.mem_college,m.mem_career,m.mem_year_income,m.mem_work_place,m.mem_residence_province,m.mem_residence_city,m.mem_native_province,
+        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
+        from mem_info m
+        left join oss_info oi on oi.business_id = m.avatar
         where 1=1
-            and del_flag = '0'
+            and m.del_flag = '0'
             <if test="entity.flag !=null and entity.flag != '' ">
-                and flag = #{entity.flag}
+                and m.flag = #{entity.flag}
             </if>
             <if test="entity.userId !=null and entity.userId != '' ">
-                and user_id = #{entity.userId}
+                and m.user_id = #{entity.userId}
             </if>
             <if test="entity.memCode !=null and entity.memCode != '' ">
-                and mem_code like concat('%',#{entity.memCode},'%')
+                and m.mem_code like concat('%',#{entity.memCode},'%')
             </if>
             <if test="entity.memSex !=null and entity.memSex != '' ">
-                and mem_sex = #{entity.memSex}
+                and m.mem_sex = #{entity.memSex}
             </if>
             <if test="entity.memBirthday !=null and entity.memBirthday != '' ">
-                and mem_birthday like concat('%',#{entity.memBirthday},'%')
+                and m.mem_birthday like concat('%',#{entity.memBirthday},'%')
             </if>
             <if test="entity.beginBirthday !=null and entity.beginBirthday != '' ">
-                and mem_birthday &gt;= #{entity.beginBirthday}
+                and m.mem_birthday &gt;= #{entity.beginBirthday}
             </if>
             <if test="entity.endBirthday !=null and entity.endBirthday != '' ">
-                and mem_birthday &lt;= #{entity.endBirthday}
+                and m.mem_birthday &lt;= #{entity.endBirthday}
             </if>
             <if test="entity.memConstellation !=null and entity.memConstellation != '' ">
-                and mem_constellation = #{entity.memConstellation}
+                and m.mem_constellation = #{entity.memConstellation}
             </if>
             <if test="entity.memHeight !=null  ">
-                and mem_height = #{entity.memHeight}
+                and m.mem_height = #{entity.memHeight}
             </if>
             <if test="entity.minHeight !=null ">
-                and mem_height &gt;= #{entity.minHeight}
+                and m.mem_height &gt;= #{entity.minHeight}
             </if>
             <if test="entity.maxHeight !=null ">
-                and mem_height &lt;= #{entity.maxHeight}
+                and m.mem_height &lt;= #{entity.maxHeight}
             </if>
             <if test="entity.memWeight !=null ">
-                and mem_weight = #{entity.memWeight}
+                and m.mem_weight = #{entity.memWeight}
             </if>
             <if test="entity.minWeight !=null ">
-                and mem_weight &gt;= #{entity.minWeight}
+                and m.mem_weight &gt;= #{entity.minWeight}
             </if>
             <if test="entity.maxWeight !=null ">
-                and mem_weight  &lt;= #{entity.maxWeight}
+                and m.mem_weight  &lt;= #{entity.maxWeight}
             </if>
             <if test="entity.educations !=null and entity.educations != '' ">
-                and mem_max_education in
+                and m.mem_max_education in
                 <foreach collection="entity.educations.split(',')" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
             <if test="entity.memCollege !=null and entity.memCollege != '' ">
-                and mem_college like concat('%',#{entity.memCollege},'%')
+                and m.mem_college like concat('%',#{entity.memCollege},'%')
             </if>
             <if test="entity.memCareer !=null and entity.memCareer != '' ">
-                and mem_career like concat('%',#{entity.memCareer},'%')
+                and m.mem_career like concat('%',#{entity.memCareer},'%')
             </if>
             <if test="entity.memYearIncome !=null ">
-                and mem_year_income = #{entity.memYearIncome}
+                and m.mem_year_income = #{entity.memYearIncome}
             </if>
             <if test="entity.minYearIncome !=null ">
-                and mem_year_income &gt;= #{entity.minYearIncome}
+                and m.mem_year_income &gt;= #{entity.minYearIncome}
             </if>
             <if test="entity.maxYearIncome !=null ">
-                and mem_year_income &lt;= #{entity.maxYearIncome}
+                and m.mem_year_income &lt;= #{entity.maxYearIncome}
             </if>
             <if test="entity.memWorkPlace !=null and entity.memWorkPlace != '' ">
-                and mem_work_place like concat('%',#{entity.memWorkPlace},'%')
+                and m.mem_work_place like concat('%',#{entity.memWorkPlace},'%')
             </if>
             <if test="entity.memResidenceProvince !=null and entity.memResidenceProvince != '' ">
-                and mem_residence_province like concat('%',#{entity.memResidenceProvince},'%')
+                and m.mem_residence_province like concat('%',#{entity.memResidenceProvince},'%')
             </if>
             <if test="entity.memResidenceCity !=null and entity.memResidenceCity != '' ">
-                and mem_residence_city like concat('%',#{entity.memResidenceCity},'%')
+                and m.mem_residence_city like concat('%',#{entity.memResidenceCity},'%')
             </if>
             <if test="entity.memNativeProvince !=null and entity.memNativeProvince != '' ">
-                and mem_native_province like concat('%',#{entity.memNativeProvince},'%')
+                and m.mem_native_province like concat('%',#{entity.memNativeProvince},'%')
             </if>
             <if test="entity.memNativeCity !=null and entity.memNativeCity != '' ">
-                and mem_native_city like concat('%',#{entity.memNativeCity},'%')
+                and m.mem_native_city like concat('%',#{entity.memNativeCity},'%')
             </if>
             <if test="entity.memIntroduce !=null and entity.memIntroduce != '' ">
-                and mem_introduce like concat('%',#{entity.memIntroduce},'%')
+                and m.mem_introduce like concat('%',#{entity.memIntroduce},'%')
             </if>
             <if test="entity.memHobby !=null and entity.memHobby != '' ">
-                and mem_hobby like concat('%',#{entity.memHobby},'%')
+                and m.mem_hobby like concat('%',#{entity.memHobby},'%')
             </if>
             <if test="entity.memFuturePlan !=null and entity.memFuturePlan != '' ">
-                and mem_future_plan like concat('%',#{entity.memFuturePlan},'%')
+                and m.mem_future_plan like concat('%',#{entity.memFuturePlan},'%')
             </if>
             <if test="entity.memHalfDesire !=null and entity.memHalfDesire != '' ">
-                and mem_half_desire like concat('%',#{entity.memHalfDesire},'%')
+                and m.mem_half_desire like concat('%',#{entity.memHalfDesire},'%')
             </if>
             <if test="entity.memMarriage !=null and entity.memMarriage != '' ">
-                and mem_marriage = #{entity.memMarriage}
+                and m.mem_marriage = #{entity.memMarriage}
             </if>
             <if test="entity.memMarriageRemarks !=null and entity.memMarriageRemarks != '' ">
-                and mem_marriage_remarks like concat('%',#{entity.memMarriageRemarks},'%')
+                and m.mem_marriage_remarks like concat('%',#{entity.memMarriageRemarks},'%')
             </if>
             <if test="entity.memMbti !=null and entity.memMbti != '' ">
-                and mem_mbti like concat('%',#{entity.memMbti},'%')
+                and m.mem_mbti like concat('%',#{entity.memMbti},'%')
             </if>
             <if test="entity.memWxCode !=null and entity.memWxCode != '' ">
-                and mem_wx_code like concat('%',#{entity.memWxCode},'%')
+                and m.mem_wx_code like concat('%',#{entity.memWxCode},'%')
             </if>
             <if test="entity.memRealName !=null and entity.memRealName != '' ">
-                and mem_real_name like concat('%',#{entity.memRealName},'%')
+                and m.mem_real_name like concat('%',#{entity.memRealName},'%')
             </if>
             <if test="entity.memPhone !=null and entity.memPhone != '' ">
-                and mem_phone like concat('%',#{entity.memPhone},'%')
+                and m.mem_phone like concat('%',#{entity.memPhone},'%')
             </if>
             <if test="entity.memIdcard !=null and entity.memIdcard != '' ">
-                and mem_idcard like concat('%',#{entity.memIdcard},'%')
+                and m.mem_idcard like concat('%',#{entity.memIdcard},'%')
             </if>
             <if test="entity.memRealAuthen !=null and entity.memRealAuthen != '' ">
-                and mem_real_authen = #{entity.memRealAuthen}
+                and m.mem_real_authen = #{entity.memRealAuthen}
             </if>
             <if test="entity.authenBeginTime !=null and entity.authenBeginTime != '' ">
-                and mem_real_authen_date &gt;=  #{entity.authenBeginTime}
+                and m.mem_real_authen_date &gt;=  #{entity.authenBeginTime}
             </if>
             <if test="entity.authenEndTime !=null and entity.authenEndTime != '' ">
-                and mem_real_authen_date &lt;=  #{entity.authenEndTime}
+                and m.mem_real_authen_date &lt;=  #{entity.authenEndTime}
             </if>
             <if test="entity.memLevel !=null and entity.memLevel != '' ">
-                and mem_level = #{entity.memLevel}
+                and m.mem_level = #{entity.memLevel}
             </if>
             <if test="entity.memLevelBeginTime !=null and entity.memLevelBeginTime != '' ">
-                and mem_level_begin_date &gt;=  #{entity.memLevelBeginTime}
+                and m.mem_level_begin_date &gt;=  #{entity.memLevelBeginTime}
             </if>
             <if test="entity.memLevelEndTime !=null and entity.memLevelEndTime != '' ">
-                and mem_level_end_date &lt;=  #{entity.memLevelEndTime}
+                and m.mem_level_end_date &lt;=  #{entity.memLevelEndTime}
             </if>
             <if test="entity.memNickName !=null and entity.memNickName != '' ">
-                and mem_nick_name like concat('%',#{entity.memNickName},'%')
+                and m.mem_nick_name like concat('%',#{entity.memNickName},'%')
             </if>
             <if test="entity.memCodeLevel !=null and entity.memCodeLevel != '' ">
-                and mem_code_level = #{entity.memCodeLevel}
+                and m.mem_code_level = #{entity.memCodeLevel}
             </if>
             <if test="entity.beginTime !=null and entity.beginTime != '' ">
-                and create_date &gt;=  #{entity.beginTime}
+                and m.create_date &gt;=  #{entity.beginTime}
             </if>
             <if test="entity.endTime !=null and entity.endTime != '' ">
-                and create_date &lt;=  #{entity.endTime}
+                and m.create_date &lt;=  #{entity.endTime}
             </if>
-        ORDER BY business_id DESC
+        ORDER BY m.business_id DESC
     </select>
 
 
@@ -340,13 +343,15 @@
     </select>
 
     <select id="selectDetailById" resultType="org.rcisoft.business.memInfo.entity.MemInfo" parameterType="int">
-        select business_id,user_id,mem_code,mem_sex,mem_birthday,mem_constellation,mem_height,mem_weight,mem_max_education,
-               mem_college,mem_career,mem_year_income,mem_work_place,mem_residence_province,mem_residence_city,mem_native_province,
-               mem_native_city,mem_introduce,mem_hobby,mem_future_plan,mem_half_desire,mem_marriage,mem_marriage_remarks,
-               mem_mbti,mem_wx_code,mem_real_authen,mem_real_authen_date,mem_level,mem_level_begin_date,mem_level_end_date,
-               mem_nick_name,mem_code_level,flag,del_flag,create_by,create_date,update_by,update_date,remarks,mem_nation,wx_openid,avatar
-        from mem_info
-        where  business_id = #{businessId}
+        select m.business_id,m.user_id,m.mem_code,m.mem_sex,m.mem_birthday,m.mem_constellation,m.mem_height,m.mem_weight,m.mem_max_education,
+               m.mem_college,m.mem_career,m.mem_year_income,m.mem_work_place,m.mem_residence_province,m.mem_residence_city,m.mem_native_province,
+               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
+        from mem_info m
+        left join oss_info oi on oi.business_id = m.avatar
+        where  m.business_id = #{businessId}
     </select>
 
     <select id="selectMaxCode" resultType="java.lang.String">