修改导出

src/main/java/org/rcisoft/business/memGoldCoinFlow/entity/MemGoldCoinFlow.java

@@ -25,7 +25,7 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      * @column type
      * @default
      */
-     @Excel(name = "1：充值   2：消费", orderNum = "0", width = 20)
+     @Excel(name = "类型", orderNum = "0", width = 20,replace = {"充值_1","消费_2"})
      private String type;
 
      /**
@@ -33,7 +33,7 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      * @column action_type
      * @default
      */
-     @Excel(name = "10：用户充值  11：系统充值  12:系统赠送  20：点赞   21：发动态    22：留言", orderNum = "1", width = 20)
+     @Excel(name = "方式", orderNum = "1", width = 60,replace = {"用户充值_10","系统充值_11","系统赠送_12","点赞_20","发动态_21","留言_22","要微信联系方式_23","接收微信请求_24"})
      private String actionType;
 
      /**
@@ -57,7 +57,7 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      * @column order_id
      * @default
      */
-     @Excel(name = "订单id", orderNum = "4", width = 20)
+     @Excel(name = "订单号", orderNum = "4", width = 40)
      private BigInteger orderId;
 
      /**
@@ -65,7 +65,6 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      * @column target_id
      * @default
      */
-     @Excel(name = "目标id，用户id", orderNum = "5", width = 20)
      private BigInteger targetId;
 
      //现在的余额
@@ -77,10 +76,12 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      private Integer memberId;
 
      //用户昵称
+     @Excel(name = "发起用户", orderNum = "5", width = 20)
      @TableField(exist = false)
      private String userNickName;
 
      //目标用户昵称
+     @Excel(name = "目标用户", orderNum = "6", width = 20)
      @TableField(exist = false)
      private String targetNickName;
 

src/main/resources/mapper/business/memGoldCoinFlow.mapper/MemGoldCoinFlowMapper.xml

@@ -19,31 +19,39 @@
     </resultMap>
 
     <select id="queryMemGoldCoinFlows" resultMap="BaseResultMap">
-        select * from mem_gold_coin_flow
+        select mgcf.*,
+        mi.mem_nick_name as userNickName,
+        mi2.mem_nick_name as targetNickName
+        from mem_gold_coin_flow mgcf
+        left join mem_info mi on mi.user_id = mgcf.create_by
+        left join mem_info mi2 on mi2.user_id = mgcf.target_id
         where 1=1
-            and del_flag = '0'
-            <if test="entity.flag !=null and entity.flag != '' ">
-                and flag = #{entity.flag}
-            </if>
-            <if test="entity.type !=null and entity.type != '' ">
-                and type = #{entity.type}
-            </if>
-            <if test="entity.actionType !=null and entity.actionType != '' ">
-                and action_type = #{entity.actionType}
-            </if>
-            <if test="entity.count !=null and entity.count != '' ">
-                and count = #{entity.count}
-            </if>
-            <if test="entity.endCount !=null and entity.endCount != '' ">
-                and end_count = #{entity.endCount}
-            </if>
-            <if test="entity.orderId !=null and entity.orderId != '' ">
-                and order_id = #{entity.orderId}
-            </if>
-            <if test="entity.targetId !=null and entity.targetId != '' ">
-                and target_id = #{entity.targetId}
-            </if>
-        ORDER BY business_id DESC
+        and mgcf.del_flag = '0'
+        <if test="entity.beginTime !=null and entity.beginTime != '' ">
+            and mgcf.create_date &gt;=  #{entity.beginTime}
+        </if>
+        <if test="entity.endTime !=null and entity.endTime != '' ">
+            and mgcf.create_date &lt;=  #{entity.endTime}
+        </if>
+        <if test="entity.targetId !=null and entity.targetId != '' ">
+            and mgcf.create_by = #{entity.targetId}
+        </if>
+        <if test="entity.orderId !=null">
+            and mgcf.order_id like concat('%',#{entity.orderId},'%')
+        </if>
+        <if test="entity.type !=null and entity.type != '' ">
+            and mgcf.type = #{entity.type}
+        </if>
+        <if test="entity.actionType !=null and entity.actionType != '' ">
+            and mgcf.action_type = #{entity.actionType}
+        </if>
+        <if test="entity.userNickName !=null and entity.userNickName != '' ">
+            and mi.mem_nick_name like concat('%',#{entity.userNickName},'%')
+        </if>
+        <if test="entity.targetNickName !=null and entity.targetNickName != '' ">
+            and mi2.mem_nick_name like concat('%',#{entity.targetNickName},'%')
+        </if>
+        ORDER BY mgcf.business_id DESC
     </select>
 
     <select id="queryGoldCoinFlowsPaged" resultType="org.rcisoft.business.memGoldCoinFlow.entity.MemGoldCoinFlow">
@@ -74,7 +82,10 @@
                 and mgcf.action_type = #{entity.actionType}
             </if>
             <if test="entity.userNickName !=null and entity.userNickName != '' ">
-                and su.nick_name like concat('%',#{entity.userNickName},'%')
+                and mi.mem_nick_name like concat('%',#{entity.userNickName},'%')
+            </if>
+            <if test="entity.targetNickName !=null and entity.targetNickName != '' ">
+                and mi2.mem_nick_name like concat('%',#{entity.targetNickName},'%')
             </if>
         ORDER BY mgcf.business_id DESC
     </select>