diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 361b94422..4affa4edb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -94,6 +94,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -119,6 +120,7 @@ import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServic * @Version: V1.0 */ @Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl implements IProjectLawsInventoryEOService { @Autowired @@ -1727,8 +1729,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnelList = projectRelatedPersonnels.stream() - .filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList()); + List projectRelatedPersonnelList = new ArrayList<>(); + for (String s : dutyTerritory.split(",")) { + List projectRelatedPersonnelListTemp = projectRelatedPersonnels.stream() + .filter(e -> s.equals(e.getDutyTerritory())).collect(Collectors.toList()); + if(projectRelatedPersonnelListTemp.size() != 0){ + projectRelatedPersonnelList.addAll(projectRelatedPersonnelListTemp); + } + } +// List projectRelatedPersonnelList = projectRelatedPersonnels.stream() +// .filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList()); List lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList()); List engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList()); diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 750f5e900..9235bdc88 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -21,7 +21,8 @@ {{$t('UpdateLog')}} -
+
{{$t('DocumentSplitting')}}
@@ -47,7 +48,8 @@ {{val}}
-
+
{{ol.db_field_txt}} {{ol.value ? ol.value : '--'}} @@ -135,7 +137,8 @@
-
+
{{ol.db_field_txt}} {{ol.value ? ol.value : '--'}} @@ -402,7 +405,7 @@ let index2 = fileName.length let fileSuffix = fileName.substring(index1, index2) if (fileSuffix == '.pdf') { - window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username)) } else if (fileSuffix == '.docx') { let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) window.open(url, '_blank') @@ -414,7 +417,7 @@ } }, download(item) { - downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id ,userName:this.userInfo().username}) + downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) }, UpdateLog() { this.visible = true @@ -591,6 +594,33 @@ font-weight: 400; } } + + .text-content-button-one { + width: 100%; + + .text-field-left { + width: 124px; + display: inline-block; + font-size: 14px; + font-weight: 400; + color: #6F7385; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + margin-right: 24px; + } + + .text-field-right { + width: calc(100% - 200px); + display: inline-block; + font-size: 16px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + color: #040B29; + font-weight: 400; + } + } } } }