From 4526a88f36dc05bad032b9df324882486e8e3812 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 3 Mar 2022 15:55:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E5=A1=AB=E5=86=99=E4=BB=A3=E6=9B=BF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=97=B6=E5=8F=91=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 71 ++++++++++--------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index e2103c140..82a757c67 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -21,6 +21,7 @@ import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.domain.service.DomainUserRelService; import com.jero.modules.log.entity.BussLogEO; import com.jero.modules.log.service.IBussLogEOService; import com.jero.modules.oss.entity.OSSFile; @@ -109,6 +110,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldDateList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); //文件类型字段 List fieldFileList = fieldList.stream().filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + //下拉单选或下拉多选 + List fieldPullList = fieldList.stream() + .filter(e -> FieldTypeEnum.PULL_SINGLE.getValue().equals(e.getFieldShowType()) + || FieldTypeEnum.PULL_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + String mustFields = "id,create_by,create_time,update_by,update_time,sys_org_code"; String mustValues = getMustValues(); //字段 @@ -619,6 +627,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, + private void sendMessageUpdate(Map map, List> dataList, List fieldList, List fieldDateList, @@ -944,42 +958,35 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl listTemp = Arrays.asList(replaceStandardTemp.split(",")); List listNew = list.stream().filter(e -> !listTemp.contains(e)).collect(Collectors.toList()); //向listNew对应的工程师发飞书通知 - LambdaQueryWrapper lambdaQueryWrapperTemp = new LambdaQueryWrapper<>(); - lambdaQueryWrapperTemp.in(BussDocumentLibraryEO::getId,listNew); - List> mapList = this.listMaps(lambdaQueryWrapperTemp); - - for (Map stringObjectMap : mapList) { - userNameListTemp.add((String) stringObjectMap.get("create_by")); - serialNumberList.add((String) stringObjectMap.get("serial_number")); - } - List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameListTemp, ",")); - List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - - String content = "新标准编号已实施，请注意更新替代标准编号:"+StringUtils.join(serialNumberList,",")+"的状态,"+"链接: http://localhost:3000/docManage/library"; - //封装消息的实体类 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, content); - sysAnnouncementService.saveAnnouncement(sysAnnouncement); + replaceStandardSend(listNew); } else if(StringUtils.isBlank(replaceStandardTemp) && StringUtils.isNotBlank(replaceStandard)) { //(2)此种情况为编辑前代替标准没有数据 //向replaceStandard对应的工程师发飞书通知 - LambdaQueryWrapper lambdaQueryWrapperTemp = new LambdaQueryWrapper<>(); - lambdaQueryWrapperTemp.in(BussDocumentLibraryEO::getId,Arrays.asList(replaceStandard.split(","))); - List> mapList = this.listMaps(lambdaQueryWrapperTemp); - for (Map stringObjectMap : mapList) { - userNameListTemp.add((String) stringObjectMap.get("create_by")); - serialNumberList.add((String) stringObjectMap.get("serial_number")); - } - List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameListTemp, ",")); - List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); - String content = "新标准编号已实施，请注意更新替代标准编号:"+StringUtils.join(serialNumberList,",")+"的状态"; - String contentInfo = "新标准编号已实施，请注意更新替代标准编号:"+StringUtils.join(serialNumberList,",")+"的状态,"+"链接: http://localhost:3000/docManage/library"; - //封装消息的实体类 - SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); - sysAnnouncementService.saveAnnouncement(sysAnnouncement); + replaceStandardSend(Arrays.asList(replaceStandard.split(","))); } } } + private void replaceStandardSend(List documentIdList) { + LambdaQueryWrapper lambdaQueryWrapperTemp = new LambdaQueryWrapper<>(); + lambdaQueryWrapperTemp.in(BussDocumentLibraryEO::getId, documentIdList); + List> mapList = this.listMaps(lambdaQueryWrapperTemp); + List userNameListTemp = new ArrayList<>(); + List serialNumberList = new ArrayList<>(); + for (Map stringObjectMap : mapList) { + userNameListTemp.add((String) stringObjectMap.get("create_by")); + serialNumberList.add((String) stringObjectMap.get("serial_number")); + } + List userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameListTemp, ",")); + List userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + String content = "新标准编号已实施，请注意更新替代标准编号:" + StringUtils.join(serialNumberList, ",") + "的状态"; + String contentInfo = "新标准编号已实施，请注意更新替代标准编号:" + StringUtils.join(serialNumberList, ",") + "的状态," + "链接: http://localhost:3000/docManage/library"; + //封装消息的实体类 + SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo); + sysAnnouncementService.saveAnnouncement(sysAnnouncement); + } + + @NotNull private SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); From e40b7cf13d09fdbd392e03c83dd57ee13f0e7f0c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 3 Mar 2022 16:05:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E4=B8=AD?= =?UTF-8?q?=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/controller/SysPermissionController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index 1352ed1ac..9e9a6d8b1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -611,10 +611,10 @@ public class SysPermissionController { } /* update_end author:wuxianquan date:20190908 for: 往菜单信息里添加外链菜单打开方式*/ - if(CutEnum.CN.getValue().equals(cut)){ - meta.put("title", permission.getName()); - }else{ + if(CutEnum.EN.getValue().equals(cut)){ meta.put("title", permission.getMenuEn()); + }else{ + meta.put("title", permission.getName()); } //update-begin--Author:scott Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842