diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index 14aec4667..2d33511d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -106,4 +106,8 @@ public class ProjectRelatedPersonnel implements Serializable { //批量设置传参ids @TableField(exist = false) private String ids; + + // 一级责任领域(统计节点) + @TableField(exist = false) + private String firstLevelDutyTerritory; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 674640af9..ee9069061 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -28,8 +28,10 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysDictMapper; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -108,6 +110,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records) { + + List sysDictItems = this.sysDictItemService.selectItemsAll(); + Map> firstLevelDutyTerritoryMap = this.sysDictItemService.getFirstLevelSysDictItemByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue(),sysDictItems); for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { //法规工程师 List lawEngineerUsers = new ArrayList<>(); @@ -459,6 +467,28 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> firstLevelMap : firstLevelDutyTerritoryMap.entrySet()) { + String firstLevel = firstLevelMap.getKey(); + List dutyTerritoryList = firstLevelMap.getValue(); + if(StringUtils.isEmpty(firstLevel) && CollectionUtils.isEmpty(dutyTerritoryList)){ + continue; + } + + List dutyTerritoryListTemp = dutyTerritoryList.stream().filter(sysDictItem -> { + boolean flag = false; + if (StringUtils.equals(sysDictItem.getItemValue(), dutyTerritory)) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(dutyTerritoryListTemp)){ + projectRelatedPersonnel.setFirstLevelDutyTerritory(firstLevel); + break; + } + } + } } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 712b2e66c..533f02122 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1831,4 +1831,7 @@ module.exports = { proportionWithInTheAreaOfResponsibility:'Proportion within the area of responsibility', contentsearch:'Content Search', masterProject:'Master Project', + deliveryTime:'Delivery Time', + expectedDeliveryTime:'Expected Delivery Time', + changeAuthor:'Change Author', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f7055ac72..e9e2d3a19 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1932,4 +1932,7 @@ module.exports = { proportionWithInTheAreaOfResponsibility:'责任领域内占比', contentsearch:'内容搜索', masterProject:'主项目', + deliveryTime:'交付时间', + expectedDeliveryTime:'预计交付时间', + changeAuthor:'更改作者', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 113b01301..711e22c22 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -12,9 +12,9 @@
- + - +
{{$t('searchContent')}} @@ -23,7 +23,7 @@ v-model="queryParam.searchStr">
- +
{{$t('releaseStatus')}} @@ -40,10 +40,29 @@
+ +
+
+ {{$t('displayPermission')}} +
+ + + + {{ item.name}} + + + +
+
{{$t('reset')}} - {{$t('query')}} + + {{$t('query')}} +
@@ -55,7 +74,7 @@
- + @@ -75,6 +94,8 @@ {{item.createBy}}
+
+ \ No newline at end of file diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue index a6caefcff..00b2ddae9 100644 --- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue +++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue index 63a565a4d..5e7b3c5ec 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/statistics.vue @@ -1,108 +1,116 @@