修改集点活动日志

share-admin/src/main/java/share/web/controller/system/PointActivityLogController.java

@@ -10,6 +10,7 @@ import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.PointActivityLog;
+import share.system.domain.vo.PointActivityLogVo;
 import share.system.service.PointActivityLogService;
 
 import javax.servlet.http.HttpServletResponse;
@@ -32,9 +33,9 @@ public class PointActivityLogController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('system:pointActivityLog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PointActivityLog pointActivityLog) {
+    public TableDataInfo list(PointActivityLogVo pointActivityLog) {
         startPage();
-        List<PointActivityLog> list = pointActivityLogService.selectPointActivityLogList(pointActivityLog);
+        List<PointActivityLogVo> list = pointActivityLogService.selectPointActivityLogList(pointActivityLog);
         return getDataTable(list);
     }
 
@@ -44,9 +45,9 @@ public class PointActivityLogController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:pointActivityLog:export')")
     @Log(title = "集点活动日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PointActivityLog pointActivityLog) {
-        List<PointActivityLog> list = pointActivityLogService.selectPointActivityLogList(pointActivityLog);
-        ExcelUtil<PointActivityLog> util = new ExcelUtil<PointActivityLog>(PointActivityLog.class);
+    public void export(HttpServletResponse response, PointActivityLogVo pointActivityLog) {
+        List<PointActivityLogVo> list = pointActivityLogService.selectPointActivityLogList(pointActivityLog);
+        ExcelUtil<PointActivityLogVo> util = new ExcelUtil<PointActivityLogVo>(PointActivityLogVo.class);
         util.exportExcel(response, list, "集点活动日志数据");
     }
 

share-system/src/main/java/share/system/domain/vo/PointActivityLogVo.java

+package share.system.domain.vo;
+
+import lombok.Data;
+import share.system.domain.PointActivityLog;
+
+@Data
+public class PointActivityLogVo extends PointActivityLog {
+    private String nickName;
+
+    private String avatar;
+
+    private String phone;
+}

share-system/src/main/java/share/system/mapper/PointActivityLogMapper.java

@@ -2,6 +2,7 @@ package share.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import share.system.domain.PointActivityLog;
+import share.system.domain.vo.PointActivityLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface PointActivityLogMapper extends BaseMapper<PointActivityLog> {
      * @param pointActivityLog 集点活动日志
      * @return 集点活动日志集合
      */
-    public List<PointActivityLog> selectPointActivityLogList(PointActivityLog pointActivityLog);
+    public List<PointActivityLogVo> selectPointActivityLogList(PointActivityLogVo pointActivityLog);
 
     /**
      * 新增集点活动日志

share-system/src/main/java/share/system/service/PointActivityLogService.java

@@ -2,6 +2,7 @@ package share.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import share.system.domain.PointActivityLog;
+import share.system.domain.vo.PointActivityLogVo;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface PointActivityLogService extends IService<PointActivityLog> {
      * @param pointActivityLog 集点活动日志
      * @return 集点活动日志集合
      */
-    public List<PointActivityLog> selectPointActivityLogList(PointActivityLog pointActivityLog);
+    public List<PointActivityLogVo> selectPointActivityLogList(PointActivityLogVo pointActivityLog);
 
     /**
      * 新增集点活动日志

share-system/src/main/java/share/system/service/impl/PointActivityLogServiceImpl.java

@@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import share.common.utils.DateUtils;
 import share.system.domain.PointActivityLog;
+import share.system.domain.vo.PointActivityLogVo;
 import share.system.mapper.PointActivityLogMapper;
 import share.system.service.PointActivityLogService;
 
@@ -39,7 +40,7 @@ public class PointActivityLogServiceImpl extends ServiceImpl<PointActivityLogMap
      * @return 集点活动日志
      */
     @Override
-    public List<PointActivityLog> selectPointActivityLogList(PointActivityLog pointActivityLog) {
+    public List<PointActivityLogVo> selectPointActivityLogList(PointActivityLogVo pointActivityLog) {
         return pointActivityLogMapper.selectPointActivityLogList(pointActivityLog);
     }
 

share-system/src/main/resources/mapper/system/PointActivityLogMapper.xml

@@ -35,7 +35,7 @@
         from s_point_activity_log
     </sql>
 
-    <select id="selectPointActivityLogList" parameterType="PointActivityLog" resultMap="PointActivityLogResult">
+    <select id="selectPointActivityLogList" parameterType="PointActivityLogVo" resultMap="PointActivityLogResult">
         <include refid="selectPointActivityLogVo"/>
         <where>
             <if test="consumerId != null ">and consumer_id = #{consumerId}</if>