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

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
zyx.net
2022-08-26 11:35:17 +08:00
parent 72cc7b23f1 99a266c77f
commit e44b0b61db
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+6 -2
View File
@@ -387,8 +387,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.CN.getValue()); projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.CN.getValue());
projectLawsInventoryLogEOService.updateLog(enContentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.EN.getValue()); projectLawsInventoryLogEOService.updateLog(enContentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.EN.getValue());
} }
//项目任务清单数据初始化。
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); if(CollectionUtils.isNotEmpty(projectTaskInventoryEOList)){
//项目任务清单数据初始化。
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
}
} }
/** /**
@@ -4827,6 +4830,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", ""); String projectTaskInventoryId = UUID.randomUUID().toString().replace("-", "");
projectTaskInventoryEO.setId(projectTaskInventoryId); projectTaskInventoryEO.setId(projectTaskInventoryId);
projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId()); projectTaskInventoryEO.setProjectLawsInventoryId(projectLawsInventoryEO.getId());
projectLawsInventoryEO.setStandId(projectLawsInventoryEO.getStandId());
projectTaskInventoryEOList.add(projectTaskInventoryEO); projectTaskInventoryEOList.add(projectTaskInventoryEO);
} }
this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList);
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+3 -3
View File
@@ -3,9 +3,9 @@
<div class="doc-detail-wrap"> <div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0"> <div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title"> <div class="doc-detail-title">
<span style="line-height: 66px;display: inline-block;float: left"> <!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<a-icon type="arrow-left" style="margin-right: 6px;"/> <!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
</span> <!-- </span>-->
{{$t('managePublishing')}} {{$t('managePublishing')}}
</div> </div>
</div> </div>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue
+3 -3
View File
@@ -3,9 +3,9 @@
<div class="doc-detail-wrap"> <div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0"> <div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title"> <div class="doc-detail-title">
<span style="line-height: 66px;display: inline-block;float: left"> <!-- <span style="line-height: 66px;display: inline-block;float: left">-->
<a-icon type="arrow-left" style="margin-right: 6px;"/> <!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
</span> <!-- </span>-->
{{header_text}} {{header_text}}
</div> </div>
</div> </div>
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+3 -3
View File
@@ -3,9 +3,9 @@
<div class="doc-detail-wrap"> <div class="doc-detail-wrap">
<div class="doc-detail-header" style="position: fixed;top: 0"> <div class="doc-detail-header" style="position: fixed;top: 0">
<div class="doc-detail-title"> <div class="doc-detail-title">
<span style="line-height: 66px;display: inline-block;float: left" @click="backClick"> <!-- <span style="line-height: 66px;display: inline-block;float: left" @click="backClick">-->
<a-icon type="arrow-left" style="margin-right: 6px;"/> <!-- <a-icon type="arrow-left" style="margin-right: 6px;"/>-->
</span> <!-- </span>-->
{{$t('managePublishing')}} {{$t('managePublishing')}}
</div> </div>
</div> </div>