修改UAT问题 项目状态看板排序和搜索跳转等

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<BussDocumentLi
         fieldList = fieldList.stream()
                 .filter(e -> !"serial_number".equals(e.getDbFieldName())
                         && !"title".equals(e.getDbFieldName())
-                        && !"title_en".equals(e.getDbFieldName())
+                        && !"title_en".equals(e.getDbFieldName()))
-                        && !"state".equals(e.getDbFieldName()))
                 .collect(Collectors.toList());
 
         if (fieldList.size() != 0) {

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java

@@ -147,12 +147,27 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
 
     @Override
     public int compareTo(ProjectLibraryBase o) {
-        return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序
+        if (!this.getProjectName().equals(o.getProjectName())) {
-//        return o.id-this.id;//降序
+            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(){
+    public String getShowName() {
-        return projectName+yearName+targetMarket+projectVersion;
+        return projectName + " " + yearName + "-" + targetMarket + "-" + projectVersion;
     }
 
     @Override

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<ProjectLibraryBase> 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<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
                 targetMarket(projectLibraryBase, dictItemList, libraryBase);
                 Map<String,Object> mapList = new HashMap<>();
-                List<List<TimeNodeVO>> collect = new ArrayList<>();
+                List<List<TimeNodeVO>> 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);
             }
-
+            Collections.sort(projectLibraryBaseList);
-
-            projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
                 //处理目标市场
                 targetMarket(projectLibraryBase, dictItemList, libraryBase);
@@ -234,7 +232,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     projectVersion = "00";
                 }
                 Map<String,Object> 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视角下的数据

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',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1485,4 +1485,5 @@ module.exports = {
   beforedatein:'在...日期之前（包含）',
   inRecentMonthsin6:'近6个月内（已实施）',
   batchUpdateDeadline:'批量更新截止时间',
+  timeInterval:'时间区间',
 }

jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue

@@ -31,17 +31,17 @@
                          v-model="queryParam.title"></a-input>
               </div>
             </a-col>
-            <a-col :md="12" :sm="8">
+<!--            <a-col :md="12" :sm="8">-->
-              <div class="box-title-text">
+<!--              <div class="box-title-text">-->
-                <div class="title-text" :title="$t('status')">
+<!--                <div class="title-text" :title="$t('status')">-->
-                  <span>{{$t('status')}}</span>
+<!--                  <span>{{$t('status')}}</span>-->
-                </div>
+<!--                </div>-->
-                <j-dict-select-tag class="box-input" v-model="queryParam.state"
+<!--                <j-dict-select-tag class="box-input" v-model="queryParam.state"-->
-                                   :placeholder="$t('PleaseSelect')+$t('status')"
+<!--                                   :placeholder="$t('PleaseSelect')+$t('status')"-->
-                                   :type="'select'"
+<!--                                   :type="'select'"-->
-                                   :triggerChange="false" :dictCode="'state'"/>
+<!--                                   :triggerChange="false" :dictCode="'state'"/>-->
-              </div>
+<!--              </div>-->
-            </a-col>
+<!--            </a-col>-->
             </template>
             <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">