From 3982f0bc9ee436235ba546d356c5554250ed9963 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 15 七月 2025 15:46:16 +0800
Subject: [PATCH] zjh20250711

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index 753f6d8..41d5d81 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -12,6 +12,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ltkj.common.annotation.Excel;
 import com.ltkj.common.core.domain.entity.SysDept;
+import com.ltkj.common.utils.SecurityUtils;
 import com.ltkj.common.utils.StringUtils;
 import com.ltkj.common.utils.poi.ExcelUtil;
 import com.ltkj.framework.config.UserHoder;
@@ -132,14 +133,13 @@
     }
 
 
-    @GetMapping("/getCyTjAdviceKjbqBySex")
+/*    @GetMapping("/getCyTjAdviceKjbqBySex")
     @ApiOperation(value = "鏍规嵁褰撳墠鐧诲綍浜篿d鑾峰彇甯哥敤寤鸿")
     public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam(required = false) String sex, @RequestParam @ApiParam(value = "鐢ㄦ埛id 浼犲綋鍓嶇櫥褰曚汉") Long userId,
                                              @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
                                              @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
         LambdaQueryWrapper<TjAdvice> wq = new LambdaQueryWrapper<>();
         Page<TjAdvice> page1 = new Page<>(page, pageSize);
-//        wq.eq(TjAdvice::getAdSex,sex).or().eq(TjAdvice::getAdSex,"2");
         if (null != userId) {
             LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
             wq0.eq(TjUserAdvice::getUserId, userId);
@@ -150,6 +150,33 @@
                 Page<TjAdvice> kjbqPage = tjAdviceService.page(page1,wq);
                 return AjaxResult.success(kjbqPage);
             }
+        }
+        return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈夊父鐢ㄥ缓璁�!");
+    }*/
+
+
+    @GetMapping("/getCyTjAdviceKjbqBySex")
+    @ApiOperation(value = "鏍规嵁褰撳墠鐧诲綍浜篿d鑾峰彇甯哥敤寤鸿")
+    public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam(required = false) String sex, @RequestParam @ApiParam(value = "鐢ㄦ埛id 浼犲綋鍓嶇櫥褰曚汉") Long userId,
+                                             @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
+                                             @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
+        LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
+        if(!SecurityUtils.isAdmin(userId)) wq0.eq(TjUserAdvice::getUserId, userId);
+        List<TjUserAdvice> list = userAdviceService.list(wq0);
+        List<TjAdvice> kjbqPage = new ArrayList<>();
+        Map<String,Object> map = new HashMap<>();
+        if (null != list && !list.isEmpty()) {
+            for (TjUserAdvice advice : list) {
+                TjAdvice advice1 = tjAdviceService.getById(advice.getAdviceId());
+                if(null != advice1){
+                    advice1.setUserName(userService.getById(advice.getUserId()).getNickName());
+                    kjbqPage.add(advice1);
+                }
+            }
+            List<TjAdvice> adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+            map.put("total", kjbqPage.size());
+            map.put("records", adviceList);
+            return AjaxResult.success(map);
         }
         return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈夊父鐢ㄥ缓璁�!");
     }
@@ -364,4 +391,18 @@
     public AjaxResult remove(@PathVariable Long[] ids) {
         return AjaxResult.success(tjAdviceService.deleteTjAdviceByIds(ids));
     }
+
+
+    @DeleteMapping("/delCyremove")
+    @ApiOperation(value = "鍒犻櫎鐢ㄦ埛甯哥敤寤鸿鎺ュ彛")
+    public AjaxResult delCyremove(@RequestParam List<String> ids) {
+        String userId = UserHoder.getLoginUser().getUserId();
+        LambdaQueryWrapper<TjUserAdvice> wq=new LambdaQueryWrapper<>();
+        wq.in(TjUserAdvice::getAdviceId,ids);
+        wq.eq(TjUserAdvice::getUserId,userId);
+        if (userAdviceService.remove(wq)) {
+            return AjaxResult.success();
+        }
+        return AjaxResult.error();
+    }
 }

--
Gitblit v1.8.0