Merge remote-tracking branch 'origin/zcc'

src/main/java/com/peanut/modules/master/controller/MessageController.java

@@ -27,20 +27,18 @@ public class MessageController {
     @RequestMapping("/listByPage")
     public R listByPage(@RequestBody Map<String, Object> params) {
         LambdaQueryWrapper<Message> wrapper = new LambdaQueryWrapper();
-        if (params.containsKey("title")&& StringUtils.isNotEmpty(params.get("title").toString())) {
+        if (StringUtils.isNotEmpty(params.get("title").toString())) {
             wrapper.like(Message::getTitle,params.get("title"));
         }
-        if (params.containsKey("type")&& StringUtils.isNotEmpty(params.get("type").toString())) {
+        if (StringUtils.isNotEmpty(params.get("type").toString())) {
             wrapper.eq(Message::getType,params.get("type"));
         }
-        if (params.containsKey("isBook")&& StringUtils.isNotEmpty(params.get("isBook").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isBook"));
-        }
-        if (params.containsKey("isMedical")&& StringUtils.isNotEmpty(params.get("isMedical").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isMedical"));
-        }
-        if (params.containsKey("isSociology")&& StringUtils.isNotEmpty(params.get("isSociology").toString())) {
-            wrapper.eq(Message::getIsBook,params.get("isSociology"));
+        if (StringUtils.isNotEmpty(params.get("isBook").toString())||
+                StringUtils.isNotEmpty(params.get("isMedical").toString())||
+                StringUtils.isNotEmpty(params.get("isSociology").toString())) {
+            wrapper.and(t->t.eq("1".equals(params.get("isBook").toString()),Message::getIsBook,params.get("isBook"))
+                    .or().eq("1".equals(params.get("isMedical").toString()),Message::getIsMedical,params.get("isMedical"))
+                    .or().eq("1".equals(params.get("isSociology").toString()),Message::getIsSociology,params.get("isSociology")));
         }
         wrapper.orderByDesc(Message::getCreateTime);
         Page<Message> page = messageService.page(new Page<>(

src/main/java/com/peanut/modules/master/controller/UserContributionController.java

@@ -0,0 +1,75 @@
+package com.peanut.modules.master.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.peanut.common.utils.R;
+import com.peanut.modules.common.entity.MyUserEntity;
+import com.peanut.modules.common.entity.UserContribution;
+import com.peanut.modules.master.service.MyUserService;
+import com.peanut.modules.master.service.UserContributionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 湖分管理
+ */
+@Slf4j
+@RestController("masterUserContribution")
+@RequestMapping("master/userContribution")
+public class UserContributionController {
+
+    @Autowired
+    private UserContributionService contributionService;
+    @Autowired
+    private MyUserService userService;
+
+    @RequestMapping("/listByPage")
+    public R listByPage(@RequestBody Map<String, Object> params) {
+        MPJLambdaWrapper<UserContribution> wrapper = new MPJLambdaWrapper();
+        wrapper.selectAll(UserContribution.class);
+        wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId, UserContribution::getUserId);
+        if (params.containsKey("userName")&& StringUtils.isNotEmpty(params.get("userName").toString())) {
+            wrapper.like(MyUserEntity::getName,params.get("userName"));
+            wrapper.like(MyUserEntity::getNickname,params.get("userName"));
+        }
+        if (params.containsKey("tel")&& StringUtils.isNotEmpty(params.get("tel").toString())) {
+            wrapper.like(MyUserEntity::getTel,params.get("tel"));
+        }
+        if (params.containsKey("email")&& StringUtils.isNotEmpty(params.get("email").toString())) {
+            wrapper.like(MyUserEntity::getEmail,params.get("email"));
+        }
+        if (params.containsKey("type")&& StringUtils.isNotEmpty(params.get("type").toString())) {
+            wrapper.eq(UserContribution::getType,params.get("type"));
+        }
+        wrapper.orderByDesc(UserContribution::getCreateTime);
+        Page<UserContribution> page = contributionService.page(new Page<>(
+                Long.parseLong(params.get("current").toString()), Long.parseLong(params.get("limit").toString())), wrapper);
+        List<UserContribution> userContributions = page.getRecords();
+        if (userContributions.size() > 0){
+            for (UserContribution contribution : userContributions) {
+                contribution.setUser(userService.getById(contribution.getUserId()));
+            }
+        }
+        return R.ok().put("result", page);
+    }
+
+    @RequestMapping("/saveUserContribution")
+    public R saveUserContribution(@RequestBody UserContribution contribution) {
+        contributionService.save(contribution);
+        return R.ok();
+    }
+
+    @RequestMapping("/delUserContribution")
+    public R delMessage(String id) {
+        contributionService.removeById(id);
+        return R.ok();
+    }
+
+}