模板新增、修改接口修改

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java

@@ -80,10 +80,11 @@ public class KhItemsController extends BaseController
     {
         return toAjax(khItemsService.insertKhItems(khItems));
     }
+
     /**
      * 批量新增考核项
      */
-    @PreAuthorize("@ss.hasPermi('kaohe:items:add')")
+    /*@PreAuthorize("@ss.hasPermi('kaohe:items:add')")
     @Log(title = "考核项", businessType = BusinessType.INSERT)
     @PostMapping("/adds")
     @Transactional
@@ -93,7 +94,7 @@ public class KhItemsController extends BaseController
             khItemsService.insertKhItems(item);
         }
         return AjaxResult.success();
-    }
+    }*/
 
     /**
      * 修改考核项

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemItemController.java

@@ -84,9 +84,9 @@ public class KhTemItemController extends BaseController
     }
 
     /**
-     * 新增模板考核项关联
+     * 批量新增
      */
-    @PreAuthorize("@ss.hasPermi('kaohe:tem_item:add')")
+/*    @PreAuthorize("@ss.hasPermi('kaohe:tem_item:add')")
     @Log(title = "模板考核项关联", businessType = BusinessType.INSERT)
     @PostMapping("/adds")
     @Transactional
@@ -96,7 +96,7 @@ public class KhTemItemController extends BaseController
             khTemItemService.insertKhTemItem(khTemItem);
         }
         return AjaxResult.success();
-    }
+    }*/
 
     /**
      * 修改模板考核项关联

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java

@@ -1,9 +1,15 @@
 package com.ruoyi.kaohe.controller;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.kaohe.domain.KhItems;
+import com.ruoyi.kaohe.domain.KhTemItem;
+import com.ruoyi.kaohe.service.IKhTemItemService;
 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;
@@ -33,6 +39,8 @@ public class KhTemplateController extends BaseController
 {
     @Autowired
     private IKhTemplateService khTemplateService;
+    @Autowired
+    private IKhTemItemService temItemService;
 
     /**
      * 查询考核模板列表
@@ -75,20 +83,52 @@ public class KhTemplateController extends BaseController
     @PreAuthorize("@ss.hasPermi('kaohe:template:add')")
     @Log(title = "考核模板", businessType = BusinessType.INSERT)
     @PostMapping
+    @Transactional
     public AjaxResult add(@RequestBody KhTemplate khTemplate)
     {
-        return toAjax(khTemplateService.insertKhTemplate(khTemplate));
+        khTemplateService.insertKhTemplate(khTemplate);
+        List<KhItems> items = khTemplate.getItems();
+        if(items !=null&& items.size()>0){
+            for(KhItems item:items){
+                KhTemItem temItem = new KhTemItem();
+                temItem.setTemName(khTemplate.getTemName());
+                temItem.setTemId(khTemplate.getId());
+                temItem.setItemName(item.getItemName());
+                temItem.setKhitemId(item.getId());
+                temItemService.insertKhTemItem(temItem);
+            }
+        }
+        return AjaxResult.success();
     }
 
     /**
-     * 修改考核模板
+     * 修改考核模板  同时修改模板选项关联表
      */
     @PreAuthorize("@ss.hasPermi('kaohe:template:edit')")
     @Log(title = "考核模板", businessType = BusinessType.UPDATE)
     @PutMapping
+    @Transactional
     public AjaxResult edit(@RequestBody KhTemplate khTemplate)
     {
-        return toAjax(khTemplateService.updateKhTemplate(khTemplate));
+        khTemplateService.updateKhTemplate(khTemplate);
+        List<KhItems> items = khTemplate.getItems();
+        if(items !=null&& items.size()>0){
+            //删除原来关联
+            KhTemItem query = new KhTemItem();
+            query.setTemId(khTemplate.getId());
+            List<KhTemItem> temItems = temItemService.selectKhTemItemList(query);
+            List<Long> ids = temItems.stream().map(KhTemItem::getId).collect(Collectors.toList());
+            temItemService.deleteKhTemItemByIds(ids.toArray(new Long[ids.size()]));
+            for(KhItems item:items){
+                KhTemItem temItem = new KhTemItem();
+                temItem.setTemName(khTemplate.getTemName());
+                temItem.setTemId(khTemplate.getId());
+                temItem.setItemName(item.getItemName());
+                temItem.setKhitemId(item.getId());
+                temItemService.insertKhTemItem(temItem);
+            }
+        }
+        return  AjaxResult.success();
     }
 
     /**

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemplate.java

@@ -34,14 +34,14 @@ public class KhTemplate extends BaseEntity
 
     /** 考核项名称 */
     @Excel(name = "考核项名称")
-    private List<KhItems> itemList;
+    private List<KhItems> items;
 
     public List<KhItems> getItems() {
-        return itemList;
+        return items;
     }
 
-    public void setItems(List<KhItems> itemList) {
-        this.itemList = itemList;
+    public void setItems(List<KhItems> items) {
+        this.items = items;
     }
 
     public void setId(Long id)

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="temName"    column="tem_name"    />
      <!--   <result property="khitemId"    column="khitem_id"    />
         <result property="itemName"    column="item_name"    />-->
-        <collection  property="itemList" ofType="KhItems">
+        <collection  property="items" ofType="KhItems">
             <result property="id"    column="itemId"    />
             <result property="itemName"    column="khitemName"  />
         </collection >