From fbab32a428bb8e0ef0280fc0185649706d67271d Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Mon, 6 Jun 2022 21:08:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/cal/controller/CalTeamController.java | 11 +++++++++++ .../controller/CalTeamMemberController.java | 17 ++++++----------- .../mes/cal/mapper/CalTeamMemberMapper.java | 4 ++++ .../mes/cal/service/ICalTeamMemberService.java | 5 +++++ .../service/impl/CalTeamMemberServiceImpl.java | 18 ++++++++++++++++++ .../mapper/cal/CalTeamMemberMapper.xml | 10 ++++++++++ 6 files changed, 54 insertions(+), 11 deletions(-) diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java index d237cbb..3af6c37 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamController.java @@ -2,8 +2,11 @@ package com.ktg.mes.cal.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ktg.mes.cal.service.ICalTeamMemberService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -34,6 +37,9 @@ public class CalTeamController extends BaseController @Autowired private ICalTeamService calTeamService; + @Autowired + private ICalTeamMemberService calTeamMemberService; + /** * 查询班组列表 */ @@ -96,9 +102,14 @@ public class CalTeamController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:cal:team:remove')") @Log(title = "班组", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{teamIds}") public AjaxResult remove(@PathVariable Long[] teamIds) { + for (Long teamId:teamIds + ) { + calTeamMemberService.deleteByTeamId(teamId); + } return toAjax(calTeamService.deleteCalTeamByTeamIds(teamIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamMemberController.java b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamMemberController.java index 52a01cd..20dc55f 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamMemberController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/controller/CalTeamMemberController.java @@ -2,6 +2,8 @@ package com.ktg.mes.cal.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ktg.common.constant.UserConstants; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -77,18 +79,11 @@ public class CalTeamMemberController extends BaseController @PostMapping public AjaxResult add(@RequestBody CalTeamMember calTeamMember) { - return toAjax(calTeamMemberService.insertCalTeamMember(calTeamMember)); - } + if(UserConstants.NOT_UNIQUE.equals(calTeamMemberService.checkUserUnique(calTeamMember))){ + return AjaxResult.error("用户"+calTeamMember.getNickName()+"已分配过班组！"); + } - /** - * 修改班组成员 - */ - @PreAuthorize("@ss.hasPermi('mes:cal:teammember:edit')") - @Log(title = "班组成员", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody CalTeamMember calTeamMember) - { - return toAjax(calTeamMemberService.updateCalTeamMember(calTeamMember)); + return toAjax(calTeamMemberService.insertCalTeamMember(calTeamMember)); } /** diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java index 06c81ac..c5c43e6 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java @@ -27,6 +27,8 @@ public interface CalTeamMemberMapper */ public List selectCalTeamMemberList(CalTeamMember calTeamMember); + public CalTeamMember checkUserUnique(CalTeamMember calTeamMember); + /** * 新增班组成员 * @@ -51,6 +53,8 @@ public interface CalTeamMemberMapper */ public int deleteCalTeamMemberByMemberId(Long memberId); + public int deleteByTeamId(Long teamId); + /** * 批量删除班组成员 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java index 9ddd498..4abc3e6 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java @@ -27,6 +27,9 @@ public interface ICalTeamMemberService */ public List selectCalTeamMemberList(CalTeamMember calTeamMember); + + public String checkUserUnique(CalTeamMember calTeamMember); + /** * 新增班组成员 * @@ -51,6 +54,8 @@ public interface ICalTeamMemberService */ public int deleteCalTeamMemberByMemberIds(Long[] memberIds); + public int deleteByTeamId(Long teamId); + /** * 删除班组成员信息 * diff --git a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamMemberServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamMemberServiceImpl.java index e09ebf9..493fd37 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamMemberServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/cal/service/impl/CalTeamMemberServiceImpl.java @@ -1,7 +1,10 @@ package com.ktg.mes.cal.service.impl; import java.util.List; + +import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.DateUtils; +import com.ktg.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ktg.mes.cal.mapper.CalTeamMemberMapper; @@ -44,6 +47,16 @@ public class CalTeamMemberServiceImpl implements ICalTeamMemberService return calTeamMemberMapper.selectCalTeamMemberList(calTeamMember); } + @Override + public String checkUserUnique(CalTeamMember calTeamMember) { + CalTeamMember member = calTeamMemberMapper.checkUserUnique(calTeamMember); + Long memberId = calTeamMember.getMemberId()==null?-1L:calTeamMember.getMemberId(); + if(StringUtils.isNotNull(member) && memberId !=member.getMemberId()){ + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + /** * 新增班组成员 * @@ -82,6 +95,11 @@ public class CalTeamMemberServiceImpl implements ICalTeamMemberService return calTeamMemberMapper.deleteCalTeamMemberByMemberIds(memberIds); } + @Override + public int deleteByTeamId(Long teamId) { + return calTeamMemberMapper.deleteByTeamId(teamId); + } + /** * 删除班组成员信息 * diff --git a/ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml b/ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml index 4fc82cc..1704ed8 100644 --- a/ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml +++ b/ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml @@ -41,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where member_id = #{memberId} + + insert into cal_team_member @@ -109,4 +114,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{memberId} + + + delete from cal_team_member where team_id = #{teamId} + + \ No newline at end of file