From fb9435063c450e73e6fbe6f6c2c622e91265aad8 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 13 Dec 2024 18:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=8A=B6=E6=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmContractController.java | 13 ++++++++++++- .../contract/mapper/BmContractMapper.java | 4 ++++ .../contract/service/BmContractService.java | 2 ++ .../service/impl/BmContractServiceImpl.java | 18 ++++++++++++++++++ .../material/contract/BmContractMapper.xml | 6 ++++++ 5 files changed, 42 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java index 540a0d3..a62781a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/controller/BmContractController.java @@ -29,8 +29,9 @@ public class BmContractController extends BaseController { @ApiOperation(value = "合同列表") @GetMapping("/list") public AjaxResult list(BmContract bmContract) { + startPage(); List list = bmContractService.list(bmContract); - return AjaxResult.success(list); + return AjaxResult.success(getDataTable(list)); } @ApiOperation(value = "合同新增") @PostMapping("/add") @@ -63,4 +64,14 @@ public class BmContractController extends BaseController { } } + @ApiOperation(value = "合同状态修改（开启/关闭）") + @PostMapping("/updateStatus") + public AjaxResult updateStatus(@RequestBody BmContract bmContract) { + Integer i = bmContractService.updateStatus(bmContract); + if (i > 0){ + return AjaxResult.success(); + }else { + return AjaxResult.error(); + } + } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java index 7cab463..9cbd1f4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/mapper/BmContractMapper.java @@ -21,4 +21,8 @@ public interface BmContractMapper { Integer del(BmContract bmContract); String selectTaskNumByMonth(@Param("date") Date nowDate); + + Integer updateStatus(BmContract bmContract); + + Integer updateStatusOther(BmContract bmContract); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java index 2404d9e..195e470 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/BmContractService.java @@ -18,4 +18,6 @@ public interface BmContractService { Integer edit(BmContract bmContract); Integer del(BmContract bmContract); + + Integer updateStatus(BmContract bmContract); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java index 418aaf8..b15a0fd 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/contract/service/impl/BmContractServiceImpl.java @@ -97,6 +97,24 @@ public class BmContractServiceImpl implements BmContractService { return del; } + @Override + public Integer updateStatus(BmContract bmContract) { + if (bmContract.getStatus() == 0) { + // 禁用 + return bmContractMapper.updateStatus(bmContract); + } else { + // 开启 + Integer i = bmContractMapper.updateStatus(bmContract); + if (i > 0) { + // 其他的禁用 + bmContract.setOwnerCom(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + return bmContractMapper.updateStatusOther(bmContract); + } else { + return i; + } + } + } + private String getString() { //根据前台传过来的数据，生成需求编号 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml index 13887f5..536e12e 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/contract/BmContractMapper.xml @@ -16,6 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = now() where id = #{id} + + update bm_contract set status = #{status} where id = #{id} + + + update bm_contract set status = 0 where owner_com = #{ownerCom} and id != #{id} + delete from bm_contract where id = #{id}