From 8512db8baaa1436a4594016e5ccbb7b52e9ec5bf Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 23 Feb 2022 17:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=96=E7=BC=96=E8=BE=91=E6=97=B6=E5=A1=AB=E5=86=99=E4=BB=A3?= =?UTF-8?q?=E6=9B=BF=E6=A0=87=E5=87=86=E5=90=91=E9=A3=9E=E4=B9=A6=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 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 3a8507e4d..cff4b6f2e 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 @@ -28,6 +28,7 @@ import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -305,7 +306,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { + //代替标准不为空,需要向被替代标准的法规工程师发送站内通知和飞书信息,提醒内容:"新标准编号"已实施,请注意更新“替代标准编号”状态 + map.remove("cut"); //字段属性 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); @@ -421,6 +424,32 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map) { + //处理修改代替标准,发送通知 + String id = (String) map.get("id"); + //修改时前端传参 + String replaceStandard = (String) map.get("replace_standard"); + //通过id查询数据 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BussDocumentLibraryEO::getId, id); + List> dataList = bussDocumentLibraryEOMapper.selectMaps(queryWrapper); + if(dataList.size() != 0){ + //代替标准(根据id查询出来的) + String replaceStandardTemp = (String) dataList.get(0).get("replace_standard"); + + if(StringUtils.isNotBlank(replaceStandardTemp) && !replaceStandard.equals(replaceStandardTemp)){ + //需要向被替代标准的法规工程师发送站内通知和飞书信息,提醒内容:"新标准编号"已实施,请注意更新“替代标准编号”状态 + List list = Arrays.asList(replaceStandard.split(",")); + List listTemp = Arrays.asList(replaceStandardTemp.split(",")); + List listNew = list.stream().filter(e -> !listTemp.contains(e)).collect(Collectors.toList()); + //向listNew对应的工程师发飞书通知 + + }else{ + //向replaceStandard对应的工程师发飞书通知 + + } + } + + //字段属性 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //时间类型字段 @@ -546,9 +575,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl entry : record1.entrySet()) { if("state".equals(entry.getKey())){ //状态数据字典 - List stateList = sysDictItems.stream().filter(e -> e.getDictCode().equals("state")).collect(Collectors.toList()); + List stateList = sysDictItems.stream() + .filter(e -> StringUtils.isNotBlank(e.getDictCode()) && e.getDictCode().equals("state")) + .collect(Collectors.toList()); List state = stateList.stream().filter(e -> e.getItemValue().equals(entry.getValue())).collect(Collectors.toList()); - entry.setValue(state.get(0).getItemText()); + if(state.size() != 0){ + entry.setValue(state.get(0).getItemText()); + } } } }