傅行帆 hace 5 años
padre
commit
96bc5a0f87

+ 4
- 6
src/main/java/com/huiju/estateagents/controller/TaPointsExchangeController.java Ver fichero

42
      * @param pageSize
42
      * @param pageSize
43
      * @return
43
      * @return
44
      */
44
      */
45
-    @RequestMapping(value="/taPointsExchange",method= RequestMethod.GET)
45
+    @RequestMapping(value="/admin/taPointsExchange",method= RequestMethod.GET)
46
     public ResponseBean taPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
46
     public ResponseBean taPointsExchangeList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
47
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48
         ResponseBean responseBean = new ResponseBean();
48
         ResponseBean responseBean = new ResponseBean();
49
         try {
49
         try {
50
             //使用分页插件
50
             //使用分页插件
51
-		    IPage<TaPointsExchange> pg = new Page<>(pageNum, pageSize);
52
-            QueryWrapper<TaPointsExchange> queryWrapper = new QueryWrapper<>();
53
-            queryWrapper.orderByDesc("create_date");
51
+            TaPointsExchange taPointsExchange = new TaPointsExchange();
52
+            
53
+            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
54
 
54
 
55
-            IPage<TaPointsExchange> result = iTaPointsExchangeService.page(pg, queryWrapper);
56
-            responseBean.addSuccess(result);
57
         }catch (Exception e){
55
         }catch (Exception e){
58
             e.printStackTrace();
56
             e.printStackTrace();
59
             logger.error("taPointsExchangeList -=- {}",e.toString());
57
             logger.error("taPointsExchangeList -=- {}",e.toString());

+ 21
- 2
src/main/java/com/huiju/estateagents/entity/TaPointsExchange.java Ver fichero

1
 package com.huiju.estateagents.entity;
1
 package com.huiju.estateagents.entity;
2
 
2
 
3
 import com.baomidou.mybatisplus.annotation.IdType;
3
 import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableField;
4
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import com.baomidou.mybatisplus.annotation.TableId;
5
 import lombok.Data;
6
 import lombok.Data;
6
 import lombok.EqualsAndHashCode;
7
 import lombok.EqualsAndHashCode;
89
      * 创建时间
90
      * 创建时间
90
      */
91
      */
91
     private LocalDateTime createDate;
92
     private LocalDateTime createDate;
93
+    
94
+    /**
95
+     * 领取时间
96
+     */
97
+    private LocalDateTime verifyDate;
92
 
98
 
93
     /**
99
     /**
94
      * 公司id
100
      * 公司id
99
      * 楼盘id
105
      * 楼盘id
100
      */
106
      */
101
     private String buildingId;
107
     private String buildingId;
102
-
103
-
108
+    
109
+    @TableField(exist = false)
110
+    private String personType;
111
+    
112
+    @TableField(exist = false)
113
+    private String startCreateDate;
114
+    
115
+    @TableField(exist = false)
116
+    private String endCreateDate;
117
+    
118
+    @TableField(exist = false)
119
+    private String startVerifyDate;
120
+    
121
+    @TableField(exist = false)
122
+    private String endVerifyDate;
104
 }
123
 }

+ 5
- 1
src/main/java/com/huiju/estateagents/mapper/TaPointsExchangeMapper.java Ver fichero

1
 package com.huiju.estateagents.mapper;
1
 package com.huiju.estateagents.mapper;
2
 
2
 
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
3
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
4
 import com.huiju.estateagents.entity.TaPointsExchange;
5
 import com.huiju.estateagents.entity.TaPointsExchange;
5
 import org.apache.ibatis.annotations.Mapper;
6
 import org.apache.ibatis.annotations.Mapper;
6
 
7
 
8
+import java.util.List;
9
+
7
 /**
10
 /**
8
  * <p>
11
  * <p>
9
  * 积分兑换记录  Mapper 接口
12
  * 积分兑换记录  Mapper 接口
14
  */
17
  */
15
 @Mapper
18
 @Mapper
16
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
19
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
17
-
20
+	
21
+	List<TaPointsExchange> selectListByParams(Page page, TaPointsExchange taPointsExchange);
18
 }
22
 }

+ 4
- 1
src/main/java/com/huiju/estateagents/service/ITaPointsExchangeService.java Ver fichero

1
 package com.huiju.estateagents.service;
1
 package com.huiju.estateagents.service;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.baomidou.mybatisplus.extension.service.IService;
4
 import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.estateagents.base.ResponseBean;
4
 import com.huiju.estateagents.entity.TaPointsExchange;
6
 import com.huiju.estateagents.entity.TaPointsExchange;
5
 
7
 
6
 /**
8
 /**
12
  * @since 2019-07-25
14
  * @since 2019-07-25
13
  */
15
  */
14
 public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
16
 public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
15
-
17
+	
18
+	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange);
16
 }
19
 }

+ 25
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPointsExchangeServiceImpl.java Ver fichero

1
 package com.huiju.estateagents.service.impl;
1
 package com.huiju.estateagents.service.impl;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
4
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
3
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
+import com.huiju.estateagents.base.ResponseBean;
4
 import com.huiju.estateagents.entity.TaPointsExchange;
7
 import com.huiju.estateagents.entity.TaPointsExchange;
5
 import com.huiju.estateagents.mapper.TaPointsExchangeMapper;
8
 import com.huiju.estateagents.mapper.TaPointsExchangeMapper;
6
 import com.huiju.estateagents.service.ITaPointsExchangeService;
9
 import com.huiju.estateagents.service.ITaPointsExchangeService;
10
+import org.springframework.beans.factory.annotation.Autowired;
7
 import org.springframework.stereotype.Service;
11
 import org.springframework.stereotype.Service;
8
 
12
 
13
+import java.util.List;
14
+
9
 /**
15
 /**
10
  * <p>
16
  * <p>
11
  * 积分兑换记录  服务实现类
17
  * 积分兑换记录  服务实现类
16
  */
22
  */
17
 @Service
23
 @Service
18
 public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMapper, TaPointsExchange> implements ITaPointsExchangeService {
24
 public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMapper, TaPointsExchange> implements ITaPointsExchangeService {
19
-
25
+	
26
+	@Autowired
27
+	private TaPointsExchangeMapper taPointsExchangeMapper;
28
+	
29
+	
30
+	/**
31
+	 * 分页获取数据
32
+	 *
33
+	 * @param taPointsExchange
34
+	 * @return
35
+	 */
36
+	@Override
37
+	public ResponseBean selectList(Integer pageNum, Integer pageSize,TaPointsExchange taPointsExchange) {
38
+		Page page = new Page(pageNum,pageSize);
39
+		// 分页查询
40
+		List<TaPointsExchange> list = taPointsExchangeMapper.selectListByParams(page,taPointsExchange);
41
+		page.setRecords(list);
42
+		return ResponseBean.success(page);
43
+	}
20
 }
44
 }

+ 23
- 0
src/main/resources/mapper/TaPointsExchangeMapper.xml Ver fichero

2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
2
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3
 <mapper namespace="com.huiju.estateagents.mapper.TaPointsExchangeMapper">
3
 <mapper namespace="com.huiju.estateagents.mapper.TaPointsExchangeMapper">
4
 
4
 
5
+    <select id="selectListByParams" resultType="com.huiju.estateagents.entity.TaPointsExchange">
6
+        SELECT
7
+            t.rec_id,
8
+            t.person_id,
9
+            t.person_name,
10
+            t.phone,
11
+            t.avatar,
12
+            t.target_id,
13
+            t.target_name,
14
+            t.image,
15
+            t.points,
16
+            t.address,
17
+            t.`status`,
18
+            t.expired_date,
19
+            t.create_date,
20
+            t.org_id,
21
+            t.building_id,
22
+            t.verify_date,
23
+            p.person_type
24
+        FROM
25
+            ta_points_exchange t
26
+            LEFT JOIN ta_person p ON t.person_id = p.person_id
27
+    </select>
5
 </mapper>
28
 </mapper>