班组成员

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));
     }
 }

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));
     }
 
     /**

ktg-mes/src/main/java/com/ktg/mes/cal/mapper/CalTeamMemberMapper.java

@@ -27,6 +27,8 @@ public interface CalTeamMemberMapper
      */
     public List<CalTeamMember> 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);
+
     /**
      * 批量删除班组成员
      * 

ktg-mes/src/main/java/com/ktg/mes/cal/service/ICalTeamMemberService.java

@@ -27,6 +27,9 @@ public interface ICalTeamMemberService
      */
     public List<CalTeamMember> 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);
+
     /**
      * 删除班组成员信息
      * 

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);
+    }
+
     /**
      * 删除班组成员信息
      * 

ktg-mes/src/main/resources/mapper/cal/CalTeamMemberMapper.xml

@@ -41,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCalTeamMemberVo"/>
         where member_id = #{memberId}
     </select>
+
+    <select id="checkUserUnique" parameterType="CalTeamMember" resultMap="CalTeamMemberResult">
+        <include refid="selectCalTeamMemberVo"/>
+        where user_id = #{userId}
+    </select>
         
     <insert id="insertCalTeamMember" parameterType="CalTeamMember" useGeneratedKeys="true" keyProperty="memberId">
         insert into cal_team_member
@@ -109,4 +114,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{memberId}
         </foreach>
     </delete>
+
+    <delete id="deleteByTeamId" parameterType="Long">
+        delete from cal_team_member where team_id = #{teamId}
+    </delete>
+
 </mapper>