From 683ffec2d7012b06de67918d1fade14c9241345b Mon Sep 17 00:00:00 2001
From: "ryan.xu" <ryan.xu@elitesland.com>
Date: Fri, 25 Apr 2025 14:43:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=8B=E9=87=8F=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E4=BB=A3=E5=8A=9E=E6=8C=89=E7=85=A7=E8=81=8C=E4=BD=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cool/store/enums/UserRoleEnum.java    |  2 +-
 .../store/service/impl/DeskServiceImpl.java   | 27 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
index c263e10ae..c6def22b5 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
@@ -42,7 +42,7 @@ public enum UserRoleEnum {
     XIN_FA_SYS_CUSTOMER(370000000L,"信发系统客服"),
     TENT_PASS_CUSTOMER(380000000L,"营帐通客服"),
     DESIGN_CUSTOMER(390000000L,"设计客服"),
-    CONSTRUCTION_CUSTOMER(400000000L,"施工客服"),
+    CONSTRUCTION_CUSTOMER(400000000L,"立规内勤"),
     BRANCH_OFFICE(1724233283449L,"分部内勤"),
     JOIN_OFFICE(1719278230274L,"加盟内勤"),
     REGION_OFFICE(410000000L,"大区内勤"),
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index 4961098c8..a03b492ff 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -533,23 +533,20 @@ public class DeskServiceImpl implements DeskService {
 
     @Override
     public PageInfo<PreparationCommonPendingVO> measurePendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) {
-        PageInfo<PreparationCommonPendingVO> pageInfo = commonPendingVOPageInfo(pageNum, pageSize, null, ShopSubStageEnum.SHOP_STAGE_8_6,
-                Arrays.asList(SHOP_SUB_STAGE_STATUS_861.getShopSubStageStatus(),SHOP_SUB_STAGE_STATUS_862.getShopSubStageStatus()), Boolean.FALSE);
-        List<PreparationCommonPendingVO> list = pageInfo.getList();
-        if (CollectionUtils.isEmpty(list)) {
-            return pageInfo;
+        List<Long> userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId());
+        List<Integer> subStageStatusList = new ArrayList<>();
+        if (userRoleIds.contains(UserRoleEnum.CONSTRUCTION_CUSTOMER.getCode())) {
+            subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861.getShopSubStageStatus());
         }
-        List<Long> shopIds = list.stream().map(PreparationCommonPendingVO::getShopId).collect(Collectors.toList());
-        Map<Long, List<DeskStageDTO>> deskStageMap = new HashMap<>();
-        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
-        doThing(deskStageMap, subStageList);
-        for (PreparationCommonPendingVO vo : list) {
-            if (deskStageMap.get(vo.getShopId()) != null) {
-                vo.setSubmitTime(deskStageMap.get(vo.getShopId()).get(0).getActualCompleteTime());
-            }
+        if (userRoleIds.contains(UserRoleEnum.MEASURE_OFFICE.getCode())) {
+            subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862.getShopSubStageStatus());
         }
-        pageInfo.setList(list);
-        return pageInfo;
+        Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId());
+        if (isAdmin) {
+            subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861.getShopSubStageStatus());
+            subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_862.getShopSubStageStatus());
+        }
+        return commonPendingVOPageInfo(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_8_6, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE);
     }
 
     /**