From e4b411850497eff3e8a491307f64feddc4a5b9bd Mon Sep 17 00:00:00 2001 From: A0010407 Date: Mon, 11 Sep 2023 17:20:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=8A=A5=E5=B7=A5-=E7=8F=AD?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/BaseTeamTController.java | 2 + .../controller/BaseTeamUserController.java | 109 +++++++++++++++++ .../java/com/op/wms/domain/BaseTeamT.java | 22 ++++ .../java/com/op/wms/domain/BaseTeamUser.java | 86 +++++++++++++ .../com/op/wms/mapper/BaseTeamTMapper.java | 3 + .../com/op/wms/mapper/BaseTeamUserMapper.java | 71 +++++++++++ .../com/op/wms/service/IBaseTeamTService.java | 1 + .../op/wms/service/IBaseTeamUserService.java | 62 ++++++++++ .../service/impl/BaseTeamTServiceImpl.java | 38 +++++- .../service/impl/BaseTeamUserServiceImpl.java | 103 ++++++++++++++++ .../mapper/wms/BaseTeamUserMapper.xml | 113 ++++++++++++++++++ 11 files changed, 609 insertions(+), 1 deletion(-) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamUserController.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamUser.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamUserMapper.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/IBaseTeamUserService.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamUserServiceImpl.java create mode 100644 op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamUserMapper.xml diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamTController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamTController.java index 6a023701..ed102dc9 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamTController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamTController.java @@ -2,6 +2,8 @@ package com.op.wms.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.op.wms.domain.BaseTeamUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamUserController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamUserController.java new file mode 100644 index 00000000..0a60cc91 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseTeamUserController.java @@ -0,0 +1,109 @@ +package com.op.wms.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +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; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.wms.domain.BaseTeamUser; +import com.op.wms.service.IBaseTeamUserService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 班组人员Controller + * + * @author Open Platform + * @date 2023-08-29 + */ +@RestController +@RequestMapping("/teamUser") +public class BaseTeamUserController extends BaseController { + @Autowired + private IBaseTeamUserService baseTeamUserService; + + /** + * 查询班组人员列表 + */ + @RequiresPermissions("wms:teamUser:list") + @GetMapping("/list") + public TableDataInfo list(BaseTeamUser baseTeamUser) { + startPage(); + List list = baseTeamUserService.selectBaseTeamUserList(baseTeamUser); + return getDataTable(list); + } + + + /** + * 查询班组人员列表 + */ + @RequiresPermissions("wms:teamUser:listTeamMembers") + @GetMapping("/listTeamMembers") + public TableDataInfo listTeamMembers(BaseTeamUser baseTeamUser) { + startPage(); + List list = baseTeamUserService.selectTeamMembers(baseTeamUser); + return getDataTable(list); + } + + /** + * 导出班组人员列表 + */ + @RequiresPermissions("wms:teamUser:export") + @Log(title = "班组人员", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, BaseTeamUser baseTeamUser) { + List list = baseTeamUserService.selectBaseTeamUserList(baseTeamUser); + ExcelUtil util = new ExcelUtil(BaseTeamUser.class); + util.exportExcel(response, list, "班组人员数据"); + } + + /** + * 获取班组人员详细信息 + */ + @RequiresPermissions("wms:teamUser:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) { + return success(baseTeamUserService.selectBaseTeamUserById(id)); + } + + /** + * 新增班组人员 + */ + @RequiresPermissions("wms:teamUser:add") + @Log(title = "班组人员", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody BaseTeamUser baseTeamUser) { + return toAjax(baseTeamUserService.insertBaseTeamUser(baseTeamUser)); + } + + /** + * 修改班组人员 + */ + @RequiresPermissions("wms:teamUser:edit") + @Log(title = "班组人员", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BaseTeamUser baseTeamUser) { + return toAjax(baseTeamUserService.updateBaseTeamUser(baseTeamUser)); + } + + /** + * 删除班组人员 + */ + @RequiresPermissions("wms:teamUser:remove") + @Log(title = "班组人员", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) { + return toAjax(baseTeamUserService.deleteBaseTeamUserByIds(ids)); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java index fcfa0894..4320270a 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamT.java @@ -1,6 +1,8 @@ package com.op.wms.domain; import java.util.Date; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -113,6 +115,26 @@ public class BaseTeamT extends BaseEntity { @Excel(name = "班组类型") private String teamType; + private List rightData; + + public void setRightData(List rightData) { + this.rightData = rightData; + } + + public List getRightData() { + return rightData; + } + + private List selectedData; + + public void setSelectedData(List selectedData) { + this.selectedData = selectedData; + } + + public List getSelectedData() { + return selectedData; + } + public void setTeamType(String teamType) { this.teamType = teamType; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamUser.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamUser.java new file mode 100644 index 00000000..e825fd89 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseTeamUser.java @@ -0,0 +1,86 @@ +package com.op.wms.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 班组人员对象 base_team_user + * + * @author Open Platform + * @date 2023-08-29 + */ +public class BaseTeamUser extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 班组id */ + @Excel(name = "班组id") + private String teamId; + + /** 班组编码 */ + @Excel(name = "班组编码") + private String teamCode; + + /** 人员id */ + @Excel(name = "人员id") + private String userId; + + /** 人员名字 */ + @Excel(name = "人员名字") + private String userName; + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + public void setTeamId(String teamId) { + this.teamId = teamId; + } + + public String getTeamId() { + return teamId; + } + public void setTeamCode(String teamCode) { + this.teamCode = teamCode; + } + + public String getTeamCode() { + return teamCode; + } + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserId() { + return userId; + } + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserName() { + return userName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("teamId", getTeamId()) + .append("teamCode", getTeamCode()) + .append("userId", getUserId()) + .append("userName", getUserName()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamTMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamTMapper.java index bb719c01..6c7129e6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamTMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamTMapper.java @@ -2,7 +2,9 @@ package com.op.wms.mapper; import java.util.List; +import com.baomidou.dynamic.datasource.annotation.DS; import com.op.wms.domain.BaseTeamT; +import com.op.wms.domain.BaseTeamUser; /** * 班组Mapper接口 @@ -41,6 +43,7 @@ public interface BaseTeamTMapper { * @param baseTeamT 班组 * @return 结果 */ + @DS("#header.poolName") public int updateBaseTeamT(BaseTeamT baseTeamT); /** diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamUserMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamUserMapper.java new file mode 100644 index 00000000..998e2bc7 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseTeamUserMapper.java @@ -0,0 +1,71 @@ +package com.op.wms.mapper; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.wms.domain.BaseTeamUser; + +/** + * 班组人员Mapper接口 + * + * @author Open Platform + * @date 2023-08-29 + */ +public interface BaseTeamUserMapper { + /** + * 查询班组人员 + * + * @param id 班组人员主键 + * @return 班组人员 + */ + public BaseTeamUser selectBaseTeamUserById(String id); + + /** + * 查询班组人员列表 + * + * @param baseTeamUser 班组人员 + * @return 班组人员集合 + */ + public List selectBaseTeamUserList(BaseTeamUser baseTeamUser); + + /** + * 新增班组人员 + * + * @param baseTeamUser 班组人员 + * @return 结果 + */ + public int insertBaseTeamUser(BaseTeamUser baseTeamUser); + + /** + * 修改班组人员 + * + * @param baseTeamUser 班组人员 + * @return 结果 + */ + public int updateBaseTeamUser(BaseTeamUser baseTeamUser); + + /** + * 删除班组人员 + * + * @param id 班组人员主键 + * @return 结果 + */ + public int deleteBaseTeamUserById(String id); + + /** + * 批量删除班组人员 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseTeamUserByIds(String[] ids); + + //查询人员 + public List selectTeamMembers(BaseTeamUser baseTeamUser); + + //查询人员对应名字 + public List selectTeamMembersIds(BaseTeamUser baseTeamUser); + + //查询人员ID + public String selectId(BaseTeamUser baseTeamUser); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseTeamTService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseTeamTService.java index 96fb0973..04d8a75d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseTeamTService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseTeamTService.java @@ -2,6 +2,7 @@ package com.op.wms.service; import java.util.List; import com.op.wms.domain.BaseTeamT; +import com.op.wms.domain.BaseTeamUser; /** * 班组Service接口 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseTeamUserService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseTeamUserService.java new file mode 100644 index 00000000..d3492baf --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IBaseTeamUserService.java @@ -0,0 +1,62 @@ +package com.op.wms.service; + +import java.util.List; +import com.op.wms.domain.BaseTeamUser; + +/** + * 班组人员Service接口 + * + * @author Open Platform + * @date 2023-08-29 + */ +public interface IBaseTeamUserService { + /** + * 查询班组人员 + * + * @param id 班组人员主键 + * @return 班组人员 + */ + public BaseTeamUser selectBaseTeamUserById(String id); + + /** + * 查询班组人员列表 + * + * @param baseTeamUser 班组人员 + * @return 班组人员集合 + */ + public List selectBaseTeamUserList(BaseTeamUser baseTeamUser); + + /** + * 新增班组人员 + * + * @param baseTeamUser 班组人员 + * @return 结果 + */ + public int insertBaseTeamUser(BaseTeamUser baseTeamUser); + + /** + * 修改班组人员 + * + * @param baseTeamUser 班组人员 + * @return 结果 + */ + public int updateBaseTeamUser(BaseTeamUser baseTeamUser); + + /** + * 批量删除班组人员 + * + * @param ids 需要删除的班组人员主键集合 + * @return 结果 + */ + public int deleteBaseTeamUserByIds(String[] ids); + + /** + * 删除班组人员信息 + * + * @param id 班组人员主键 + * @return 结果 + */ + public int deleteBaseTeamUserById(String id); + + public List selectTeamMembers(BaseTeamUser baseTeamUser); +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java index 064d665a..6e30f06b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamTServiceImpl.java @@ -1,10 +1,14 @@ package com.op.wms.service.impl; +import java.util.ArrayList; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.uuid.IdUtils; import com.op.common.security.utils.SecurityUtils; +import com.op.wms.domain.BaseTeamUser; +import com.op.wms.mapper.BaseTeamUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.BaseTeamTMapper; @@ -22,6 +26,9 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { @Autowired private BaseTeamTMapper baseTeamTMapper; + @Autowired + private BaseTeamUserMapper baseTeamUserMapper; + /** * 查询班组 * @@ -31,7 +38,12 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { @Override @DS("#header.poolName") public BaseTeamT selectBaseTeamTByTeamId(String teamId) { - return baseTeamTMapper.selectBaseTeamTByTeamId(teamId); + BaseTeamUser baseTeamUser = new BaseTeamUser(); + baseTeamUser.setTeamId(teamId); + List baseTeamUser1 = baseTeamUserMapper.selectBaseTeamUserList(baseTeamUser); + BaseTeamT baseTeamT = baseTeamTMapper.selectBaseTeamTByTeamId(teamId); + baseTeamT.setSelectedData(baseTeamUser1); + return baseTeamT; } /** @@ -71,6 +83,30 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { public int updateBaseTeamT(BaseTeamT baseTeamT) { baseTeamT.setLastUpdateDate(DateUtils.getNowDate()); baseTeamT.setLastUpdateBy(SecurityUtils.getUsername()); + for(int i = 0;i list = new ArrayList<>(); + list = baseTeamT.getRightData(); + String userId = list.get(i); + baseTeamUser.setUserId(userId); + BaseTeamUser baseTeamUser1 = new BaseTeamUser(); + List members = baseTeamUserMapper.selectTeamMembersIds(baseTeamUser1); + boolean bool = members.contains(userId); + if(bool == true){ + //倒查id + String id = baseTeamUserMapper.selectId(baseTeamUser); + baseTeamUser.setUpdateTime(DateUtils.getNowDate()); + baseTeamUser.setUpdateBy(SecurityUtils.getUsername()); + baseTeamUserMapper.updateBaseTeamUser(baseTeamUser); + }else{ + baseTeamUser.setCreateBy(SecurityUtils.getUsername()); + baseTeamUser.setCreateTime(DateUtils.getNowDate()); + baseTeamUser.setId(IdUtils.fastSimpleUUID()); + baseTeamUserMapper.insertBaseTeamUser(baseTeamUser); + } + } return baseTeamTMapper.updateBaseTeamT(baseTeamT); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamUserServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamUserServiceImpl.java new file mode 100644 index 00000000..1fc8455a --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseTeamUserServiceImpl.java @@ -0,0 +1,103 @@ +package com.op.wms.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.wms.mapper.BaseTeamUserMapper; +import com.op.wms.domain.BaseTeamUser; +import com.op.wms.service.IBaseTeamUserService; + +/** + * 班组人员Service业务层处理 + * + * @author Open Platform + * @date 2023-08-29 + */ +@Service +public class BaseTeamUserServiceImpl implements IBaseTeamUserService { + @Autowired + private BaseTeamUserMapper baseTeamUserMapper; + + /** + * 查询班组人员 + * + * @param id 班组人员主键 + * @return 班组人员 + */ + @Override + public BaseTeamUser selectBaseTeamUserById(String id) { + return baseTeamUserMapper.selectBaseTeamUserById(id); + } + + /** + * 查询班组人员列表 + * + * @param baseTeamUser 班组人员 + * @return 班组人员 + */ + @Override + public List selectBaseTeamUserList(BaseTeamUser baseTeamUser) { + return baseTeamUserMapper.selectBaseTeamUserList(baseTeamUser); + } + + /** + * 新增班组人员 + * + * @param baseTeamUser 班组人员 + * @return 结果 + */ + @Override + public int insertBaseTeamUser(BaseTeamUser baseTeamUser) { + baseTeamUser.setCreateTime(DateUtils.getNowDate()); + return baseTeamUserMapper.insertBaseTeamUser(baseTeamUser); + } + + /** + * 修改班组人员 + * + * @param baseTeamUser 班组人员 + * @return 结果 + */ + @Override + public int updateBaseTeamUser(BaseTeamUser baseTeamUser) { + baseTeamUser.setUpdateTime(DateUtils.getNowDate()); + return baseTeamUserMapper.updateBaseTeamUser(baseTeamUser); + } + + /** + * 批量删除班组人员 + * + * @param ids 需要删除的班组人员主键 + * @return 结果 + */ + @Override + public int deleteBaseTeamUserByIds(String[] ids) { + return baseTeamUserMapper.deleteBaseTeamUserByIds(ids); + } + + /** + * 删除班组人员信息 + * + * @param id 班组人员主键 + * @return 结果 + */ + @Override + public int deleteBaseTeamUserById(String id) { + return baseTeamUserMapper.deleteBaseTeamUserById(id); + } + + /** + * 查询班组人员列表 + * + * @param baseTeamUser 班组人员 + * @return 班组人员 + */ + @Override + @DS("#master") + public List selectTeamMembers(BaseTeamUser baseTeamUser){ + return baseTeamUserMapper.selectTeamMembers(baseTeamUser); + } +} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamUserMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamUserMapper.xml new file mode 100644 index 00000000..5b793d04 --- /dev/null +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamUserMapper.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + select id, team_id, team_code, user_id, user_name, create_by, create_time, update_by, update_time from base_team_user + + + + + + + + insert into base_team_user + + id, + team_id, + team_code, + user_id, + user_name, + create_by, + create_time, + update_by, + update_time, + + + #{id}, + #{teamId}, + #{teamCode}, + #{userId}, + #{userName}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update base_team_user + + team_id = #{teamId}, + team_code = #{teamCode}, + user_id = #{userId}, + user_name = #{userName}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from base_team_user where id = #{id} + + + + delete from base_team_user where id in + + #{id} + + + + + + + + + + + + \ No newline at end of file