bonus
/
Material_Station_System
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单位类型人员绑定

This commit is contained in:
mashuai 2024-10-15 10:21:17 +08:00
parent 844ab1067d
commit df6f043c59
13 changed files with 83 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeSelect.java
View File

@ -39,8 +39,6 @@ public class TreeSelect implements Serializable
@JsonInclude(JsonInclude.Include.NON_EMPTY)
private List<TreeSelect> children;
private List<SysUser> userList;
public TreeSelect(SysDeptTree dept) {
this.id = Integer.valueOf(dept.getDeptId());
this.parentId = Integer.valueOf(dept.getParentId());

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java
View File

@ -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);
}
}

81
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java
View File

@ -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<BmUnitPerson> 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<BmUnitPerson> list = bmUnitPersonService.selectBmUnitPersonList(bmUnitPerson);
ExcelUtil<BmUnitPerson> util = new ExcelUtil<BmUnitPerson>(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);
}
}

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitTypeController.java
View File

@ -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 {

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnit.java
View File

@ -55,5 +55,10 @@ public class BmUnit extends BaseEntity
/** 删除标志（0代表存在 2代表删除） */
private String delFlag;
/**
* 是否绑定 1 是，0 否
*/
private Integer isBind;
}

9
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java
View File

@ -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<Long> unitIdList;
@ApiModelProperty(value = "类型ID")
private Long unitId;
/** 用户ID */

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java
View File

@ -65,4 +65,11 @@ public interface BmUnitMapper
* @return
*/
BmUnit selectBmUnitByProName(String unitName);
/**
* 根据单位id查询单位人员数量
* @param unitId
* @return
*/
Integer selectBmUnitPersonByUnitId(Long unitId);
}

35
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitPersonMapper.java
View File

@ -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<BmUnitPerson> 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);
/**
* 查询部门树

39
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/IBmUnitPersonService.java
View File

@ -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<BmUnitPerson> 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<TreeSelect> selectDeptTree(SysDeptTree sysDept);
}

82
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java
View File

@ -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<BmUnitPerson> 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());
}
/**

12
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java
View File

@ -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<BmUnit> selectBmUnitList(BmUnit bmUnit)
{
return bmUnitMapper.selectBmUnitList(bmUnit);
List<BmUnit> 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;
}
/**

5
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
View File

@ -40,10 +40,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBmUnitVo"/>
where del_flag = 0 and unit_id = #{unitId}
</select>
<select id="selectBmUnitByProName" resultType="com.bonus.material.basic.domain.BmUnit">
select unit_id as unitId, unit_name as unitName from bm_unit where del_flag = 0 and unit_name = #{unitName}
</select>
<select id="selectBmUnitPersonByUnitId" resultType="java.lang.Integer">
select count(1) from bm_unit_person where unit_id = #{unitId}
</select>
<insert id="insertBmUnit" parameterType="com.bonus.material.basic.domain.BmUnit" useGeneratedKeys="true" keyProperty="unitId">
insert into bm_unit
<trim prefix="(" suffix=")" suffixOverrides=",">

45
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml
View File

@ -3,31 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.material.basic.mapper.BmUnitPersonMapper">
<resultMap type="com.bonus.material.basic.domain.BmUnitPerson" id="BmUnitPersonResult">
<result property="ID" column="ID" />
<result property="unitId" column="unit_id" />
<result property="userId" column="user_id" />
<result property="companyId" column="company_id" />
<result property="createTime" column="create_time" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectBmUnitPersonVo">
select ID, unit_id, user_id, company_id, create_time, update_time from bm_unit_person
</sql>
<select id="selectBmUnitPersonList" parameterType="com.bonus.material.basic.domain.BmUnitPerson" resultMap="BmUnitPersonResult">
<include refid="selectBmUnitPersonVo"/>
<where>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="companyId != null and companyId != ''"> and company_id = #{companyId}</if>
</where>
</select>
<select id="selectBmUnitPersonByID" parameterType="Long" resultMap="BmUnitPersonResult">
<include refid="selectBmUnitPersonVo"/>
where ID = #{ID}
</select>
<select id="selectDeptTree" resultType="com.bonus.common.biz.domain.SysDeptTree">
<choose>
@ -94,26 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateBmUnitPerson" parameterType="com.bonus.material.basic.domain.BmUnitPerson">
update bm_unit_person
<trim prefix="SET" suffixOverrides=",">
<if test="unitId != null">unit_id = #{unitId},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="companyId != null">company_id = #{companyId},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where ID = #{ID}
</update>
<delete id="deleteBmUnitPersonByID" parameterType="Long">
delete from bm_unit_person where ID = #{ID}
delete from bm_unit_person where unit_id = #{unitId}
</delete>
<delete id="deleteBmUnitPersonByIDs" parameterType="String">
delete from bm_unit_person where ID in
<foreach item="ID" collection="array" open="(" separator="," close=")">
#{ID}
</foreach>
</delete>
</mapper>