From f4703186e07b6012be7afc7ad59298e3dfe997e1 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Wed, 15 May 2024 10:41:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/system/api/domain/SysNoticeGroup.java | 6 ++--- .../controller/SysNoticeGroupController.java | 15 ++++++------ .../system/mapper/SysNoticeGroupMapper.java | 6 ++++- .../service/ISysNoticeGroupService.java | 5 +++- .../impl/SysNoticeGroupServiceImpl.java | 23 +++++++++++++++---- .../mapper/system/SysNoticeGroupMapper.xml | 20 ++++++++++++---- 6 files changed, 53 insertions(+), 22 deletions(-) diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysNoticeGroup.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysNoticeGroup.java index 30fb0dc7..1b8ad09b 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysNoticeGroup.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/SysNoticeGroup.java @@ -17,7 +17,7 @@ public class SysNoticeGroup extends BaseEntity { /** * 公告ID */ - private Long id; + private String id; /** * 公告标题 @@ -46,11 +46,11 @@ public class SysNoticeGroup extends BaseEntity { private String[] groupNames; - public void setId(Long id) { + public void setId(String id) { this.id = id; } - public Long getId() { + public String getId() { return id; } diff --git a/op-modules/op-system/src/main/java/com/op/system/controller/SysNoticeGroupController.java b/op-modules/op-system/src/main/java/com/op/system/controller/SysNoticeGroupController.java index 35bc30af..41e979ac 100644 --- a/op-modules/op-system/src/main/java/com/op/system/controller/SysNoticeGroupController.java +++ b/op-modules/op-system/src/main/java/com/op/system/controller/SysNoticeGroupController.java @@ -61,10 +61,10 @@ public class SysNoticeGroupController extends BaseController { /** * 获取通知公告-班组详细信息 */ - @RequiresPermissions("noticeGroup:noticeGroup:query") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(sysNoticeGroupService.selectSysNoticeGroupById(id)); + public TableDataInfo getInfo(@PathVariable("id") String id) { + List list = sysNoticeGroupService.selectByNoticeId(id); + return getDataTable(list); } /** @@ -90,11 +90,10 @@ public class SysNoticeGroupController extends BaseController { /** * 删除通知公告-班组 */ - @RequiresPermissions("noticeGroup:noticeGroup:remove") - @Log(title = "通知公告-班组", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(sysNoticeGroupService.deleteSysNoticeGroupByIds(ids)); + + @PostMapping("/delNoticeGroup") + public AjaxResult delNoticeGroup(@RequestBody SysNoticeGroup sysNoticeGroup) { + return toAjax(sysNoticeGroupService.deleteByNoticeId(sysNoticeGroup)); } @PostMapping("/teamBind") diff --git a/op-modules/op-system/src/main/java/com/op/system/mapper/SysNoticeGroupMapper.java b/op-modules/op-system/src/main/java/com/op/system/mapper/SysNoticeGroupMapper.java index fad50935..7bdba7a8 100644 --- a/op-modules/op-system/src/main/java/com/op/system/mapper/SysNoticeGroupMapper.java +++ b/op-modules/op-system/src/main/java/com/op/system/mapper/SysNoticeGroupMapper.java @@ -19,7 +19,7 @@ public interface SysNoticeGroupMapper { * @param id 通知公告-班组主键 * @return 通知公告-班组 */ - public SysNoticeGroup selectSysNoticeGroupById(Long id); + public List selectByNoticeId(String id); /** * 查询通知公告-班组列表 @@ -62,4 +62,8 @@ public interface SysNoticeGroupMapper { public int deleteSysNoticeGroupByIds(Long[] ids); public int getSerialNumber(); + + public List validData(SysNoticeGroup sysNoticeGroup); + + public int deleteByNotice(SysNoticeGroup sysNoticeGroup); } diff --git a/op-modules/op-system/src/main/java/com/op/system/service/ISysNoticeGroupService.java b/op-modules/op-system/src/main/java/com/op/system/service/ISysNoticeGroupService.java index 813ed1e6..e0cc7ebd 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/ISysNoticeGroupService.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/ISysNoticeGroupService.java @@ -17,7 +17,7 @@ public interface ISysNoticeGroupService { * @param id 通知公告-班组主键 * @return 通知公告-班组 */ - public SysNoticeGroup selectSysNoticeGroupById(Long id); + public List selectByNoticeId(String id); /** * 查询通知公告-班组列表 @@ -59,4 +59,7 @@ public interface ISysNoticeGroupService { */ public int deleteSysNoticeGroupById(Long id); + public List validData(SysNoticeGroup sysNoticeGroup); + + public int deleteByNoticeId(SysNoticeGroup sysNoticeGroup); } diff --git a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysNoticeGroupServiceImpl.java b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysNoticeGroupServiceImpl.java index 8060ac79..7b6a362d 100644 --- a/op-modules/op-system/src/main/java/com/op/system/service/impl/SysNoticeGroupServiceImpl.java +++ b/op-modules/op-system/src/main/java/com/op/system/service/impl/SysNoticeGroupServiceImpl.java @@ -4,7 +4,6 @@ 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.system.api.domain.SysNoticeGroup; import org.springframework.beans.factory.annotation.Autowired; @@ -32,8 +31,9 @@ public class SysNoticeGroupServiceImpl implements ISysNoticeGroupService { * @return 通知公告-班组 */ @Override - public SysNoticeGroup selectSysNoticeGroupById(Long id) { - return sysNoticeGroupMapper.selectSysNoticeGroupById(id); + @DS("#header.poolName") + public List selectByNoticeId(String id) { + return sysNoticeGroupMapper.selectByNoticeId(id); } /** @@ -57,17 +57,19 @@ public class SysNoticeGroupServiceImpl implements ISysNoticeGroupService { @DS("#header.poolName") public int insertSysNoticeGroup(SysNoticeGroup sysNoticeGroup) { String[] groupCodes = sysNoticeGroup.getGroupCodes(); - if (groupCodes == null){ + if (groupCodes == null) { return 0; } String[] groupNames = sysNoticeGroup.getGroupNames(); Long noticeId = sysNoticeGroup.getNoticeId(); String username = SecurityUtils.getUsername(); + // 绑定前先清空旧数据 + sysNoticeGroupMapper.deleteByNotice(sysNoticeGroup); Long serialId = getSerialId(); int count = 0; for (int i = 0; i < groupCodes.length; i++) { - sysNoticeGroup.setId(serialId++); + sysNoticeGroup.setId(String.valueOf(serialId++)); sysNoticeGroup.setNoticeId(noticeId); sysNoticeGroup.setGroupCode(groupCodes[i]); sysNoticeGroup.setGroupName(groupNames[i]); @@ -112,6 +114,17 @@ public class SysNoticeGroupServiceImpl implements ISysNoticeGroupService { return sysNoticeGroupMapper.deleteSysNoticeGroupById(id); } + @Override + public List validData(SysNoticeGroup sysNoticeGroup) { + return sysNoticeGroupMapper.validData(sysNoticeGroup); + } + + @Override + @DS("#header.poolName") + public int deleteByNoticeId(SysNoticeGroup sysNoticeGroup) { + return sysNoticeGroupMapper.deleteByNotice(sysNoticeGroup); + } + @DS("#header.poolName") private Long getSerialId() { String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate()); diff --git a/op-modules/op-system/src/main/resources/mapper/system/SysNoticeGroupMapper.xml b/op-modules/op-system/src/main/resources/mapper/system/SysNoticeGroupMapper.xml index 3fc67cf3..1e923bf5 100644 --- a/op-modules/op-system/src/main/resources/mapper/system/SysNoticeGroupMapper.xml +++ b/op-modules/op-system/src/main/resources/mapper/system/SysNoticeGroupMapper.xml @@ -36,10 +36,10 @@ - @@ -125,19 +125,31 @@ - delete from sys_notice_group where id = #{id} + update sys_notice_group set del_flag = '1' where id = #{id} - delete from sys_notice_group where id in + update sys_notice_group set del_flag = "1" where id in #{id} + + + + update sys_notice_group set del_flag = '1' where notice_id = #{noticeId} and group_code in + + #{groupCode} + + + From 9bd854d9d98a6f349b0b029307aac4393a708828 Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 15 May 2024 10:57:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2024-5-15=20=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E7=8F=AD=E7=BB=84-=E5=A2=9E=E5=8A=A0=E5=85=B3?= =?UTF-8?q?=E4=BA=8E=E5=BE=AE=E4=BF=A1=E5=8F=B7=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/BaseTeamUser.java | 20 ++++++++----- .../com/op/wms/mapper/BaseTeamUserMapper.java | 5 ++-- .../service/impl/BaseTeamTServiceImpl.java | 29 ++++++++----------- .../mapper/wms/BaseTeamUserMapper.xml | 22 +++++++++----- 4 files changed, 42 insertions(+), 34 deletions(-) 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 index abdf8904..3ac27d97 100644 --- 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 @@ -56,12 +56,16 @@ public class BaseTeamUser extends BaseEntity { private String teamUserName; //电话 + @Excel(name = "电话") private String phonenumber; + //微信 + @Excel(name = "微信") + private String wxId; + public void setId(String id) { this.id = id; } - public String getId() { return id; } @@ -69,7 +73,6 @@ public class BaseTeamUser extends BaseEntity { public void setTeamId(String teamId) { this.teamId = teamId; } - public String getTeamId() { return teamId; } @@ -77,7 +80,6 @@ public class BaseTeamUser extends BaseEntity { public void setTeamCode(String teamCode) { this.teamCode = teamCode; } - public String getTeamCode() { return teamCode; } @@ -85,7 +87,6 @@ public class BaseTeamUser extends BaseEntity { public void setUserId(String userId) { this.userId = userId; } - public String getUserId() { return userId; } @@ -93,7 +94,6 @@ public class BaseTeamUser extends BaseEntity { public void setUserName(String userName) { this.userName = userName; } - public String getUserName() { return userName; } @@ -101,7 +101,6 @@ public class BaseTeamUser extends BaseEntity { public String getNickName() { return nickName; } - public void setNickName(String nickName) { this.nickName = nickName; } @@ -109,7 +108,6 @@ public class BaseTeamUser extends BaseEntity { public String getTeamUserName() { return teamUserName; } - public void setTeamUserName(String teamUserName) { this.teamUserName = teamUserName; } @@ -117,11 +115,17 @@ public class BaseTeamUser extends BaseEntity { public void setPhonenumber(String phonenumber) { this.phonenumber = phonenumber; } - public String getPhonenumber() { return phonenumber; } + public void setWxId(String wxId) { + this.wxId = wxId; + } + public String getWxId() { + return wxId; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) 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 index cd33d733..5924e755 100644 --- 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 @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.wms.domain.BaseTeamUser; +import org.apache.ibatis.annotations.Param; /** * 班组人员Mapper接口 @@ -69,8 +70,8 @@ public interface BaseTeamUserMapper { //查询人员ID public String selectId(BaseTeamUser baseTeamUser); - @DS("master") - public String selectUserName(BaseTeamUser baseTeamUser); + @DS("#master") + public BaseTeamUser selectUserDetail(@Param("userId") String userId); //批量删除 public void deleteBaseTeamUserByTeamId(String teamId); 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 c91f618b..dbb87a2f 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 @@ -82,9 +82,11 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { list = baseTeamT.getRightData(); String userId = list.get(i); baseTeamUser.setUserId(userId); - String userName = baseTeamUserMapper.selectUserName(baseTeamUser); - //判断班组人员有没有变动 挨个遍历 - baseTeamUser.setUserName(userName); + BaseTeamUser user = baseTeamUserMapper.selectUserDetail(baseTeamUser.getUserId()); + if(user != null){ + baseTeamUser.setUserName(user.getUserName()); + baseTeamUser.setWxId(user.getWxId()); + } baseTeamUserMapper.insertBaseTeamUser(baseTeamUser); } return 1; @@ -114,19 +116,12 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { list = baseTeamT.getRightData(); String userId = list.get(i); baseTeamUser.setUserId(userId); - String userName = baseTeamUserMapper.selectUserName(baseTeamUser); - //判断班组人员有没有变动 挨个遍历 - baseTeamUser.setUserName(userName); + BaseTeamUser user = baseTeamUserMapper.selectUserDetail(userId); + if(user != null){ + baseTeamUser.setUserName(user.getUserName()); + baseTeamUser.setWxId(user.getWxId()); + } baseTeamUserMapper.insertBaseTeamUser(baseTeamUser); -// BaseTeamUser baseTeamUser1 = new BaseTeamUser(); -// List members = baseTeamUserMapper.selectTeamMembersIds(baseTeamUser1); -// boolean bool = members.contains(userId); - //倒查id -// String id = baseTeamUserMapper.selectId(baseTeamUser); -// baseTeamUser.setUpdateTime(DateUtils.getNowDate()); -// baseTeamUser.setUpdateBy(SecurityUtils.getUsername()); -// baseTeamUserMapper.updateBaseTeamUser(baseTeamUser); - //如果过来的班组成员ID不存在于表中，直接新增 } return baseTeamTMapper.updateBaseTeamT(baseTeamT); } @@ -158,7 +153,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { } /** - * 判断仓库信息 + * 判断班组Code * * @return 结果 */ @@ -174,7 +169,7 @@ public class BaseTeamTServiceImpl implements IBaseTeamTService { } /** - * 判断仓库信息 + * 判断班组名称 * * @return 结果 */ 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 index f7e953a3..3e2de0ba 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamUserMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseTeamUserMapper.xml @@ -14,10 +14,11 @@ + - select id, team_id, team_code, user_id, user_name, create_by, create_time, update_by, update_time from base_team_user + select id, team_id, team_code, user_id, user_name, create_by, create_time, update_by, update_time, wx_id from base_team_user select - user_id, - user_name, - nick_name, - CONCAT(nick_name,user_name) AS teamUserName + user_id, + user_name, + nick_name, + CONCAT(nick_name,user_name) AS teamUserName, + wx_id from sys_user @@ -118,8 +123,11 @@ and team_id = #{teamId} - + select + user_id AS userId , + user_name AS userName, + wx_id AS wxId from sys_user where user_id = #{userId}