From cf9a5039e6db9d1d5963e3fe1a37d00169ec2ef7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 25 六月 2025 11:18:22 +0800
Subject: [PATCH] 验收报告修改
---
src/main/java/com/whyc/service/GroupService.java | 107 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 85 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/whyc/service/GroupService.java b/src/main/java/com/whyc/service/GroupService.java
index 05ea325..9e89a47 100644
--- a/src/main/java/com/whyc/service/GroupService.java
+++ b/src/main/java/com/whyc/service/GroupService.java
@@ -1,6 +1,8 @@
package com.whyc.service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.whyc.dto.PermitGroupDto;
import com.whyc.dto.Response;
import com.whyc.mapper.GroupMapper;
import com.whyc.mapper.PermitGroupMapper;
@@ -28,17 +30,25 @@
//鏌ヨ鎵�鏈夌殑鏉冮檺缁�
public Response getAllGroup() {
List list=mapper.getAllGroup();
- return new Response().setII(1,list.size()>0?true:false,list,"鏉冮檺缁勪俊鎭�");
+ return new Response().setII(1,list.size()>0,list,"鏉冮檺缁勪俊鎭�");
}
//娣诲姞鏉冮檺缁�
public Response addGroup(String groupName) {
- //鏌ヨ鏈�澶х殑鏉冮檺缁刬d
- int groupIdMax=mapper.selectGroupIdMax();
- Group group=new Group();
- group.setGroupId(String.valueOf(groupIdMax+1));
- group.setGroupName(groupName);
- int flag=mapper.insert(group);
- return new Response().set(1,flag>0?true:false,"杩斿洖");
+ //鏌ョ湅鏉冮檺缁勫悕鏄惁瀛樺湪
+ QueryWrapper wrapper=new QueryWrapper();
+ wrapper.eq("group_name",groupName);
+ List list=mapper.selectList(wrapper);
+ if(list!=null&&list.size()>0){
+ return new Response().set(1,false,"鏉冮檺缁勫瓨鍦�");
+ }else{
+ //鏌ヨ鏈�澶х殑鏉冮檺缁刬d
+ int groupIdMax=mapper.selectGroupIdMax();
+ Group group=new Group();
+ group.setGroupId(String.valueOf(groupIdMax+1));
+ group.setGroupName(groupName);
+ int flag=mapper.insert(group);
+ return new Response().set(1,flag>0,"杩斿洖");
+ }
}
//鍒犻櫎鏉冮檺缁�
@Transactional
@@ -51,21 +61,29 @@
int flagU=userGroupMapper.delete(wrapper);
//鍒犻櫎鏉冮檺缁�
int flag=mapper.delete(wrapper);
- return new Response().set(1,flag>0?true:false,"杩斿洖");
+ return new Response().set(1,flag>0,"杩斿洖");
}
//缂栬緫鏉冮檺缁勫悕
public Response updateGroup(String groupId,String groupName) {
- UpdateWrapper wrapper=new UpdateWrapper();
- wrapper.eq("group_id",groupId);
- wrapper.set("group_name",groupName);
- int flag=mapper.update(null,wrapper);
- return new Response().set(1,flag>0?true:false,"杩斿洖");
+ //鏌ョ湅鏉冮檺缁勫悕鏄惁瀛樺湪
+ QueryWrapper wrapperQ=new QueryWrapper();
+ wrapperQ.eq("group_name",groupName);
+ List list=mapper.selectList(wrapperQ);
+ if(list!=null&&list.size()>0){
+ return new Response().set(1,false,"鏉冮檺缁勫瓨鍦�");
+ }else{
+ UpdateWrapper wrapperU=new UpdateWrapper();
+ wrapperU.eq("group_id",groupId);
+ wrapperU.set("group_name",groupName);
+ int flag=mapper.update(null,wrapperU);
+ return new Response().set(1,flag>0,"杩斿洖");
+ }
}
//鏉冮檺缁勪笅鍔犵敤鎴�
@Transactional
public Response addUserToGroup(List<UserGroup> users) {
int flag=userGroupMapper.insertBatchSomeColumn(users);
- return new Response().set(1,flag>0?true:false,"杩斿洖");
+ return new Response().set(1,flag>0,"杩斿洖");
}
//鏉冮檺缁勪笅绉婚櫎鐢ㄦ埛
@Transactional
@@ -75,27 +93,72 @@
for (UserGroup userGroup: users) {
wrapper.eq("uname",userGroup.getUname());
wrapper.eq("group_id",userGroup.getGroupId());
- flag=userGroupMapper.delete(wrapper);
+ flag+=userGroupMapper.delete(wrapper);
}
- return new Response().set(1,flag>0?true:false,"杩斿洖");
+ return new Response().set(1,flag>0,"杩斿洖");
+ }
+
+ //(缁勫悎鎿嶄綔)鏉冮檺缁勪笅鍔犵敤鎴峰拰绉婚櫎鐢ㄦ埛
+ @Transactional
+ public Response opreateUserToGroup(PermitGroupDto permitGroupDto) {
+ int addflag=0;
+ int delflag=0;
+ if(permitGroupDto.getAddusers()!=null&&permitGroupDto.getAddusers().size()>0){
+ addflag=userGroupMapper.insertBatchSomeColumn(permitGroupDto.getAddusers());
+ }else{
+ addflag=1;
+ }
+ if(permitGroupDto.getDelusers()!=null&&permitGroupDto.getDelusers().size()>0){
+ for (UserGroup userGroup: permitGroupDto.getDelusers()) {
+ UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.eq("uname",userGroup.getUname());
+ wrapper.eq("group_id",userGroup.getGroupId());
+ delflag+=userGroupMapper.delete(wrapper);
+ }
+ }else{
+ delflag=1;
+ }
+ return new Response().set(1,addflag>0&&delflag>0,"杩斿洖{addflag:"+addflag+",delflag:"+delflag+"}");
}
//鏉冮檺缁勪笅鍔犳潈闄�
@Transactional
public Response addPermitToGroup(List<PermitGroup> permits) {
int flag=permitGroupMapper.insertBatchSomeColumn(permits);
- return new Response().set(1,flag>0?true:false,"杩斿洖");
+ return new Response().set(1,flag>0,"杩斿洖");
}
- //鏉冮檺缁勪笅绉婚櫎鐢ㄦ埛
+ //鏉冮檺缁勪笅绉婚櫎鏉冮檺
@Transactional
public Response delPermitToGroup(List<PermitGroup> permits) {
UpdateWrapper wrapper=new UpdateWrapper();
int flag=0;
for (PermitGroup permitGroup: permits) {
wrapper.eq("permit_id",permitGroup.getPermitId());
- wrapper.eq("categoty_id",permitGroup.getCategoryId());
wrapper.eq("group_id",permitGroup.getGroupId());
- flag=userGroupMapper.delete(wrapper);
+ flag+=permitGroupMapper.delete(wrapper);
}
- return new Response().set(1,flag>0?true:false,"杩斿洖");
+ return new Response().set(1,flag>0,"杩斿洖");
+ }
+ //(缁勫悎鎿嶄綔)鏉冮檺缁勪笅鍔犳潈闄愬拰绉婚櫎鏉冮檺
+ @Transactional
+ public Response opreatePermitToGroup(PermitGroupDto permitGroupDto) {
+ int addflag=0;
+ int delflag=0;
+ if(permitGroupDto.getAddpermits()!=null&&permitGroupDto.getAddpermits().size()>0){
+ addflag=permitGroupMapper.insertBatchSomeColumn(permitGroupDto.getAddpermits());
+ }else{
+ addflag=1;
+ }
+ if(permitGroupDto.getDelpermits()!=null&&permitGroupDto.getDelpermits().size()>0){
+ for (PermitGroup permitGroup: permitGroupDto.getDelpermits()) {
+ UpdateWrapper wrapper=new UpdateWrapper();
+ wrapper.eq("permit_id",permitGroup.getPermitId());
+ wrapper.eq("group_id",permitGroup.getGroupId());
+ delflag+=permitGroupMapper.delete(wrapper);
+ }
+ }else{
+ delflag=1;
+ }
+
+ return new Response().set(1,addflag>0&&delflag>0,"杩斿洖");
}
}
--
Gitblit v1.9.1