From 15216343d7a91bd0990f97a13bdf6eb51c390126 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 15 五月 2025 09:53:21 +0800
Subject: [PATCH] 包机组修改

---
 src/main/java/com/whyc/service/BaojigroupService.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/whyc/service/BaojigroupService.java b/src/main/java/com/whyc/service/BaojigroupService.java
index b448f01..7c23e92 100644
--- a/src/main/java/com/whyc/service/BaojigroupService.java
+++ b/src/main/java/com/whyc/service/BaojigroupService.java
@@ -43,7 +43,7 @@
     public void insertNeiZhi(Integer baojiId){
         List<BaojigroupUsr> list=new ArrayList<>();
         QueryWrapper wrapper=new QueryWrapper();
-        wrapper.lt("uid",99);
+        wrapper.lt("id",99);
         List<User> uList=UserMapper.selectList(wrapper);
         for (User uinf:uList) {
             BaojigroupUsr baojiusr=new BaojigroupUsr();
@@ -59,7 +59,7 @@
         //楠岃瘉鍖呮満缁勫悕鏄惁閲嶅
         //灏嗗唴缃敤鎴峰姞鍏ュ埌鍖呮満缁勪笅
         QueryWrapper wrapper=new QueryWrapper();
-        wrapper.eq("baoji_name",baojiName);
+        wrapper.eq("baoji_group_name",baojiName);
         wrapper.last("limit 1");
         Baojigroup baoji=mapper.selectOne(wrapper);
         if(baoji!=null){
@@ -68,14 +68,14 @@
             baoji=new Baojigroup();
             baoji.setBaojiGroupName(baojiName);
             int bl=mapper.insert(baoji);
-            if(bl>0){
+            /*if(bl>0){
                 //灏嗗唴缃敤鎴峰姞鍏ュ埌鍖呮満缁勪笅
                 QueryWrapper wrapper1=new QueryWrapper();
-                wrapper1.eq("baoji_name",baojiName);
+                wrapper1.eq("baoji_group_name",baojiName);
                 wrapper1.last("limit 1");
                 baoji=mapper.selectOne(wrapper1);
                 insertNeiZhi(baoji.getBaojiGroupId());
-            }
+            }*/
             return new Response().set(1,bl>0,"娣诲姞鍖呮満缁勬垚鍔�");
         }
 
@@ -83,8 +83,8 @@
     //缂栬緫鍖呮満缁�
     public Response updateBaoji(Integer id, String baojiName) {
         UpdateWrapper wrapper=new UpdateWrapper();
-        wrapper.eq("id",id);
-        wrapper.set("baoji_name",baojiName);
+        wrapper.eq("baoji_group_id",id);
+        wrapper.set("baoji_group_name",baojiName);
         int bl=mapper.update((Baojigroup) ActionUtil.objeNull,wrapper);
         return new Response().set(1,bl>0,"缂栬緫鍖呮満缁勬垚鍔�");
     }
@@ -93,22 +93,22 @@
     public Response delBaoji(Integer id) {
         //鍏堝垹闄ゅ寘鏈虹粍瀵瑰簲浜轰笅鐨勮褰�
         UpdateWrapper wrapper1=new UpdateWrapper();
-        wrapper1.eq("baoji_id",id);
+        wrapper1.eq("baoji_group_id",id);
         bjUsrmapper.delete(wrapper1);
-        //鍐嶅垹闄ゅ寘鏈虹粍瀵瑰簲涓嬬殑鏈烘埧鍜岄攣
+        //鍐嶅垹闄ゅ寘鏈虹粍瀵瑰簲涓嬬殑鏈烘埧鍜岀數婧�
         UpdateWrapper wrapper2=new UpdateWrapper();
-        wrapper2.eq("baoji_id",id);
+        wrapper2.eq("baoji_group_id",id);
         bjPowermapper.delete(wrapper2);
         //鏈�鍚庡垹闄ゅ寘鏈虹粍
         UpdateWrapper wrapper=new UpdateWrapper();
-        wrapper.eq("id",id);
+        wrapper.eq("baoji_group_id",id);
         int bl=mapper.delete(wrapper);
         return new Response().set(1,bl>0,"鍒犻櫎鍖呮満缁勬垚鍔�");
     }
     //鏌ヨ鍖呮満缁勫強鍖呮満缁勫搴旂殑鐢ㄦ埛鍜屽搴旀満鎴垮拰閿�
     public Response getAllBaojiInf() {
         QueryWrapper wrapper=new QueryWrapper();
-        wrapper.orderByAsc("id");
+        wrapper.orderByAsc("baoji_group_id");
         List<Baojigroup> baojiList=mapper.selectList(wrapper);
         for (Baojigroup bj:baojiList) {
             //鏌ヨ鍖呮満缁勫搴旂殑鐢ㄦ埛淇℃伅
@@ -150,8 +150,8 @@
         List<User> relatedUserList = bjUsrmapper.getUserList(id);
         //鏌ヨ鍖呮満缁勬湭娣诲姞鐨勭敤鎴蜂俊鎭�
         QueryWrapper wrapper=new QueryWrapper();
-        wrapper.select("uid", "uname");
-        wrapper.gt("uid",100);
+        wrapper.select("id", "name");
+        wrapper.gt("id",100);
         List<User> allUserList = UserMapper.selectList(wrapper);
         List<User> notRelatedUserList = allUserList.stream().filter(User -> !relatedUserList.contains(User)).collect(Collectors.toList());
 
@@ -177,7 +177,7 @@
     public Response getBaojiUserByUid(Integer uid) {
         //鏌ヨ褰撳墠浜烘墍鍦ㄥ寘鏈虹粍
         QueryWrapper wrapper=new QueryWrapper();
-        wrapper.select("baoji_id");
+        wrapper.select("baoji_group_id");
         if(uid>100){
             wrapper.eq("uid",uid);
         }
@@ -199,6 +199,6 @@
         QueryWrapper wrapper=new QueryWrapper();
         wrapper.eq("uid",id);
         List<BaojigroupUsr> list=bjUsrmapper.selectList(wrapper);
-        return list.size()>0?0:1 ;
+        return list.size()>0?1:0 ;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1