合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!81

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<ProjectLawsInventoryEOMapper, ProjectLawsInventoryEO> implements IProjectLawsInventoryEOService {
 
 	@Autowired
@@ -1727,8 +1729,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					//法规清单的责任领域
 					String dutyTerritory = projectLawsInventoryEO.getDutyTerritory();
 					if(StringUtils.isNotBlank(dutyTerritory)){
-						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
+						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = new ArrayList<>();
-								.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
+						for (String s : dutyTerritory.split(",")) {
+							List<ProjectRelatedPersonnel> projectRelatedPersonnelListTemp  = projectRelatedPersonnels.stream()
+									.filter(e -> s.equals(e.getDutyTerritory())).collect(Collectors.toList());
+							if(projectRelatedPersonnelListTemp.size() != 0){
+								projectRelatedPersonnelList.addAll(projectRelatedPersonnelListTemp);
+							}
+						}
+//						List<ProjectRelatedPersonnel> projectRelatedPersonnelList = projectRelatedPersonnels.stream()
+//								.filter(e -> dutyTerritory.contains(e.getDutyTerritory())).collect(Collectors.toList());
 
 						List<String> lawEngineerList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getLawEngineer).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());
 						List<String> engineeringInterfacePersonList = projectRelatedPersonnelList.stream().map(ProjectRelatedPersonnel::getEngineeringInterfacePerson).distinct().collect(Collectors.toList()).stream().filter(e->StringUtils.isNotBlank(e)).collect(Collectors.toList());

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -21,7 +21,8 @@
             <a-icon type="reload"/>
             {{$t('UpdateLog')}}
           </div>
-          <div @click="DocumentSplitting" v-has="'bussLog:page'" class="operator-text-text" :title="$t('DocumentSplitting')">
+          <div @click="DocumentSplitting" v-has="'bussLog:page'" class="operator-text-text"
+               :title="$t('DocumentSplitting')">
             <a-icon type="codepen"/>
             {{$t('DocumentSplitting')}}
           </div>
@@ -47,7 +48,8 @@
                 {{val}}
               </div>
               <div class="content-text" v-if="val == $t('essentialInformation')">
-                <div class="text-field" v-for="(ol,index1) in item[val]">
+                <div class="text-field" :class="{'text-content-button-one':ol.field_show_type == 8 ? true :false}"
+                     v-for="(ol,index1) in item[val]">
                   <span class="text-field-left" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
                   <span class="text-field-right text-field-right-color" v-if="ol.urlClick" @click="urlClick(ol)"
                         :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
@@ -135,7 +137,8 @@
                 </table>
               </div>
               <div class="content-text" v-else>
-                <div class="text-field" v-for="(ol,index1) in item[val]">
+                <div class="text-field" :class="{'text-content-button-one':ol.field_show_type == 8 ? true :false}"
+                     v-for="(ol,index1) in item[val]">
                   <span class="text-field-left" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
                   <span class="text-field-right text-field-right-color" v-if="ol.urlClick" @click="urlClick(ol)"
                         :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
@@ -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;
+          }
+        }
       }
     }
   }