WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug53177订阅领域+虚拟清单消息修改

Browse Source
This commit is contained in:
xiejunyu
2022-06-01 15:48:31 +08:00
parent 25d27203d8
commit 5644dd4d15
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+1 -1
View File
@@ -2097,7 +2097,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
sendWebsocket(idTemp, contentInfo); sendWebsocket(idTemp, contentInfo);
//飞书 //飞书
try { try {
iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), content, MessageTypeEnum.PUSH.getName(), hrefTemp); iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfo, MessageTypeEnum.PUSH.getName(), hrefTemp);
} catch (IOException e) { } catch (IOException e) {
log.error("飞书消息推送失败"); log.error("飞书消息推送失败");
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+1 -1
View File
@@ -1229,7 +1229,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
//认证类型 //认证类型
if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
List<String> list = Arrays.asList(infoDiff.get("attestationType").split(",")); List<String> list = Arrays.asList(infoDiff.get("attestationType").split("\\|"));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
if (StringUtils.isBlank(contentLog)) { if (StringUtils.isBlank(contentLog)) {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class ListDiff <T> {
if(f.getName().contains("erritory") || f.getName().contains("emplate") if(f.getName().contains("erritory") || f.getName().contains("emplate")
|| f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region") || f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region")
|| f.getName().equals("applyScope") || f.getName().contains("DeliverableType") || f.getName().equals("applyScope") || f.getName().contains("DeliverableType")
|| f.getName().equals("attestationType")
){ ){
result.put(f.getName(), v1String.append("|").append(v2String).toString()); result.put(f.getName(), v1String.append("|").append(v2String).toString());
}else { }else {
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+10 -5
View File
@@ -1815,9 +1815,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//认证类型 //认证类型
if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())) { if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())) {
List<SysDictItem> attestationType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue()); List<SysDictItem> attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getValue());
String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); List<String> attestationTypeList = Arrays.asList(projectLawsInventoryEO.getAttestationType().split(","));
projectLawsInventoryEO.setAttestationType(attestationTypeName); StringBuilder attestationTypeBuilder = new StringBuilder();
for (String midAttestationType : attestationTypeList) {
String dutyTerritoryName = attestationType.stream().filter(e -> e.getItemValue().equals(midAttestationType)).map(f -> f.getItemText()).collect(Collectors.joining(","));
attestationTypeBuilder.append(dutyTerritoryName).append(",");
}
projectLawsInventoryEO.setAttestationType(attestationTypeBuilder.substring(0, attestationTypeBuilder.toString().length() - 1));
} else { } else {
projectLawsInventoryEO.setAttestationType("空"); projectLawsInventoryEO.setAttestationType("空");
} }
@@ -4401,12 +4406,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
//认证类型 //认证类型
if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) {
List<String> list = Arrays.asList(infoDiff.get("attestationType").split(",")); List<String> list = Arrays.asList(infoDiff.get("attestationType").split("\\|"));
String infoDiffOld = list.get(0); String infoDiffOld = list.get(0);
String infoDiffNew = list.get(1); String infoDiffNew = list.get(1);
contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ",";
List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split(",")); List<String> listEn = Arrays.asList(infoDiffEn.get("attestationType").split("\\|"));
String infoDiffOldEn = listEn.get(0); String infoDiffOldEn = listEn.get(0);
String infoDiffNewEn = listEn.get(1); String infoDiffNewEn = listEn.get(1);
enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ",";