From 2d3f1ecd82f2df39470a7f1b9dafc9b85dfb6a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 May 2025 15:02:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E8=B4=A2=E5=8A=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/ShopStageInfoDAO.java | 4 +-- .../store/mapper/ShopStageInfoMapper.java | 4 ++- .../resources/mapper/ShopStageInfoMapper.xml | 8 +++++ .../store/service/impl/DeskServiceImpl.java | 32 ++++++++++++++++--- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 5db18dbcb..2cc239255 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -337,8 +337,8 @@ public class ShopStageInfoDAO { public List getSpecialShopStageInfo(List shopIds, Integer shopSubStage, List shopSubStageStatusList, String investmentUserId, - List authRegionIds) { - return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds); + List authRegionIds,Boolean ownShopFlag) { + return shopStageInfoMapper.getSpecialShopStageInfo(shopIds, shopSubStage, shopSubStageStatusList, investmentUserId, authRegionIds,ownShopFlag); } /** diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index c19f2db5a..56887b60c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -146,7 +146,9 @@ public interface ShopStageInfoMapper extends Mapper { List getSpecialShopStageInfo(@Param("shopIds") List shopIds, @Param("shopSubStage") Integer shopSubStage, @Param("shopSubStageStatusList") List shopSubStageStatusList, - @Param("investmentUserId") String investmentUserId, @Param("authRegionIds") List authRegionIds); + @Param("investmentUserId") String investmentUserId, + @Param("authRegionIds") List authRegionIds, + @Param("ownShopFlag") Boolean ownShopFlag); List getSubStageList(@Param("shopIds") List shopIds,@Param("shopSubStage") Integer shopSubStage); List getSubStages(@Param("shopIds") List shopIds,@Param("shopSubStage") Integer shopSubStage); diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 5754d3559..daa263626 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -331,6 +331,14 @@ #{regionId} + + + si.join_mode = 3 + + + si.join_mode != 3 + + order by a.update_time desc 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 40f4f2904..a685349f2 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 @@ -558,11 +558,20 @@ public class DeskServiceImpl implements DeskService { @Override public PageInfo buildInformationPendingList(Integer pageNum, Integer pageSize, LoginUserInfo user) { List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); + //如果不是财务角色或者即是财务又是自有店财务 则不需要标识 + Boolean ownShopFlag = null; + if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())&&userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())){ + ownShopFlag = null; + }else if(userRoleIds.contains(UserRoleEnum.FINANCE.getCode())){ + ownShopFlag = Boolean.FALSE; + }else if (userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())){ + ownShopFlag = Boolean.TRUE; + } List subStageStatusList = new ArrayList<>(); if (userRoleIds.contains(UserRoleEnum.LOGISTICS.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); } - if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())) { + if (userRoleIds.contains(UserRoleEnum.FINANCE.getCode())||userRoleIds.contains(UserRoleEnum.OWN_SHOP_OFFICE.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus()); } if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) { @@ -582,7 +591,7 @@ public class DeskServiceImpl implements DeskService { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_155.getShopSubStageStatus()); } - return commonPendingVOPageInfo(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE); + return commonPendingVOPage(pageNum, pageSize, isAdmin ? null : user, ShopSubStageEnum.SHOP_STAGE_15, subStageStatusList, isAdmin ? Boolean.FALSE : Boolean.TRUE,ownShopFlag); } @Override @@ -635,6 +644,21 @@ public class DeskServiceImpl implements DeskService { return new PageInfo<>(); } + + /** + * 通用查询 + * @param pageNum + * @param pageSize + * @param user + * @param shopSubStageEnum + * @param subStageStatusList + * @param filterFlag + * @return + */ + private PageInfo commonPendingVOPageInfo(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List subStageStatusList, Boolean filterFlag){ + return this.commonPendingVOPage(pageNum,pageSize,user,shopSubStageEnum,subStageStatusList,filterFlag,null); + } + /** * 通用查询 * @@ -645,7 +669,7 @@ public class DeskServiceImpl implements DeskService { * @param subStageStatusList * @return */ - private PageInfo commonPendingVOPageInfo(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List subStageStatusList, Boolean filterFlag) { + private PageInfo commonPendingVOPage(Integer pageNum, Integer pageSize, LoginUserInfo user, ShopSubStageEnum shopSubStageEnum, List subStageStatusList, Boolean filterFlag,Boolean ownShopFlag) { //user.getJobNumber() List authRegionIds = new ArrayList<>(); if (filterFlag) { @@ -655,7 +679,7 @@ public class DeskServiceImpl implements DeskService { } PageHelper.startPage(pageNum, pageSize); List specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(), - subStageStatusList, user == null ? null : user.getUserId(), authRegionIds); + subStageStatusList, user == null ? null : user.getUserId(), authRegionIds,ownShopFlag); PageInfo result = new PageInfo<>(specialShopStageInfo); List shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); List lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList()); From ff6cfa7e4a8fb00b9f2f622e541949f824edf4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 21 May 2025 17:35:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E8=96=AA=E8=B6=85=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopStageInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index daa263626..b87275a94 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -333,10 +333,10 @@ - si.join_mode = 3 + and si.join_mode = 3 - si.join_mode != 3 + and si.join_mode != 3 order by a.update_time desc