From cb71c3dabf7ad6e22b83823af60cb75efebcedac Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 18 Jun 2025 17:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kaohe/controller/KhItemsController.java | 5 +- .../kaohe/controller/KhTemItemController.java | 6 +-- .../controller/KhTemplateController.java | 46 +++++++++++++++++-- .../com/ruoyi/kaohe/domain/KhTemplate.java | 8 ++-- .../mapper/kaohe/KhTemplateMapper.xml | 2 +- 5 files changed, 54 insertions(+), 13 deletions(-) diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java index 4cdeb79..17240e2 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java +++ b/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(); - } + }*/ /** * 修改考核项 diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemItemController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemItemController.java index b65df79..38efa23 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemItemController.java +++ b/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(); - } + }*/ /** * 修改模板考核项关联 diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java index c940b59..9b53a6e 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java +++ b/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 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 items = khTemplate.getItems(); + if(items !=null&& items.size()>0){ + //删除原来关联 + KhTemItem query = new KhTemItem(); + query.setTemId(khTemplate.getId()); + List temItems = temItemService.selectKhTemItemList(query); + List 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(); } /** diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemplate.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemplate.java index 381122c..edd8dad 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemplate.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemplate.java @@ -34,14 +34,14 @@ public class KhTemplate extends BaseEntity /** 考核项名称 */ @Excel(name = "考核项名称") - private List itemList; + private List items; public List getItems() { - return itemList; + return items; } - public void setItems(List itemList) { - this.itemList = itemList; + public void setItems(List items) { + this.items = items; } public void setId(Long id) diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml index 8a5004d..ede1868 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - +