Browse Source

项目积分,平台积分

魏熙美 5 years ago
parent
commit
a4a01369e4

+ 10
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java View File

245
      */
245
      */
246
     public static final Integer POINTS_RULE_SIGNUP_AGENT = 4;
246
     public static final Integer POINTS_RULE_SIGNUP_AGENT = 4;
247
 
247
 
248
+    /**
249
+     * 平台积分
250
+     */
251
+    public static final String POINTS_RULE_PLATFORM = "platform";
252
+
253
+    /**
254
+     * 项目积分
255
+     */
256
+    public static final String POINTS_RULE_PROJECT = "project";
257
+
248
 
258
 
249
     // ----   用户活跃数  查询条件 start ------
259
     // ----   用户活跃数  查询条件 start ------
250
 
260
 

+ 10
- 1
src/main/java/com/huiju/estateagents/controller/TdPointsRulesController.java View File

8
 import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.CommConstant;
9
 import com.huiju.estateagents.entity.TdPointsRules;
9
 import com.huiju.estateagents.entity.TdPointsRules;
10
 import com.huiju.estateagents.service.ITdPointsRulesService;
10
 import com.huiju.estateagents.service.ITdPointsRulesService;
11
+import org.apache.commons.lang3.StringUtils;
11
 import org.slf4j.Logger;
12
 import org.slf4j.Logger;
12
 import org.slf4j.LoggerFactory;
13
 import org.slf4j.LoggerFactory;
13
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.beans.factory.annotation.Autowired;
45
      */
46
      */
46
     @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.GET)
47
     @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.GET)
47
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
48
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
48
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
49
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
50
+                                          @RequestParam(value ="buildingId", required = false) String buildingId,
51
+                                          @RequestParam(value = "type", required = false) String type){
49
         ResponseBean responseBean = new ResponseBean();
52
         ResponseBean responseBean = new ResponseBean();
50
         try {
53
         try {
51
             //使用分页插件
54
             //使用分页插件
52
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
55
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
53
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
56
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
54
             queryWrapper.orderByDesc("create_date");
57
             queryWrapper.orderByDesc("create_date");
58
+            queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
59
+            if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
60
+                queryWrapper.isNull("building_id");
61
+            } else if (CommConstant.POINTS_RULE_PROJECT.equals(type)) {
62
+                queryWrapper.isNotNull("building_id");
63
+            }
55
 
64
 
56
             IPage<TdPointsRules> result = iTdPointsRulesService.page(pg, queryWrapper);
65
             IPage<TdPointsRules> result = iTdPointsRulesService.page(pg, queryWrapper);
57
             responseBean.addSuccess(result);
66
             responseBean.addSuccess(result);