From f7ba81403726979fe296805bfd6fbe1d82909bb8 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Tue, 9 Jan 2024 17:50:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=AA=E5=99=A8=E4=B8=8E?= =?UTF-8?q?=E8=A7=A3=E7=BB=91=E4=BB=AA=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/mapper/WxInstrumentMapper.java | 2 +- .../src/main/resources/mapper/WxInstrumentMapper.xml | 7 ++----- .../system/controller/WxInstrumentController.java | 6 +++--- .../flossom/system/service/IWxInstrumentService.java | 2 +- .../system/service/impl/WxInstrumentServiceImpl.java | 4 ++-- flossom-ui/src/views/system/instrument/index.vue | 12 +++++++++++- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java index c2ad68b..45a6971 100644 --- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java +++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/mapper/WxInstrumentMapper.java @@ -60,7 +60,7 @@ public interface WxInstrumentMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteWxInstrumentByIds(Long[] ids); + public int deleteWxInstrumentByIds(Long id); } diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml index edd4fec..e8e048f 100644 --- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml +++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxInstrumentMapper.xml @@ -233,10 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from wx_instrument where id = #{id} - - UPDATE wx_instrument SET status = 1 where id in - - #{id} - + + UPDATE wx_instrument SET status = IF(status = 1, 0, 1) where id = #{id} \ No newline at end of file diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java index 95fb830..489568b 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/WxInstrumentController.java @@ -120,8 +120,8 @@ public class WxInstrumentController extends BaseController { */ @RequiresPermissions("system:instrument:remove") @Log(title = "仪器列", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(wxInstrumentService.deleteWxInstrumentByIds(ids)); + @DeleteMapping("/{id}") + public AjaxResult remove(@PathVariable Long id) { + return toAjax(wxInstrumentService.deleteWxInstrumentByIds(id)); } } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java index af37334..5f26939 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/IWxInstrumentService.java @@ -58,7 +58,7 @@ public interface IWxInstrumentService { * @param ids 需要删除的仪器列主键集合 * @return 结果 */ - public int deleteWxInstrumentByIds(Long[] ids); + public int deleteWxInstrumentByIds(Long id); /** * 删除仪器列信息 diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java index 5547f71..28ec5fb 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxInstrumentServiceImpl.java @@ -80,8 +80,8 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { * @return 结果 */ @Override - public int deleteWxInstrumentByIds(Long[] ids) { - return wxInstrumentMapper.deleteWxInstrumentByIds(ids); + public int deleteWxInstrumentByIds(Long id) { + return wxInstrumentMapper.deleteWxInstrumentByIds(id); } /** diff --git a/flossom-ui/src/views/system/instrument/index.vue b/flossom-ui/src/views/system/instrument/index.vue index 2dd7da5..eb8160d 100644 --- a/flossom-ui/src/views/system/instrument/index.vue +++ b/flossom-ui/src/views/system/instrument/index.vue @@ -128,8 +128,18 @@ icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:instrument:remove']" + v-if="scope.row.status == 0" >隐藏 + 解除隐藏 + @@ -772,7 +782,7 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const ids = row.id || this.ids; + const ids = row.id; this.$modal.confirm('是否确认隐藏仪器列编号为"' + ids + '"的数据项？').then(function () { return delInstrument(ids); }).then(() => {