1.门户首页全局搜索加上会议室搜索结果

2.能力使用申请流程到资源所属部门审批节点时去除分配默认的审批人为大数据局审批员时自动通过

renren-admin/src/main/java/io/renren/modules/processForm/listener/CorrectionListener.java

@@ -207,6 +207,7 @@ public class CorrectionListener implements TaskListener, ExecutionListener, Acti
         } else {
             logger.error("未查到该部门对应的 {}", roleName);
             taskService.setAssignee(delegateTask.getId(), defaultAssigneeRoleId);
+            taskService.setVariable(delegateTask.getId(), "allowEntrust", Boolean.TRUE); // 允许被委托
             assignee = defaultAssigneeRoleId;
         }
         mpComplete(abilityApplicationDTO, delegateTask, assignee);

renren-admin/src/main/java/io/renren/modules/processForm/listener/v3/CorrectionListenerV3.java

@@ -236,15 +236,15 @@ public class CorrectionListenerV3 implements TaskListener, ExecutionListener, Ac
 
         List<HistoricActivityInstance> historicActivityInstanceList = historyService.createHistoricActivityInstanceQuery().processInstanceId(delegateTask.getProcessInstanceId())
                 .activityType("userTask").unfinished().orderByHistoricActivityInstanceEndTime().desc().list();
-        if (!historicActivityInstanceList.isEmpty() && historicActivityInstanceList.get(0).getAssignee().equals(assignee)) {
+        //if (!historicActivityInstanceList.isEmpty() && historicActivityInstanceList.get(0).getAssignee().equals(assignee)) {
-            taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人重复，默认通过");
+        //    taskService.addComment(delegateTask.getId(), delegateTask.getProcessInstanceId(), "审批人重复，默认通过");
-            taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE);
+        //    taskService.setVariable(delegateTask.getId(), ActTaskService.Task_HANDLE_STATE, ActTaskService.Task_HANDLE_STATE_AGREE);
-            taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE);
+        //    taskService.setVariable(delegateTask.getId(), "backToFirst", Boolean.FALSE);
-            taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId());
+        //    taskService.setVariable(delegateTask.getId(), "autoApply", delegateTask.getId());
-            taskService.complete(delegateTask.getId(), delegateTask.getVariables());
+        //    taskService.complete(delegateTask.getId(), delegateTask.getVariables());
-            sysNoticeService.updateApplyStateById(delegateTask.getProcessInstanceId(), 1);
+        //    sysNoticeService.updateApplyStateById(delegateTask.getProcessInstanceId(), 1);
-            return;
+        //    return;
-        }
+        //}
 
         List<TAbilityApplicationDTO> dtoList = delegateTask.getVariable("tAbilityApplicationDTOList", List.class);
         Optional<TAbilityApplicationDTO> tAbilityApplicationDTO = dtoList.stream().filter(index -> {

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -16,6 +16,7 @@ import io.renren.common.domain.Tsingtao_xhaProperties;
 import io.renren.common.page.PageData;
 import io.renren.common.service.impl.CrudServiceImpl;
 import io.renren.common.utils.DateUtils;
+import io.renren.modules.meeting.dao.TMeetingroomMapper;
 import io.renren.modules.monitor.dto.CameraChannelDto1;
 import io.renren.modules.monitor.entity.CameraChannel;
 import io.renren.modules.monitor.mapper.CameraChannelMapper;
@@ -66,6 +67,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -186,6 +188,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     @Value("${census.type}")
     private String[] censusTypes; // 需要进行统计的资源类型
 
+    @Resource
+    private TMeetingroomMapper tMeetingroomMapper;
+
+
     @Override
     public QueryWrapper<ResourceEntity> getWrapper(Map<String, Object> params) {
         QueryWrapper<ResourceEntity> wrapper = new QueryWrapper<>();
@@ -1969,11 +1975,10 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
     public Object getCountByFuzzyQuery(String keyWorld) {
         ArrayList<Map> resultList = new ArrayList<>();
         CompletableFuture<Void> DBresourceCount = CompletableFuture.runAsync(() -> resultList.addAll(resourceDao.selectTypeCountByName(keyWorld)));
-
+        final Integer[] meetCountNew = new Integer[1];
         switch (Constant.ProjectPlace.getByFlag(projectPlace)) {
-            case TSINGTAO_XHA:
-                break;
             case TSINGTAO: {
+
                 CompletableFuture<Void> dataResourceCount = CompletableFuture.runAsync(() -> { //数据资源
                     //青岛市局数据资源
                     TsingtaoDataResourceService tsingtaoDataResourceService = new TsingtaoDataResourceService();
@@ -1999,8 +2004,12 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                     });
 
                 }, executor);
+                //统计增加会议室搜索结果
+                CompletableFuture<Void> meetingRoomCount = CompletableFuture.runAsync(() -> { //会议室
+                    meetCountNew[0] = tMeetingroomMapper.selectByName(keyWorld).size();
+                }, executor);
 
-                CompletableFuture<Void> all = CompletableFuture.allOf(DBresourceCount, dataResourceCount, infrastructureCount);
+                CompletableFuture<Void> all = CompletableFuture.allOf(DBresourceCount, dataResourceCount, infrastructureCount, meetingRoomCount);
                 all.join();
 
             }
@@ -2010,7 +2019,13 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         }
         //未查到的类型返回数量0
         List<String> temp = new ArrayList<>();
-        resultList.forEach(map -> temp.add(map.get("type").toString()));
+        resultList.forEach(map -> {
+            temp.add(map.get("type").toString());
+            if ("基础设施".equals(map.get("type").toString())) {
+                int num = meetCountNew[0] + Integer.parseInt(map.get("count").toString());
+                map.replace("count", num);
+            }
+        });
         Arrays.stream(censusTypes).filter(index -> !temp.contains(index)).forEach(index -> {
             Map<String, Object> nullMap = new HashMap<String, Object>() {
                 {