From ac4dd93a16df20d5ad72b6bc4ffad803da64b6ee Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 29 Oct 2024 10:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BB=91=E5=AE=9A=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/BmUnitPersonController.java | 14 ++++++++++++++ .../bonus/material/basic/mapper/BmUnitMapper.java | 2 +- .../basic/service/IBmUnitPersonService.java | 2 ++ .../service/impl/BmUnitPersonServiceImpl.java | 9 +++++++-- .../basic/service/impl/BmUnitServiceImpl.java | 4 ++-- .../mapper/material/basic/BmUnitMapper.xml | 2 +- 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java index 609b2390..d45482f4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java @@ -1,5 +1,6 @@ package com.bonus.material.basic.controller; +import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.enums.OperaType; import com.bonus.material.basic.domain.BmUnit; @@ -44,6 +45,19 @@ public class BmUnitPersonController extends BaseController return getDataTable(list); } + /** + * 统计往来单位人员 + */ + @ApiOperation(value = "统计往来单位人员") + @RequiresPermissions("basic:person:list") + @SysLog(title = "往来单位管理", businessType = OperaType.QUERY, logType = 1,module = "仓储管理->统计往来单位人员") + @GetMapping("/{unitId}") + public AjaxResult countBmUnitPersonByUnitId(@PathVariable Long unitId) + { + int result = bmUnitPersonService.countBmUnitPersonByUnitId(unitId); + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + /** * 绑定往来单位人员列表 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java index 1e81a470..3dd729b8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java @@ -71,5 +71,5 @@ public interface BmUnitMapper * @param unitId * @return */ - Integer selectBmUnitPersonByUnitId(Long unitId); + Integer countBmUnitPersonByUnitId(Long unitId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitPersonService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitPersonService.java index d693b9da..fae803c0 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitPersonService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitPersonService.java @@ -37,4 +37,6 @@ public interface IBmUnitPersonService * @return */ List selectBmUnitList(BmUnitPerson bmUnitPerson); + + int countBmUnitPersonByUnitId(Long unitId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java index 1c08e06b..55fb4c9e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java @@ -116,7 +116,7 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService } if (item.getUnitId() != null) { //根据单位id去人员绑定中查询是否绑定，赋值绑定状态 - item.setIsBind(bmUnitMapper.selectBmUnitPersonByUnitId(item.getUnitId()) > 0 ? 1 : 0); + item.setIsBind(bmUnitMapper.countBmUnitPersonByUnitId(item.getUnitId()) > 0 ? 1 : 0); } extracted(item); }); @@ -124,6 +124,11 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService return bmUnitList; } + @Override + public int countBmUnitPersonByUnitId(Long unitId) { + return bmUnitMapper.countBmUnitPersonByUnitId(unitId); + } + /** * 方法抽取 * @param unit @@ -132,7 +137,7 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService Map labelMap = remoteConfig.getDictValue("bm_unit_type"); if (unit.getUnitId() != null) { //根据单位id去人员绑定中查询是否绑定，赋值绑定状态 - unit.setIsBind(bmUnitMapper.selectBmUnitPersonByUnitId(unit.getUnitId()) > 0 ? 1 : 0); + unit.setIsBind(bmUnitMapper.countBmUnitPersonByUnitId(unit.getUnitId()) > 0 ? 1 : 0); } if (unit.getTypeId() != null) { unit.setTypeName(labelMap.get(unit.getTypeId().toString()) == null ? "" : labelMap.get(unit.getTypeId().toString())); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java index 646cbc67..116beea1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java @@ -87,7 +87,7 @@ public class BmUnitServiceImpl implements IBmUnitService Map labelMap = remoteConfig.getDictValue("bm_unit_type"); if (unit.getUnitId() != null) { //根据单位id去人员绑定中查询是否绑定，赋值绑定状态 - unit.setIsBind(bmUnitMapper.selectBmUnitPersonByUnitId(unit.getUnitId()) > 0 ? 1 : 0); + unit.setIsBind(bmUnitMapper.countBmUnitPersonByUnitId(unit.getUnitId()) > 0 ? 1 : 0); } if (unit.getTypeId() != null) { unit.setTypeName(labelMap.get(unit.getTypeId().toString()) == null ? "" : labelMap.get(unit.getTypeId().toString())); @@ -189,7 +189,7 @@ public class BmUnitServiceImpl implements IBmUnitService public AjaxResult deleteBmUnitByUnitId(Long unitId) { //先查看往来单位是否被绑定，绑定则不能删除 - if (bmUnitMapper.selectBmUnitPersonByUnitId(unitId) > 0) { + if (bmUnitMapper.countBmUnitPersonByUnitId(unitId) > 0) { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "该单位还绑定相关人员，无法删除"); } int result = bmUnitMapper.deleteBmUnitByUnitId(unitId); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml index a388738e..92a411d7 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select unit_id as unitId, unit_name as unitName from bm_unit where del_flag = 0 and unit_name = #{unitName} - select count(1) from bm_unit_person where unit_id = #{unitId}