diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java index 22063f80d..a1365e52a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java @@ -53,7 +53,6 @@ public class OpenPlanShopInfoDTO { @ApiModelProperty("方案审核状态") private Integer resultType; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("提交申请时间") private Date submissionTime; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java index 66b65c8f9..2ca213ecc 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java @@ -34,7 +34,6 @@ public class DecorationPayRequest { private String branchBankCode; @ApiModelProperty("支行名称") private String branchBankName; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("缴纳时间") private Date payTime; @ApiModelProperty("付款截图") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModelVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModelVO.java index cc74c08af..a33257395 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModelVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModelVO.java @@ -29,10 +29,8 @@ public class DecorationModelVO { @ApiModelProperty("缴纳金额") private String amount; @ApiModelProperty("缴纳时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payTime; @ApiModelProperty("上传时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java index d0cff1f47..cb6c41d78 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java @@ -21,7 +21,6 @@ public class DecorationStageVO { @ApiModelProperty("装修阶段状态") private Integer shopSubStageStatus; @ApiModelProperty("创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createDate; @ApiModelProperty("计划开始时间") private String planBeginDate; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java index 35f7cfaaa..60d2eb4b9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java @@ -43,7 +43,6 @@ public class OpeningOperationPlanListVO { private String supervisorName; @ApiModelProperty("提交申请时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date submissionTime; @ApiModelProperty("审核结果,0待审核，1通过，2拒绝") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/fitmentCheckVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/fitmentCheckVO.java index 23dbde1e1..75d2af232 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/fitmentCheckVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/fitmentCheckVO.java @@ -37,16 +37,12 @@ public class fitmentCheckVO { @ApiModelProperty("战区经理") private String fightManager; @ApiModelProperty("计划完成时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date planEndTime; @ApiModelProperty("实际完成时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date actualEndTime; @ApiModelProperty("计划验收时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date planAcceptanceTime; @ApiModelProperty("实际验收时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date acceptanceTime; @ApiModelProperty("验收状态：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过") private Integer shopSubStageStatus; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java index e1f4d5d5a..8288c8164 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java @@ -5,11 +5,10 @@ import com.cool.store.dto.decoration.ConstructionScheduleDTO; import com.cool.store.dto.decoration.DecorationModelDTO; import com.cool.store.dto.decoration.ThreeAcceptanceDTO; import com.cool.store.request.*; -import com.cool.store.response.FitmentResponse; + import com.cool.store.response.ThreeSignResponse; import com.cool.store.vo.Fitment.DecorationStageVO; -import com.cool.store.vo.Fitment.DecorationModelVO; import com.cool.store.vo.Fitment.DesignInfoVo; import com.cool.store.vo.LinePayVO; import com.cool.store.vo.PartnerUserInfoVO; @@ -109,13 +108,13 @@ public interface DecorationService { /** * @Auther: wangshuo * @Date: 2024/5/3 - * @description:获取验收列表 + * @description:获取三方验收列表 */ PageInfo getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user); /** * @Auther: wangshuo * @Date: 2024/5/11 - * @description:获取验收列表详情 + * @description:三方获取验收列表详情 */ fitmentCheckVO getAcceptanceDetail(Long shopId, LoginUserInfo user); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java index 2e64bbea3..d1bfe3424 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java @@ -52,7 +52,13 @@ public interface UserAuthMappingService { */ EnterpriseUserDO getUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId); - + /** + * 获取有区域权限和职位 所有人 + * @param userRoleEnum + * @param regionId + * @return + */ + List getUserByRoleEnumAndRegionIdList(UserRoleEnum userRoleEnum, Long regionId); /** * 跟进角色和战区获取用户id * @param roleIds 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 fb7c3c8d5..1df0868c2 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 @@ -18,7 +18,6 @@ import com.cool.store.exception.ServiceException; import com.cool.store.mapper.LineInfoMapper; import com.cool.store.mapper.ShopInfoMapper; import com.cool.store.request.*; -import com.cool.store.response.FitmentResponse; import com.cool.store.response.ThreeSignResponse; import com.cool.store.service.*; @@ -26,7 +25,6 @@ import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.poi.StringUtils; import com.cool.store.vo.AssessmentTemplateVO; import com.cool.store.vo.Fitment.DecorationStageVO; -import com.cool.store.vo.Fitment.DecorationModelVO; import com.cool.store.vo.Fitment.DesignInfoVo; import com.cool.store.vo.LinePayVO; import com.cool.store.vo.PartnerUserInfoVO; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 9782cb940..7ba643897 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -140,9 +140,9 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { List lineInfos = lineInfoDAO.getLines(lines); Map lineInfoMap = lineInfos.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, dto -> dto)); for (OpenPlanShopInfoDTO openPlanShopInfoDTO : openPlanShopInfoDTOS) { - openPlanShopInfoDTO.setPartnerName(lineInfoMap.get(openPlanShopInfoDTO.getLineId()).getUsername()); - openPlanShopInfoDTO.setMobile(lineInfoMap.get(openPlanShopInfoDTO.getLineId()).getMobile()); - openPlanShopInfoDTO.setInvestmentManagerId(lineInfoMap.get(openPlanShopInfoDTO.getLineId()).getInvestmentManagerId()); + openPlanShopInfoDTO.setPartnerName(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getUsername()); + openPlanShopInfoDTO.setMobile(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getMobile()); + openPlanShopInfoDTO.setInvestmentManagerId(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getInvestmentManagerId()); } PageInfo pageInfo = new PageInfo<>(openPlanShopInfoDTOS); //开店负责人id，督导id,招商经理id // @@ -177,7 +177,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { openingOperationPlanListVO.setInvestmentManagerName (vonameMap.get(x.getInvestmentManagerId())); openingOperationPlanListVO.setShopManagerName - (vonameMap.get(x.getInvestmentManagerId())); + (vonameMap.get(x.getShopManagerUserId())); openingOperationPlanListVO.setSupervisorName( vonameMap.get(x.getSupervisorUserId())); openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index 5fb106865..4bbe65df3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -29,6 +29,7 @@ import java.util.stream.Collectors; /** * describe: + * * @author wxp * @date 2020/11/11 */ @@ -59,35 +60,35 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { @Override public List listUserAuthMappingByUserId(String userId) { - if(StringUtils.isBlank(userId)){ + if (StringUtils.isBlank(userId)) { return Lists.newArrayList(); } return userAuthMappingMapper.listUserAuthMappingByUserId(userId); } @Override - public List getAuthRegionIdAndSubRegionIdByUserId(String userId){ + public List getAuthRegionIdAndSubRegionIdByUserId(String userId) { List userAuthMapping = listUserAuthMappingByUserId(userId); - if(CollectionUtils.isEmpty(userAuthMapping)){ + if (CollectionUtils.isEmpty(userAuthMapping)) { return Lists.newArrayList(); } List regionIds = userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList()); List subRegionIds = regionMapper.getSubRegionIdsByRegionIds(regionIds); - if(CollectionUtils.isNotEmpty(subRegionIds)){ + if (CollectionUtils.isNotEmpty(subRegionIds)) { regionIds.addAll(subRegionIds); } return regionIds; } @Override - public List getAuthStoreIdAndSubRegionIdByUserId(String userId){ + public List getAuthStoreIdAndSubRegionIdByUserId(String userId) { List userAuthMapping = listUserAuthMappingByUserId(userId); - if(CollectionUtils.isEmpty(userAuthMapping)){ + if (CollectionUtils.isEmpty(userAuthMapping)) { return Lists.newArrayList(); } List regionIds = userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList()); List subRegionIds = regionMapper.getStoreIdsByRegionIds(regionIds); - if(CollectionUtils.isNotEmpty(subRegionIds)){ + if (CollectionUtils.isNotEmpty(subRegionIds)) { regionIds.addAll(subRegionIds); } return regionIds; @@ -95,6 +96,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { /** * 提供 根据职位 意向区域 查 对应人的接口 同时返回人名字 + * * @param userRoleEnum * @param wantShopAreaId * @return @@ -102,31 +104,31 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { @Override public EnterpriseUserDO getUserByRoleEnumAndWantShopAreaId(UserRoleEnum userRoleEnum, Long wantShopAreaId) { log.info("getUserByRoleEnumAndAreaId：{}，wantShopAreaId：{}", userRoleEnum, wantShopAreaId); - if(Objects.isNull(userRoleEnum) || Objects.isNull(wantShopAreaId)){ + if (Objects.isNull(userRoleEnum) || Objects.isNull(wantShopAreaId)) { return null; } String investmentManagerKey = redisConstantUtil.getInvestmentManagerKey(wantShopAreaId, userRoleEnum.getCode()); String suitableUserId = redisUtilPool.rpopStr(investmentManagerKey); - if(StringUtils.isNotBlank(suitableUserId)){ + if (StringUtils.isNotBlank(suitableUserId)) { EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(suitableUserId); return userDO; } Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId); - if(warRegionId == null){ + if (warRegionId == null) { return fillDefaultUser(userRoleEnum); } // 查找有战区权限的人 List authWarRegionUserIdList = authWarRegionUser(warRegionId); - if(CollectionUtils.isEmpty(authWarRegionUserIdList)){ + if (CollectionUtils.isEmpty(authWarRegionUserIdList)) { return fillDefaultUser(userRoleEnum); } Long roleId = userRoleEnum.getCode(); List hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId))); - if(CollectionUtils.isEmpty(hasRoleUserIdList)){ + if (CollectionUtils.isEmpty(hasRoleUserIdList)) { return fillDefaultUser(userRoleEnum); } authWarRegionUserIdList.retainAll(hasRoleUserIdList); - if(CollectionUtils.isEmpty(authWarRegionUserIdList)){ + if (CollectionUtils.isEmpty(authWarRegionUserIdList)) { return fillDefaultUser(userRoleEnum); } authWarRegionUserIdList = authWarRegionUserIdList.stream() @@ -140,6 +142,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { /** * 获取有区域权限和职位 的人 + * * @param userRoleEnum * @param regionId * @return @@ -148,37 +151,60 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { public EnterpriseUserDO getUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId) { // 查找有区域权限的人 List authRegionUserIdList = authWarRegionUser(regionId); - if(CollectionUtils.isEmpty(authRegionUserIdList)){ + if (CollectionUtils.isEmpty(authRegionUserIdList)) { return null; } Long roleId = userRoleEnum.getCode(); List hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId))); - if(CollectionUtils.isEmpty(hasRoleUserIdList)){ + if (CollectionUtils.isEmpty(hasRoleUserIdList)) { return null; } authRegionUserIdList.retainAll(hasRoleUserIdList); - if(CollectionUtils.isEmpty(authRegionUserIdList)){ + if (CollectionUtils.isEmpty(authRegionUserIdList)) { return null; } - if(CollectionUtils.isNotEmpty(authRegionUserIdList)){ + if (CollectionUtils.isNotEmpty(authRegionUserIdList)) { EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(authRegionUserIdList.get(0)); return userDO; } return null; } + @Override + public List getUserByRoleEnumAndRegionIdList(UserRoleEnum userRoleEnum, Long regionId) { + // 查找有区域权限的人 + List authRegionUserIdList = authWarRegionUser(regionId); + if (CollectionUtils.isEmpty(authRegionUserIdList)) { + return null; + } + Long roleId = userRoleEnum.getCode(); + List hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId))); + if (CollectionUtils.isEmpty(hasRoleUserIdList)) { + return null; + } + authRegionUserIdList.retainAll(hasRoleUserIdList); + if (CollectionUtils.isEmpty(authRegionUserIdList)) { + return null; + } + if (CollectionUtils.isNotEmpty(authRegionUserIdList)) { + return enterpriseUserDAO.getUserInfoByUserIds(authRegionUserIdList); + + } + return null; + } + private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) { // 如果找不到招商专员，则分配给默认的招商经理 - if(UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)){ + if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)) { EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER); - if(defaultUser == null){ + if (defaultUser == null) { defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER); } return defaultUser; - }else if(UserRoleEnum.SELECT_SITE_COMMISSIONER.equals(userRoleEnum)){ + } else if (UserRoleEnum.SELECT_SITE_COMMISSIONER.equals(userRoleEnum)) { // 如果找不到选址专员，则分配给默认的选址经理 EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_SELECT_SITE_MANAGER); - if(defaultUser == null){ + if (defaultUser == null) { defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_SELECT_SITE_MANAGER); } return defaultUser; @@ -188,27 +214,28 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { @Override public Map> getUserIdByRoleIdAndRegionId(List roleIds, Long regionId) { - if(CollectionUtils.isEmpty(roleIds) || Objects.isNull(regionId)){ + if (CollectionUtils.isEmpty(roleIds) || Objects.isNull(regionId)) { return Maps.newHashMap(); } RegionDO regionDO = regionMapper.getByRegionId(regionId); - if(regionDO == null){ + if (regionDO == null) { throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST); } // 查找有区域权限的人 List authRegionUserIdList = authWarRegionUser(regionId); - if(CollectionUtils.isEmpty(authRegionUserIdList)){ + if (CollectionUtils.isEmpty(authRegionUserIdList)) { return Maps.newHashMap(); } List roleIdList = roleIds.stream().map(a -> Long.valueOf(a)).collect(Collectors.toList()); List enterpriseUserRoleList = sysRoleMapper.getUserIdListByRoleIdList(roleIdList); enterpriseUserRoleList = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().filter(o -> authRegionUserIdList.contains(o.getUserId())).collect(Collectors.toList()); - Map> enterpriseUserRoleMap = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().collect(Collectors.groupingBy(EnterpriseUserRole::getRoleId, Collectors.mapping(k->k.getUserId(), Collectors.toList()))); + Map> enterpriseUserRoleMap = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().collect(Collectors.groupingBy(EnterpriseUserRole::getRoleId, Collectors.mapping(k -> k.getUserId(), Collectors.toList()))); return enterpriseUserRoleMap; } /** * 根据 人 查 这个人管辖区域 对应的意向区域省市code 团队线索 + * * @param userId * @return */ @@ -241,22 +268,22 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { // 查找有战区权限的人 public List authWarRegionUser(Long warRegionId) { List result = new ArrayList<>(); - if(Objects.isNull(warRegionId)){ + if (Objects.isNull(warRegionId)) { return result; } RegionDO regionDO = regionMapper.getByRegionId(warRegionId); - if(regionDO == null){ + if (regionDO == null) { throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST); } //将拥有管理员角色、角色属性为全企业数据的人查询出来 List roleUserByRoleId = sysRoleMapper.getRoleUserByRoleEnum(Role.MASTER.getRoleEnum(), null); List roleUserByRoleAuth = sysRoleMapper.getRoleUserByRoleAuth(AuthRoleEnum.ALL.getCode(), null); //组合出拥有所有门店信息的人 - List allWarRegionUserIdList = getAllWarRegionAuthUserIdList(roleUserByRoleId, roleUserByRoleAuth); + List allWarRegionUserIdList = getAllWarRegionAuthUserIdList(roleUserByRoleId, roleUserByRoleAuth); //查询出有门店权限配置的的人员 // 1.将门店区域切分出门店所属于的区域ID // 2.将配置了区域的人 查询出来 - List fullAreaIdList = StrUtil.splitTrim(regionDO.getRegionPath(),"/"); + List fullAreaIdList = StrUtil.splitTrim(regionDO.getRegionPath(), "/"); List lastAreaIdList = Collections.singletonList(String.valueOf(regionDO.getId())); //除不包含子区域的可视化范围的区域配置。 List regionUserAuthMappingList = @@ -264,13 +291,13 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { //不包含子区域的的直属连接门店的区域下的配置(会重复一些选择了上面数据) List notIncludeRegionUserAuthMappingList = userAuthMappingMapper.listUserAuthMappingByAuth(UserAuthMappingTypeEnum.REGION.getCode(), lastAreaIdList, null, null); - List authWarRegionUserIdList = mapAuthStoreUserDTO(regionUserAuthMappingList, allWarRegionUserIdList, notIncludeRegionUserAuthMappingList); + List authWarRegionUserIdList = mapAuthStoreUserDTO(regionUserAuthMappingList, allWarRegionUserIdList, notIncludeRegionUserAuthMappingList); return authWarRegionUserIdList; } private List getAllWarRegionAuthUserIdList(List roleUserByRoleId, List roleUserByRoleAuth) { - List allUserIdList= new ArrayList<>(); + List allUserIdList = new ArrayList<>(); List masterUserList = ListUtils.emptyIfNull(roleUserByRoleId).stream() .map(SysRoleVO::getEnterpriseDOs) .flatMap(Collection::stream) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java index 1520388cb..92727d3fa 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java @@ -2,21 +2,18 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; -import com.cool.store.context.PartnerUserHolder; + import com.cool.store.dto.decoration.ConstructionScheduleDTO; import com.cool.store.entity.ShopAuditInfoDO; import com.cool.store.request.*; -import com.cool.store.response.FitmentResponse; import com.cool.store.response.ResponseResult; import com.cool.store.response.ThreeSignResponse; import com.cool.store.service.DecorationService; import com.cool.store.service.PreparationService; import com.cool.store.service.SeeAcceptanceService; -import com.cool.store.vo.Fitment.DecorationModelVO; import com.cool.store.vo.Fitment.DesignInfoVo; import com.cool.store.vo.LinePayVO; -import com.cool.store.vo.OpeningOperationPlanListVO; -import com.cool.store.vo.PartnerUserInfoVO; + import com.cool.store.vo.fitmentCheckVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; @@ -71,13 +68,13 @@ public class PCDecorationController { LoginUserInfo user = CurrentUserHolder.getUser(); return ResponseResult.success(decorationService.getFitmentAcceptanceList(request,user)); } - @ApiOperation("获取验收列表详情") + @ApiOperation("获取三方验收列表详情") @GetMapping("/getAcceptanceDetail") public ResponseResult getAcceptanceDetail(@RequestParam("shopId") Long shopId){ LoginUserInfo user = CurrentUserHolder.getUser(); return ResponseResult.success(decorationService.getAcceptanceDetail(shopId,user)); } - @ApiOperation("预约验收") + @ApiOperation("预约三方验收") @PostMapping("/bookingAcceptance") public ResponseResult submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response){ LoginUserInfo user = CurrentUserHolder.getUser(); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java index d9beb59be..a115a439f 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java @@ -8,7 +8,6 @@ import com.cool.store.entity.ShopAuditInfoDO; import com.cool.store.request.LinePaySubmitRequest; import com.cool.store.request.ThreeAcceptanceCheckRequest; import com.cool.store.request.ThreeAcceptanceRequest; -import com.cool.store.response.FitmentResponse; import com.cool.store.response.ResponseResult; import com.cool.store.response.ThreeSignResponse; @@ -17,7 +16,7 @@ import com.cool.store.service.DecorationService; import com.cool.store.service.SeeAcceptanceService; import com.cool.store.vo.AssessmentTemplateVO; import com.cool.store.vo.Fitment.DecorationStageVO; -import com.cool.store.vo.Fitment.DecorationModelVO; + import com.cool.store.vo.Fitment.DesignInfoVo; import com.cool.store.vo.LinePayVO; import com.cool.store.vo.PartnerUserInfoVO; diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 692850578..1f2b8fba3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -285,22 +285,19 @@ public class XxlJobHandler { while (flag < CommonConstants.TWO) { try { Date approach = acceptanceInfoDO.getActualEntryTime(); - LocalDate plusFDays = DateUtils.getPlusFDays(approach, CommonConstants.FOUR); if (plusFDays.equals(LocalDate.now())) { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(acceptanceInfoDO.getShopId()); - EnterpriseUserDO userByRoleEnumAndRegionId = userAuthMappingService - .getUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfo.getRegionId()); - if (StringUtils.isBlank(userByRoleEnumAndRegionId.getUserId())) { - log.error("定时任务三方验收待预约钉钉通知,工程监理id为空,shopId:#{}", acceptanceInfoDO.getShopId()); - break; - } + List supervisor = userAuthMappingService + .getUserByRoleEnumAndRegionIdList(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfo.getRegionId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); - Map messageMap = new HashMap<>(); - messageMap.put("storeName", shopInfo.getShopName()); - messageMap.put("partnerUsername", lineInfo.getUsername()); - messageMap.put("partnerMobile", lineInfo.getMobile()); - commonService.sendMessage(Arrays.asList(userByRoleEnumAndRegionId.getUserId()), MessageEnum.MESSAGE_24, messageMap); + for (EnterpriseUserDO enterpriseUserDO : supervisor) { + Map messageMap = new HashMap<>(); + messageMap.put("storeName", shopInfo.getShopName()); + messageMap.put("partnerUsername", lineInfo.getUsername()); + messageMap.put("partnerMobile", lineInfo.getMobile()); + commonService.sendMessage(Arrays.asList(enterpriseUserDO.getUserId()), MessageEnum.MESSAGE_24, messageMap); + } } break; } catch (Exception e) { @@ -312,7 +309,6 @@ public class XxlJobHandler { hasNext = acceptanceInfoDOS.size() >= pageSize; pageNum++; } - } /** @@ -354,31 +350,36 @@ public class XxlJobHandler { } EnterpriseUserDO supervisor = userAuthMappingService .getUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfo.getRegionId()); - //获取计划撤场时间 - Date planExitTime = acceptanceInfoDO.getPlanExitTime(); - //获取施工阶段计划完成时间 - Date decorationEndTime = acceptanceInfoDO.getDecorationPlannedCompletionTime(); - //获取计划验收时间 - String planAcceptanceTime = CoolDateUtils.DateFormat(acceptanceInfoDO.getPlanAcceptanceTime(), CoolDateUtils.DATE_FORMAT_SEC); - if (StringUtils.isBlank(planAcceptanceTime)) { - planAcceptanceTime = ""; - } - //区域监理手机号 - String mobile = supervisor.getMobile(); - Map messageMap = new HashMap<>(); - if (Objects.nonNull(planExitTime)) { - String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, planExitTime); - messageMap.put("demolitionPlanTime", date); - } else { - if (Objects.nonNull(decorationEndTime)) { - String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, decorationEndTime); - messageMap.put("demolitionPlanTime", date); + if (Objects.nonNull(supervisor)) { + //获取计划撤场时间 + Date planExitTime = acceptanceInfoDO.getPlanExitTime(); + //获取施工阶段计划完成时间 + Date decorationEndTime = acceptanceInfoDO.getDecorationPlannedCompletionTime(); + //获取计划验收时间 + String planAcceptanceTime = CoolDateUtils.DateFormat(acceptanceInfoDO.getPlanAcceptanceTime(), CoolDateUtils.DATE_FORMAT_SEC); + if (StringUtils.isBlank(planAcceptanceTime)) { + planAcceptanceTime = ""; } + //区域监理手机号 + Boolean f = Boolean.TRUE; + String mobile = supervisor.getMobile(); + String supervisionName = supervisor.getName(); + + Map messageMap = new HashMap<>(); + if (Objects.nonNull(planExitTime)) { + String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, planExitTime); + messageMap.put("demolitionPlanTime", date); + } else { + if (Objects.nonNull(decorationEndTime)) { + String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, decorationEndTime); + messageMap.put("demolitionPlanTime", date); + } + } + messageMap.put("palnAcceptanceTime", planAcceptanceTime); + messageMap.put("supervisionName", supervisionName); + messageMap.put("supervisionMobile", mobile); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.THREE_ACCEPTANCE_WAIT, messageMap); } - messageMap.put("palnAcceptanceTime", planAcceptanceTime); - messageMap.put("supervisionName", supervisor.getName()); - messageMap.put("supervisionMobile", mobile); - commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.THREE_ACCEPTANCE_WAIT, messageMap); } } break; @@ -409,7 +410,7 @@ public class XxlJobHandler { while (hasNext) { PageHelper.startPage(pageNum, pageSize); //获取待验收的 - List acceptanceInfoDOS = acceptanceInfoDAO + List acceptanceInfoDOS = acceptanceInfoDAO .selectAcceptanceInfoBySignatures(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121.getShopSubStageStatus()); if (CollectionUtils.isEmpty(acceptanceInfoDOS)) { log.info("------定时任务结束三方待验收钉钉通知------");