首页查询详情图片数组bug修改

wangqian
1 parent 8502855c
Showing 3 changed files with 21 additions and 9 deletions
urbanops-module-garden/src/main/resources/mapper/homepage/HomepageSummaryMapper.xml
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/maininfo/AppMainInfoController.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/maininfo/MainInfoServiceImpl.java
@@ -597,7 +597,7 @@
             SUM(CASE WHEN w.status = 2 THEN 1 ELSE 0 END) AS finish,
             SUM(CASE WHEN w.status != 2 THEN 1 ELSE 0 END) AS ongoing
         FROM system_dept d
-        LEFT JOIN workorder_main_info w ON w.worker_company_id = d.id
+        LEFT JOIN workorder_main_info w ON w.worker_company_id = d.id and w.deleted = 0
         WHERE  w.order_type !='Q'
             <!-- queryType = 1 时，才拼接 督察工单（IWO开头）条件 -->
             <if test='queryType != null and queryType == "1"'>
@@ -37,6 +37,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import static com.zteits.urbanops.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
@@ -69,13 +70,24 @@ public class AppMainInfoController {
             List<AttachmentDO> attachmentDOList = attachmentService.getAttachmentByOrderNo(Arrays.asList(mainInfo.getOrderNo()));
             if (!CollectionUtils.isEmpty(attachmentDOList)) {
                 attachmentMap = attachmentDOList.stream()
-                .collect(Collectors.groupingBy(
-                        AttachmentDO::getBusiType,
-                        Collectors.mapping(
-                                AttachmentDO::getFileNames,
-                                Collectors.toList()
-                        )
-                ));
+                    .flatMap(att -> {
+                        // 1. 取出逗号分隔的字符串
+                        String fileNames = att.getFileNames();
+                        if (fileNames == null || fileNames.isEmpty()) {
+                            return Stream.empty();
+                        }
+                        // 2. 按逗号切割，去掉空字符串，转成 Stream
+                        return Arrays.stream(fileNames.split(","))
+                                     .map(String::trim)
+                                     .filter(s -> !s.isEmpty())
+                                     // 把 业务类型 和 文件名 绑定一起返回
+                                     .map(fileName -> new AbstractMap.SimpleEntry<>(att.getBusiType(), fileName));
+                    })
+                    // 3. 按业务类型分组，收集成 List<String>
+                    .collect(Collectors.groupingBy(
+                        Map.Entry::getKey,
+                        Collectors.mapping(Map.Entry::getValue, Collectors.toList())
+                    ));
             }
         }
@@ -118,7 +118,7 @@ public class MainInfoServiceImpl implements MainInfoService {
         if ("1".equals(pageReqVO.getQueryType())) {
             //全域督察员查询自己发起的工单
             List<Long> userIds = roleApi.getUserIdsByRoleCode(CommonConstants.INSPECTOR_ROLE_KEY);
-            if (userIds.contains(getLoginUserId())) {
+            if (!userIds.contains(getLoginUserId())) {
                 pageReqVO.setUserId(getLoginUserId());
                 pageReqVO.setWorkerCompanyId(null);
             }