文章类型筛选后合计数失效bug修复+客户金币地区

src/main/resources/jindouMapper/BeanConsumeMapper.xml

@@ -287,13 +287,13 @@
                 AND fm.dept = #{beanConsumeArticle.dept}
             </if>
             <if test="beanConsumeArticle.ArticleName != null and beanConsumeArticle.ArticleName != ''">
-                AND fyr.source_name =#{beanConsumeArticle.articleName}
+                AND fyr.source_name LIKE CONCAT('%',#{beanConsumeArticle.articleName}, '%')
             </if>
             <if test="beanConsumeArticle.author != null and beanConsumeArticle.author != ''">
                 AND (SELECT fm2.nickname
                 FROM fx_member fm2
                 WHERE fm2.jwcode = fyr.source_jwcode
-                LIMIT 1)=#{beanConsumeArticle.author}
+                LIMIT 1)LIKE CONCAT('%',#{beanConsumeArticle.author}, '%')
             </if>
             <if test="beanConsumeArticle.articleId != null and beanConsumeArticle.articleId != ''">
                 AND fyr.source_id =#{beanConsumeArticle.articleId}

src/main/resources/mapper/GoldDetailMapper.xml

@@ -73,13 +73,22 @@
 
     </select>
     <select id="getGold" resultType="com.example.demo.domain.entity.User">
-        select * from user
+        select u.id,u.jwcode,u.name,m.name as market,u.sum_permanent_gold,
+               u.sum_free_june,u.sum_free_december,u.sum_task_gold,
+               u.current_permanent_gold,u.current_free_june,
+               u.current_free_december,u.current_task_gold,
+               u.recharge_num,u.consume_num,
+               u.sum_consume_permanent,u.sum_consume_task,
+               u.sum_consume_free,u.first_recharge,u.create_time,
+               u.update_time
+        from user u
+        left join market m on u.market = m.id
         <where>
             <if test="jwcode != null">
                 and jwcode = #{jwcode}
             </if>
             <if test="markets != null and markets.size > 0">
-                AND user.market IN
+                AND m.name IN
                 <foreach collection="markets" item="market" open="(" separator="," close=")">
                     #{market}
                 </foreach>