diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 58ce204a7..bbe2428c9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -534,8 +534,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl !"serial_number".equals(e.getDbFieldName()) && !"title".equals(e.getDbFieldName()) - && !"title_en".equals(e.getDbFieldName()) - && !"state".equals(e.getDbFieldName())) + && !"title_en".equals(e.getDbFieldName())) .collect(Collectors.toList()); if (fieldList.size() != 0) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 936f46f88..d33b2e822 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -147,12 +147,27 @@ public class ProjectLibraryBase implements Comparable { @Override public int compareTo(ProjectLibraryBase o) { - return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序 -// return o.id-this.id;//降序 + if (!this.getProjectName().equals(o.getProjectName())) { + return this.getProjectName().compareTo(o.getProjectName());//升序 + } + if (!this.getYearName().equals(o.getYearName())) { + if (this.getYearName().length() != o.getYearName().length()) { + return this.getYearName().length() - o.getYearName().length(); + } else { + return this.getYearName().compareTo(o.getYearName());//升序 + } + } + if (!this.getTargetMarket().equals(o.getTargetMarket())) { + return this.getTargetMarket().compareTo(o.getTargetMarket());//升序 + } + if (!this.getProjectVersion().equals(o.getProjectVersion())) { + return Integer.valueOf(this.projectVersion) - Integer.valueOf(o.projectVersion);//升序 + } + return 0; } - public String getShowName(){ - return projectName+yearName+targetMarket+projectVersion; + public String getShowName() { + return projectName + " " + yearName + "-" + targetMarket + "-" + projectVersion; } @Override diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index a63cbbc76..898f2ebfc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -117,7 +117,6 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService } } - List projectLibraryBaseLinkedList = new LinkedList<>(); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { if(StringUtils.isBlank(libraryBase.getParentId())){ @@ -131,13 +130,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp); } } - projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName)); + Collections.sort(projectLibraryBaseList); List dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region"); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { targetMarket(projectLibraryBase, dictItemList, libraryBase); Map mapList = new HashMap<>(); - List> collect = new ArrayList<>(); + List> collect; if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){ collect = listNew.stream().filter(e -> libraryBase.getId().equals(e.get(0).getProjectId())).collect(Collectors.toList()); }else{ @@ -147,8 +146,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService if(collect.size() != 0){ index ++; mapList.put("index",index); - mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+libraryBase.getProjectVersion()); + mapList.put("projectName",libraryBase.getShowName()); mapList.put("data",collect); + mapList.put("projectInfo",libraryBase); result.add(mapList); } } @@ -215,9 +215,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService lambdaQueryWrapper.in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEOIdAll); projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper); } - - - projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName)); + Collections.sort(projectLibraryBaseList); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { //处理目标市场 targetMarket(projectLibraryBase, dictItemList, libraryBase); @@ -234,7 +232,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectVersion = "00"; } Map map = new HashMap<>(); - map.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+projectVersion);//项目名称 + map.put("projectName",libraryBase.getShowName());//项目名称 map.put("targetMarket",libraryBase.getTargetMarket());//目标市场 //1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据 diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b29e0dee6..e2e1d742e 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1384,4 +1384,5 @@ module.exports = { beforedatein:'In... Before date (inclusive)', inRecentMonthsin6:'Within 6 months (implemented)', batchUpdateDeadline:'Batch update deadline', + timeInterval:'Time Interval', } \ 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 a9f9a9b68..43af8d4db 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1485,4 +1485,5 @@ module.exports = { beforedatein:'在...日期之前（包含）', inRecentMonthsin6:'近6个月内（已实施）', batchUpdateDeadline:'批量更新截止时间', + timeInterval:'时间区间', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue index bd3307777..6eb8a71be 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue @@ -31,17 +31,17 @@ v-model="queryParam.title"> - -
-
- {{$t('status')}} -
- -
- + + + + + + + + + + + diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue index 7891cc13a..3f5e7e577 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue @@ -3,41 +3,129 @@
- {{this.$t('regulatoryCertificationTaskPlan')}} + {{ this.$t('regulatoryCertificationTaskPlan') }}
- - -
-
- {{$t('determine')}} -
-
- - +
+ + + +
+
+ {{ $t('entryName') }} +
+ +
+ + +
+
+ {{ $t('targetMarket') }} +
+ +
+ + +
+
+ {{ $t('projectStatus') }} +
+ +
+ + +
+
+ {{ $t('timeInterval') }} +
+ +
+
+ {{ $t('determine') }} +
+
+ +
+ + +
+
+ {{ $t('brand') }} +
+ +
+ + + + {{ $t('query') }} + {{ $t('reset') }} + + + + +
+ + + + + + + + + + + + + + + + + +
-
{{item}}
+
{{ item }}
-
- {{item.projectName}} + + + {{ item.projectName + }} +
@@ -47,12 +135,13 @@
-
{{val.name}}
-
{{val.name}} +
{{ val.name }} +
+
{{ val.name }}
- {{handlingTime}} + {{ handlingTime }}
- {{this.$t('dataLoading')}} + {{ this.$t('dataLoading') }}
@@ -81,497 +170,547 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 41b6745b5..fe8ef3d12 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -6,7 +6,7 @@
- {{$t('entryName')}} + {{ $t('entryName') }}
@@ -15,37 +15,38 @@
- {{$t('targetMarket')}} + {{ $t('targetMarket') }}
+ :triggerChange="false" :dictCode="'region'" />
- {{$t('brand')}} + {{ $t('brand') }}
+ :triggerChange="false" :dictCode="'brand'" />
- {{$t('query')}} - {{$t('reset')}} + {{ $t('query') }} + {{ $t('reset') }}
- {{$t('regulatoryCertificationTaskPlan')}} - {{$t('fullScreenView')}} + {{ $t('regulatoryCertificationTaskPlan') }} + {{ $t('fullScreenView') }}
- {{$t('determine')}} + {{ $t('determine') }}
@@ -68,13 +69,21 @@
-
{{item}}
+
{{ item }}
-
- {{item.projectName}} + + + {{ item.projectName }} +
@@ -83,12 +92,12 @@
-
{{val.name}}
-
{{val.name}} +
{{ val.name }}
+
{{ val.name }}
@@ -104,17 +113,17 @@
- {{handlingTime}} + {{ handlingTime }}
- {{this.$t('dataLoading')}} + {{ this.$t('dataLoading') }}
- {{$t('projectStatusAndProgress')}} - {{$t('fullScreenView')}} + {{ $t('projectStatusAndProgress') }} + {{ $t('fullScreenView') }}
- {{this.$t('CurrentStatusOfTheProject')}}
- {{'('+$t('red')+'/'+$t('yellow')+'/'+$t('green')+'/'+$t('blue')+')'}} + {{ this.$t('CurrentStatusOfTheProject') }}
+ {{ '(' + $t('red') + '/' + $t('yellow') + '/' + $t('green') + '/' + $t('blue') + ')' }} - {{this.$t('CertificationProgress')}}
- {{'('+$t('notInvolved')+'/'+$t('toBeStarted')+'/'+$t('inProgress')+'/'+$t('experimentFailed')+'/'+$t('experimentPassed')+')'}} + {{ this.$t('CertificationProgress') }}
+ {{ '(' + $t('notInvolved') + '/' + $t('toBeStarted') + '/' + $t('inProgress') + '/' + $t('experimentFailed') + '/' + $t('experimentPassed') + ')' + }} - {{this.$t('listConfirmation')}}
- {{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}} + {{ this.$t('listConfirmation') }}
+ {{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')' + }} - {{this.$t('taskAffirm')}}
- {{'('+$t('notLaunch')+'/'+$t('toBeConfirmed')+'/'+$t('accept')+'/'+$t('refuse')+')'}} + {{ this.$t('taskAffirm') }}
+ {{ '(' + $t('notLaunch') + '/' + $t('toBeConfirmed') + '/' + $t('accept') + '/' + $t('refuse') + ')' + }} - {{this.$t('designComplianceReview')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('designComplianceReview') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }} - {{this.$t('preHomeConfirmation')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('preHomeConfirmation') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }} - {{this.$t('verificationComplianceReview')}}
- {{'('+$t('toBeConfirmed')+'/'+$t('accord')+'/'+$t('nonConformity')+'/'+$t('Tracked')+'/'+$t('notInvolved')+'/'+$t('taskTermination')+')'}} + {{ this.$t('verificationComplianceReview') }}
+ {{ '(' + $t('toBeConfirmed') + '/' + $t('accord') + '/' + $t('nonConformity') + '/' + $t('Tracked') + '/' + $t('notInvolved') + '/' + $t('taskTermination') + ')' + }}
@@ -161,589 +176,609 @@ \ No newline at end of file