diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeSelect.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeSelect.java index 6318aaf7..a52cba71 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeSelect.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeSelect.java @@ -39,8 +39,6 @@ public class TreeSelect implements Serializable @JsonInclude(JsonInclude.Include.NON_EMPTY) private List children; - private List userList; - public TreeSelect(SysDeptTree dept) { this.id = Integer.valueOf(dept.getDeptId()); this.parentId = Integer.valueOf(dept.getParentId()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java index bf64ef37..eeec4850 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java @@ -111,8 +111,8 @@ public class BmUnitController extends BaseController @RequiresPermissions("basic:unit:remove") @SysLog(title = "往来单位管理", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除往来单位管理") @DeleteMapping("/{unitIds}") - public AjaxResult remove(@PathVariable Long[] unitIds) + public AjaxResult remove(@PathVariable Long unitId) { - return bmUnitService.deleteBmUnitByUnitIds(unitIds); + return bmUnitService.deleteBmUnitByUnitId(unitId); } } 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 d71fc907..dc823236 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,7 +1,6 @@ package com.bonus.material.basic.controller; import java.util.List; -import javax.servlet.http.HttpServletResponse; import com.bonus.common.biz.domain.SysDeptTree; import com.bonus.common.biz.domain.TreeSelect; @@ -12,7 +11,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -24,8 +22,6 @@ import com.bonus.material.basic.domain.BmUnitPerson; import com.bonus.material.basic.service.IBmUnitPersonService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.core.utils.poi.ExcelUtil; -import com.bonus.common.core.web.page.TableDataInfo; /** * 往来单位管理Controller @@ -41,19 +37,6 @@ public class BmUnitPersonController extends BaseController @Autowired private IBmUnitPersonService bmUnitPersonService; - /** - * 查询往来单位管理列表 - */ - @ApiOperation(value = "查询往来单位管理列表") - @RequiresPermissions("basic:person:list") - @GetMapping("/list") - public TableDataInfo list(BmUnitPerson bmUnitPerson) - { - startPage(); - List list = bmUnitPersonService.selectBmUnitPersonList(bmUnitPerson); - return getDataTable(list); - } - /** * 查询部门用户下拉树 */ @@ -65,67 +48,29 @@ public class BmUnitPersonController extends BaseController } /** - * 导出往来单位管理列表 + * 绑定往来单位人员列表 */ - @ApiOperation(value = "导出往来单位管理列表") + @ApiOperation(value = "绑定往来单位人员列表") @PreventRepeatSubmit - @RequiresPermissions("basic:person:export") - @SysLog(title = "往来单位管理", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出往来单位管理") - @PostMapping("/export") - public void export(HttpServletResponse response, BmUnitPerson bmUnitPerson) + @RequiresPermissions("basic:person:bind") + @SysLog(title = "往来单位人员管理", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->绑定往来单位人员") + @PostMapping("/bind") + public AjaxResult bind(@RequestBody BmUnitPerson bmUnitPerson) { - List list = bmUnitPersonService.selectBmUnitPersonList(bmUnitPerson); - ExcelUtil util = new ExcelUtil(BmUnitPerson.class); - util.exportExcel(response, list, "往来单位管理数据"); + return bmUnitPersonService.insertBmUnitPerson(bmUnitPerson); } - /** - * 获取往来单位管理详细信息 - */ - @ApiOperation(value = "获取往来单位管理详细信息") - @RequiresPermissions("basic:person:query") - @GetMapping(value = "/{ID}") - public AjaxResult getInfo(@PathVariable("ID") Long ID) - { - return success(bmUnitPersonService.selectBmUnitPersonByID(ID)); - } /** - * 新增往来单位管理 + * 解绑往来单位人员列表 */ - @ApiOperation(value = "新增往来单位管理") - @PreventRepeatSubmit - @RequiresPermissions("basic:person:add") - @SysLog(title = "往来单位管理", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增往来单位管理") - @PostMapping - public AjaxResult add(@RequestBody BmUnitPerson bmUnitPerson) - { - return toAjax(bmUnitPersonService.insertBmUnitPerson(bmUnitPerson)); - } - - /** - * 修改往来单位管理 - */ - @ApiOperation(value = "修改往来单位管理") - @PreventRepeatSubmit - @RequiresPermissions("basic:person:edit") - @SysLog(title = "往来单位管理", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改往来单位管理") - @PutMapping - public AjaxResult edit(@RequestBody BmUnitPerson bmUnitPerson) - { - return toAjax(bmUnitPersonService.updateBmUnitPerson(bmUnitPerson)); - } - - /** - * 删除往来单位管理 - */ - @ApiOperation(value = "删除往来单位管理") + @ApiOperation(value = "解绑往来单位人员列表") @PreventRepeatSubmit @RequiresPermissions("basic:person:remove") - @SysLog(title = "往来单位管理", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除往来单位管理") - @DeleteMapping("/{IDs}") - public AjaxResult remove(@PathVariable Long[] IDs) + @SysLog(title = "往来单位管理", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->解绑往来单位人员") + @DeleteMapping("/{unitId}") + public AjaxResult unbind(@PathVariable Long unitId) { - return toAjax(bmUnitPersonService.deleteBmUnitPersonByIDs(IDs)); + return bmUnitPersonService.deleteBmUnitPersonByID(unitId); } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java index 4364595d..411768b1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java @@ -3,11 +3,9 @@ package com.bonus.material.basic.controller; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.common.core.web.page.TableDataInfo; import com.bonus.common.log.annotation.SysLog; import com.bonus.common.log.enums.OperaType; import com.bonus.common.security.annotation.RequiresPermissions; -import com.bonus.material.basic.domain.BmUnit; import com.bonus.material.basic.domain.BmUnitType; import com.bonus.material.basic.service.IBmUnitTypeService; import com.bonus.material.common.annotation.PreventRepeatSubmit; @@ -26,7 +24,7 @@ import java.util.List; * @Author ma_sh * @create 2024/10/14 15:25 */ -@Api(tags = "往来单位管理接口") +@Api(tags = "往来单位类型管理接口") @RestController @RequestMapping("/bm_unit_type") public class BmUnitTypeController extends BaseController { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java index b3c45f10..62e5541d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java @@ -55,5 +55,10 @@ public class BmUnit extends BaseEntity /** 删除标志（0代表存在 2代表删除） */ private String delFlag; + /** + * 是否绑定 1 是，0 否 + */ + private Integer isBind; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java index 57fa48ec..7dbc32a7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java @@ -6,6 +6,8 @@ import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import java.util.List; + /** * 往来单位管理对象 bm_unit_person * @@ -21,9 +23,12 @@ public class BmUnitPerson extends BaseEntity private static final long serialVersionUID = 1L; /** 主键ID */ - private Long ID; + private Long id; - /** 类型ID */ + /** 类型ID集合 */ + private List unitIdList; + + @ApiModelProperty(value = "类型ID") private Long unitId; /** 用户ID */ 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 2144acfe..1e81a470 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 @@ -65,4 +65,11 @@ public interface BmUnitMapper * @return */ BmUnit selectBmUnitByProName(String unitName); + + /** + * 根据单位id查询单位人员数量 + * @param unitId + * @return + */ + Integer selectBmUnitPersonByUnitId(Long unitId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitPersonMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitPersonMapper.java index 0031eb27..5051acb4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitPersonMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitPersonMapper.java @@ -13,21 +13,6 @@ import com.bonus.material.basic.domain.BmUnitPerson; */ public interface BmUnitPersonMapper { - /** - * 查询往来单位管理 - * - * @param ID 往来单位管理主键 - * @return 往来单位管理 - */ - public BmUnitPerson selectBmUnitPersonByID(Long ID); - - /** - * 查询往来单位管理列表 - * - * @param bmUnitPerson 往来单位管理 - * @return 往来单位管理集合 - */ - public List selectBmUnitPersonList(BmUnitPerson bmUnitPerson); /** * 新增往来单位管理 @@ -37,29 +22,13 @@ public interface BmUnitPersonMapper */ public int insertBmUnitPerson(BmUnitPerson bmUnitPerson); - /** - * 修改往来单位管理 - * - * @param bmUnitPerson 往来单位管理 - * @return 结果 - */ - public int updateBmUnitPerson(BmUnitPerson bmUnitPerson); - /** * 删除往来单位管理 * - * @param ID 往来单位管理主键 + * @param unitId 往来单位管理主键 * @return 结果 */ - public int deleteBmUnitPersonByID(Long ID); - - /** - * 批量删除往来单位管理 - * - * @param IDs 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteBmUnitPersonByIDs(Long[] IDs); + public int deleteBmUnitPersonByID(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 49f268df..0dc918bf 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 @@ -4,6 +4,7 @@ import java.util.List; import com.bonus.common.biz.domain.SysDeptTree; import com.bonus.common.biz.domain.TreeSelect; +import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.basic.domain.BmUnitPerson; /** @@ -14,21 +15,6 @@ import com.bonus.material.basic.domain.BmUnitPerson; */ public interface IBmUnitPersonService { - /** - * 查询往来单位管理 - * - * @param ID 往来单位管理主键 - * @return 往来单位管理 - */ - public BmUnitPerson selectBmUnitPersonByID(Long ID); - - /** - * 查询往来单位管理列表 - * - * @param bmUnitPerson 往来单位管理 - * @return 往来单位管理集合 - */ - public List selectBmUnitPersonList(BmUnitPerson bmUnitPerson); /** * 新增往来单位管理 @@ -36,31 +22,15 @@ public interface IBmUnitPersonService * @param bmUnitPerson 往来单位管理 * @return 结果 */ - public int insertBmUnitPerson(BmUnitPerson bmUnitPerson); - - /** - * 修改往来单位管理 - * - * @param bmUnitPerson 往来单位管理 - * @return 结果 - */ - public int updateBmUnitPerson(BmUnitPerson bmUnitPerson); - - /** - * 批量删除往来单位管理 - * - * @param IDs 需要删除的往来单位管理主键集合 - * @return 结果 - */ - public int deleteBmUnitPersonByIDs(Long[] IDs); + public AjaxResult insertBmUnitPerson(BmUnitPerson bmUnitPerson); /** * 删除往来单位管理信息 * - * @param ID 往来单位管理主键 + * @param unitId 往来单位管理主键 * @return 结果 */ - public int deleteBmUnitPersonByID(Long ID); + public AjaxResult deleteBmUnitPersonByID(Long unitId); /** * 查询部门下拉树结构 @@ -68,4 +38,5 @@ public interface IBmUnitPersonService * @return */ List selectDeptTree(SysDeptTree sysDept); + } 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 f1d33062..e7bbb19e 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 @@ -1,14 +1,15 @@ package com.bonus.material.basic.service.impl; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.biz.domain.SysDeptTree; import com.bonus.common.biz.domain.TreeSelect; +import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.core.web.domain.AjaxResult; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.material.basic.mapper.BmUnitPersonMapper; @@ -27,30 +28,6 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService @Autowired private BmUnitPersonMapper bmUnitPersonMapper; - /** - * 查询往来单位管理 - * - * @param ID 往来单位管理主键 - * @return 往来单位管理 - */ - @Override - public BmUnitPerson selectBmUnitPersonByID(Long ID) - { - return bmUnitPersonMapper.selectBmUnitPersonByID(ID); - } - - /** - * 查询往来单位管理列表 - * - * @param bmUnitPerson 往来单位管理 - * @return 往来单位管理 - */ - @Override - public List selectBmUnitPersonList(BmUnitPerson bmUnitPerson) - { - return bmUnitPersonMapper.selectBmUnitPersonList(bmUnitPerson); - } - /** * 新增往来单位管理 * @@ -58,47 +35,36 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService * @return 结果 */ @Override - public int insertBmUnitPerson(BmUnitPerson bmUnitPerson) + public AjaxResult insertBmUnitPerson(BmUnitPerson bmUnitPerson) { - bmUnitPerson.setCreateTime(DateUtils.getNowDate()); - return bmUnitPersonMapper.insertBmUnitPerson(bmUnitPerson); - } - - /** - * 修改往来单位管理 - * - * @param bmUnitPerson 往来单位管理 - * @return 结果 - */ - @Override - public int updateBmUnitPerson(BmUnitPerson bmUnitPerson) - { - bmUnitPerson.setUpdateTime(DateUtils.getNowDate()); - return bmUnitPersonMapper.updateBmUnitPerson(bmUnitPerson); - } - - /** - * 批量删除往来单位管理 - * - * @param IDs 需要删除的往来单位管理主键 - * @return 结果 - */ - @Override - public int deleteBmUnitPersonByIDs(Long[] IDs) - { - return bmUnitPersonMapper.deleteBmUnitPersonByIDs(IDs); + int result = 0; + if (CollectionUtils.isNotEmpty(bmUnitPerson.getUnitIdList())) { + for (Long unitId : bmUnitPerson.getUnitIdList()) { + bmUnitPerson.setCreateTime(DateUtils.getNowDate()); + bmUnitPerson.setUnitId(unitId); + result += bmUnitPersonMapper.insertBmUnitPerson(bmUnitPerson); + } + } + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** * 删除往来单位管理信息 * - * @param ID 往来单位管理主键 + * @param unitId 往来单位管理主键 * @return 结果 */ @Override - public int deleteBmUnitPersonByID(Long ID) + public AjaxResult deleteBmUnitPersonByID(Long unitId) { - return bmUnitPersonMapper.deleteBmUnitPersonByID(ID); + int result = bmUnitPersonMapper.deleteBmUnitPersonByID(unitId); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** 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 063ed8a6..3fbf9846 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 @@ -4,6 +4,7 @@ import java.util.List; import java.util.Objects; import cn.hutool.core.util.PhoneUtil; +import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; @@ -48,7 +49,16 @@ public class BmUnitServiceImpl implements IBmUnitService @Override public List selectBmUnitList(BmUnit bmUnit) { - return bmUnitMapper.selectBmUnitList(bmUnit); + List bmUnitList = bmUnitMapper.selectBmUnitList(bmUnit); + if (CollectionUtils.isNotEmpty(bmUnitList)) { + for (BmUnit unit : bmUnitList) { + if (unit.getUnitId() != null) { + //根据单位id去人员绑定中查询是否绑定，赋值绑定状态 + unit.setIsBind(bmUnitMapper.selectBmUnitPersonByUnitId(unit.getUnitId()) > 0 ? 1 : 0); + } + } + } + return bmUnitList; } /** 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 936f445e..98fc928d 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 @@ -40,10 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = 0 and unit_id = #{unitId} + + + insert into bm_unit diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml index 717054d4..ee631e92 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml @@ -3,31 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - select ID, unit_id, user_id, company_id, create_time, update_time from bm_unit_person - - - - -