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 | 56 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/whyc/service/GroupService.java b/src/main/java/com/whyc/service/GroupService.java
index 947aa66..9e89a47 100644
--- a/src/main/java/com/whyc/service/GroupService.java
+++ b/src/main/java/com/whyc/service/GroupService.java
@@ -1,5 +1,6 @@
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;
@@ -33,13 +34,21 @@
}
//娣诲姞鏉冮檺缁�
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,"杩斿洖");
+ //鏌ョ湅鏉冮檺缁勫悕鏄惁瀛樺湪
+ 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
@@ -56,11 +65,19 @@
}
//缂栬緫鏉冮檺缁勫悕
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,"杩斿洖");
+ //鏌ョ湅鏉冮檺缁勫悕鏄惁瀛樺湪
+ 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
@@ -88,16 +105,20 @@
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){
- UpdateWrapper wrapper=new UpdateWrapper();
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,"杩斿洖");
+ return new Response().set(1,addflag>0&&delflag>0,"杩斿洖{addflag:"+addflag+",delflag:"+delflag+"}");
}
//鏉冮檺缁勪笅鍔犳潈闄�
@Transactional
@@ -124,15 +145,20 @@
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){
- UpdateWrapper wrapper=new UpdateWrapper();
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