维修员机具关联优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/TypeRepairController.java

@@ -85,9 +85,9 @@ public class TypeRepairController extends BaseController
     @RequiresPermissions("ma:repair:add")
     @SysLog(title = "维修班机具配置", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增维修班机具配置")
     @PostMapping
-    public AjaxResult add(@RequestBody TypeRepair typeRepair)
+    public AjaxResult add(@RequestBody List<TypeRepair> typeRepairs)
     {
-        return toAjax(typeRepairService.insertTypeRepair(typeRepair));
+        return toAjax(typeRepairService.insertTypeRepair(typeRepairs));
     }
 
     /**
@@ -124,8 +124,8 @@ public class TypeRepairController extends BaseController
     @RequiresPermissions("ma:repair:remove")
     @SysLog(title = "维修班机具配置", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除单个维修班机具配置")
     @DeleteMapping
-    public AjaxResult remove(@RequestBody TypeRepair typeRepair)
+    public AjaxResult remove(@RequestBody List<TypeRepair> typeRepairs)
     {
-        return toAjax(typeRepairService.deleteTypeRepairByUserIdAndTypeId(typeRepair));
+        return toAjax(typeRepairService.deleteTypeRepairByUserIdAndTypeId(typeRepairs));
     }
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/TypeRepairMapper.java

@@ -2,6 +2,7 @@ package com.bonus.material.ma.mapper;
 
 import java.util.List;
 import com.bonus.material.ma.domain.TypeRepair;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 维修班机具配置Mapper接口
@@ -34,10 +35,10 @@ public interface TypeRepairMapper {
     /**
      * 新增维修班机具配置
      * 
-     * @param typeRepair 维修班机具配置
+     * @param typeRepairs 维修班机具配置
      * @return 结果
      */
-    int insertTypeRepair(TypeRepair typeRepair);
+    int insertTypeRepair(@Param("list") List<TypeRepair> typeRepairs);
 
     /**
      * 修改维修班机具配置
@@ -65,8 +66,8 @@ public interface TypeRepairMapper {
 
     /**
      * 根据用户id和类型id删除配置记录
-     * @param typeRepair
+     * @param typeRepairs
      * @return
      */
-    int deleteTypeRepairByUserIdAndTypeId(TypeRepair typeRepair);
+    int deleteTypeRepairByUserIdAndTypeId(@Param("list") List<TypeRepair> typeRepairs);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/ITypeRepairService.java

@@ -34,10 +34,10 @@ public interface ITypeRepairService {
     /**
      * 新增维修班机具配置
      * 
-     * @param typeRepair 维修班机具配置
+     * @param typeRepairs 维修班机具配置
      * @return 结果
      */
-    public int insertTypeRepair(TypeRepair typeRepair);
+    public int insertTypeRepair(List<TypeRepair> typeRepairs);
 
     /**
      * 修改维修班机具配置
@@ -66,5 +66,5 @@ public interface ITypeRepairService {
     /**
      * 根据用户id和类型id删除配置信息
      */
-    int deleteTypeRepairByUserIdAndTypeId(TypeRepair typeRepair);
+    int deleteTypeRepairByUserIdAndTypeId(List<TypeRepair> typeRepairs);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/TypeRepairServiceImpl.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 import com.bonus.material.ma.mapper.TypeRepairMapper;
 import com.bonus.material.ma.domain.TypeRepair;
 import com.bonus.material.ma.service.ITypeRepairService;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 维修班机具配置Service业务层处理
@@ -57,14 +58,18 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
     /**
      * 新增维修班机具配置
      * 
-     * @param typeRepair 维修班机具配置
+     * @param typeRepairs 维修班机具配置
      * @return 结果
      */
     @Override
-    public int insertTypeRepair(TypeRepair typeRepair)
+    public int insertTypeRepair(List<TypeRepair> typeRepairs)
     {
-        typeRepair.setCreateTime(DateUtils.getNowDate());
+        if (CollectionUtils.isEmpty(typeRepairs)) {
-        return typeRepairMapper.insertTypeRepair(typeRepair);
+            return 0;
+        }
+        typeRepairs.forEach(typeKeeper -> typeKeeper.setCreateTime(DateUtils.getNowDate()));
+        typeRepairMapper.deleteTypeRepairByUserIdAndTypeId(typeRepairs);
+        return typeRepairMapper.insertTypeRepair(typeRepairs);
     }
 
     /**
@@ -107,10 +112,10 @@ public class TypeRepairServiceImpl implements ITypeRepairService {
     /**
      * 根据用户id和类型id删除配置信息
      *
-     * @param typeRepair
+     * @param typeRepairs
      */
     @Override
-    public int deleteTypeRepairByUserIdAndTypeId(TypeRepair typeRepair) {
+    public int deleteTypeRepairByUserIdAndTypeId(List<TypeRepair> typeRepairs) {
-        return typeRepairMapper.deleteTypeRepairByUserIdAndTypeId(typeRepair);
+        return typeRepairMapper.deleteTypeRepairByUserIdAndTypeId(typeRepairs);
     }
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeRepairMapper.xml

@@ -31,21 +31,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertTypeRepair" parameterType="com.bonus.material.ma.domain.TypeRepair" useGeneratedKeys="true" keyProperty="ID">
-        insert into ma_type_repair
+        insert into ma_type_repair (type_id,user_id,create_time,update_time,company_id)
-        <trim prefix="(" suffix=")" suffixOverrides=",">
+        values
-            <if test="typeId != null">type_id,</if>
+        <foreach collection="list" item="item" separator=",">
-            <if test="userId != null">user_id,</if>
+            (
-            <if test="createTime != null">create_time,</if>
+            #{item.typeId},
-            <if test="updateTime != null">update_time,</if>
+            #{item.userId},
-            <if test="companyId != null">company_id,</if>
+            #{item.createTime},
-         </trim>
+            #{item.updateTime},
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{item.companyId}
-            <if test="typeId != null">#{typeId},</if>
+            )
-            <if test="userId != null">#{userId},</if>
+        </foreach>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="companyId != null">#{companyId},</if>
-         </trim>
     </insert>
 
     <update id="updateTypeRepair" parameterType="com.bonus.material.ma.domain.TypeRepair">
@@ -82,6 +78,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <delete id="deleteTypeRepairByUserIdAndTypeId">
-        delete from ma_type_repair where user_id = #{userId} and type_id = #{typeId}
+        delete from ma_type_repair where
+        type_id in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.typeId}
+        </foreach>
+        and
+        user_id in
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.userId}
+        </foreach>
     </delete>
 </mapper>