From bd3fa05bf257820049be1f9da5db109b315072d0 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 15 May 2025 17:58:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/AcceptanceInfoDAO.java | 11 ++++++++ .../store/mapper/AcceptanceInfoMapper.java | 3 ++ .../com/cool/store/mapper/ShopInfoMapper.java | 3 ++ .../resources/mapper/AcceptanceInfoMapper.xml | 6 ++++ .../main/resources/mapper/ShopInfoMapper.xml | 24 ++++++++++++++++ .../cool/store/service/DataHandlerServer.java | 3 ++ .../service/impl/DataHandlerServerImpl.java | 22 +++++++++++++++ .../service/impl/DecorationServiceImpl.java | 28 ++++++++++--------- .../webb/DataHandlerController.java | 22 +++++++++------ 9 files changed, 100 insertions(+), 22 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java index ba8ce5d2b..9c18fb3d6 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java @@ -11,6 +11,7 @@ import javax.annotation.Resource; import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * @Auther: WangShuo @@ -57,4 +58,14 @@ public class AcceptanceInfoDAO { public List selectByEntryTimeNull(){ return acceptanceInfoMapper.selectByEntryTimeNull(); } + + public List getAllShopIds(){ + List acceptanceInfoDOList = acceptanceInfoMapper.selectAll(); + + return acceptanceInfoDOList.stream().map(AcceptanceInfoDO::getShopId).collect(Collectors.toList()); + } + + public Integer initAcceptanceInfo(List shopIds){ + return acceptanceInfoMapper.initAcceptanceInfo(shopIds); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java index 297e17dac..34c627ca1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java @@ -36,4 +36,7 @@ public interface AcceptanceInfoMapper extends Mapper { * @description:查询进场时间为空的数据 */ List selectByEntryTimeNull(); + + + Integer initAcceptanceInfo(@Param("list") List shopIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index 0855df97c..eeb076ae4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -98,6 +98,9 @@ public interface ShopInfoMapper extends Mapper { */ List selectShopListByRegionId(@Param("regionIds") List regionIds,@Param("shopSubStage") Integer shopSubStage,@Param("subStageStatus")List subStageStatus,@Param("keyWord")String keyWord); + List selectShopListByUser(@Param("userId") String userId,@Param("shopSubStage") Integer shopSubStage,@Param("subStageStatus")List subStageStatus,@Param("keyWord")String keyWord); + + List selectByIdOrSelectAll(@Param("shopId") Long shopId); diff --git a/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml index 3234c9d3d..084d77448 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml @@ -36,6 +36,12 @@ create_time,update_time,deleted,plan_acceptance_time,actual_acceptance_time,booking_user,plan_exit_time, ks_account,verification_mobile,shop_location_screenshots,shop_doorway_photo,shop_interior_photo + + + insert into xfsg_acceptance_info (shop_id,create_time,update_time,deleted) + values (#{item},now(),now(),0) + + update xfsg_acceptance_info diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index cc651b29d..0a9bee34d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -506,6 +506,30 @@ and b.actual_complete_time >= #{request.buildStartTime} and b.actual_complete_time <= #{request.buildEndTime} + diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java index 0954f8525..32ea2a8c8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DataHandlerServer.java @@ -24,4 +24,7 @@ public interface DataHandlerServer { //数据处理阶段完成 某些阶段数据处理 Boolean dataStageHandler(List> dataMapList, String originalFilename, LoginUserInfo user, ImportTaskDO task,Boolean flag); + + //装修数据初始化 + Boolean decorationDataInit(); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java index ba9a2db01..33685ea2c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java @@ -42,6 +42,8 @@ import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD; @Service @Slf4j public class DataHandlerServerImpl implements DataHandlerServer { + @Resource + private AcceptanceInfoDAO acceptanceInfoDAO; @Resource private ImportTaskMapper importTaskMapper; @Resource @@ -535,6 +537,26 @@ public class DataHandlerServerImpl implements DataHandlerServer { return true; } + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean decorationDataInit() { + + //施工阶段 + List subStages = shopStageInfoDAO.getSubStages(ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()); + List allShopIds = acceptanceInfoDAO.getAllShopIds(); + //需要处理的门店 + List addShopIds = new ArrayList<>(); + for (ShopStageInfoDO subStage : subStages){ + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())){ + if (!allShopIds.contains(subStage.getShopId())){ + addShopIds.add(subStage.getShopId()); + } + } + } + acceptanceInfoDAO.initAcceptanceInfo(addShopIds); + return true; + } + private static boolean check(ImportOaOldShopDataDTO dto, List errorList) { if (StringUtil.isBlank(dto.getShopCode())) { ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index 81ffaa465..722497dd5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -377,22 +377,24 @@ public class DecorationServiceImpl implements DecorationService { @Override public PageInfo getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user) { - List regions = new ArrayList<>(); - if (!sysRoleService.checkIsAdmin(user.getUserId())) { - List authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId()); - for (String authRegionId : authRegionIds) { - regions.add(Long.parseLong(authRegionId)); - } - if (regions.isEmpty()) { - log.info("该用户下权限没有管理区域"); - return new PageInfo<>(); - } - } + // List regions = new ArrayList<>(); +// if (!sysRoleService.checkIsAdmin(user.getUserId())) { +// List authRegionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(user.getUserId()); +// for (String authRegionId : authRegionIds) { +// regions.add(Long.parseLong(authRegionId)); +// } +// if (regions.isEmpty()) { +// log.info("该用户下权限没有管理区域"); +// return new PageInfo<>(); +// } +// } + //判断是否是管理员 + Boolean isAdmin = sysRoleService.checkIsAdmin(user.getUserId()); PageHelper.startPage(request.getPageNum(), request.getPageSize()); List fitmentCheckVOList = new ArrayList<>(); //shopId,lineid,regionid,shopname,storenum, - - List shopInfoDOS = shopInfoMapper.selectShopListByRegionId(regions, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), request.getSubStageStatus(), null); + //督导查询是自己的 + List shopInfoDOS = shopInfoMapper.selectShopListByUser(isAdmin?null:user.getUserId(), ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), request.getSubStageStatus(), null); PageInfo pageInfo = new PageInfo<>(shopInfoDOS); if (shopInfoDOS.isEmpty()) { log.info("该工程部监理下门店为空"); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java index c4b91084b..40f3a366b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java @@ -13,10 +13,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -44,6 +41,7 @@ public class DataHandlerController { @Value("${mybatis.configuration.variables.enterpriseId}") private String eid; + @PostMapping("/importOaOldShopData") @ApiOperation("导入OA旧数据") public ResponseResult importOaOldShopData(MultipartFile file) { @@ -54,7 +52,7 @@ public class DataHandlerController { log.error("read file error:", e); } assert reader != null; - log.info("----------------------:{}",file.getOriginalFilename()); + log.info("----------------------:{}", file.getOriginalFilename()); List> dataMapList = reader.read(0, 1, Integer.MAX_VALUE); ImportTaskDO importTaskDO = new ImportTaskDO(); importTaskDO.setFileName(file.getOriginalFilename()); @@ -64,7 +62,7 @@ public class DataHandlerController { importTaskDO.setCreateUserId(CurrentUserHolder.getUserId()); importTaskDO.setCreateName(CurrentUserHolder.getUser().getName()); importTaskDO.setCreateTime(System.currentTimeMillis()); - importTaskMapper.insert(eid ,importTaskDO); + importTaskMapper.insert(eid, importTaskDO); dataHandlerServer.importOaOldShopData(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO); return ResponseResult.success(true); } @@ -79,7 +77,7 @@ public class DataHandlerController { log.error("read file error:", e); } assert reader != null; - log.info("----------------------:{}",file.getOriginalFilename()); + log.info("----------------------:{}", file.getOriginalFilename()); List> dataMapList = reader.read(0, 1, Integer.MAX_VALUE); ImportTaskDO importTaskDO = new ImportTaskDO(); importTaskDO.setFileName(file.getOriginalFilename()); @@ -89,10 +87,16 @@ public class DataHandlerController { importTaskDO.setCreateUserId(CurrentUserHolder.getUserId()); importTaskDO.setCreateName(CurrentUserHolder.getUser().getName()); importTaskDO.setCreateTime(System.currentTimeMillis()); - importTaskMapper.insert(eid ,importTaskDO); - dataHandlerServer.dataStageHandler(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO,flag); + importTaskMapper.insert(eid, importTaskDO); + dataHandlerServer.dataStageHandler(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO, flag); return ResponseResult.success(true); } + @GetMapping("decorationDataInit") + @ApiOperation("装修数据初始化") + public ResponseResult decorationDataInit() { + dataHandlerServer.decorationDataInit(); + return ResponseResult.success(true); + } }