suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改时间问题统一时间戳

Browse Source
This commit is contained in:
shuo.wang
2024-05-22 13:33:11 +08:00
parent 407cb2ec3d
commit 82ad0602bb
14 changed files with 115 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java
View File

@@ -53,7 +53,6 @@ public class OpenPlanShopInfoDTO {
@ApiModelProperty("方案审核状态") @ApiModelProperty("方案审核状态")
private Integer resultType; private Integer resultType;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("提交申请时间") @ApiModelProperty("提交申请时间")
private Date submissionTime; private Date submissionTime;

1
coolstore-partner-model/src/main/java/com/cool/store/request/DecorationPayRequest.java
View File

@@ -34,7 +34,6 @@ public class DecorationPayRequest {
private String branchBankCode; private String branchBankCode;
@ApiModelProperty("支行名称") @ApiModelProperty("支行名称")
private String branchBankName; private String branchBankName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("缴纳时间") @ApiModelProperty("缴纳时间")
private Date payTime; private Date payTime;
@ApiModelProperty("付款截图") @ApiModelProperty("付款截图")

2
coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModelVO.java
View File

@@ -29,10 +29,8 @@ public class DecorationModelVO {
@ApiModelProperty("缴纳金额") @ApiModelProperty("缴纳金额")
private String amount; private String amount;
@ApiModelProperty("缴纳时间") @ApiModelProperty("缴纳时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime; private Date payTime;
@ApiModelProperty("上传时间") @ApiModelProperty("上传时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime; private Date updateTime;
} }

1
coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java
View File

@@ -21,7 +21,6 @@ public class DecorationStageVO {
@ApiModelProperty("装修阶段状态") @ApiModelProperty("装修阶段状态")
private Integer shopSubStageStatus; private Integer shopSubStageStatus;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate; private Date createDate;
@ApiModelProperty("计划开始时间") @ApiModelProperty("计划开始时间")
private String planBeginDate; private String planBeginDate;

1
coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java
View File

@@ -43,7 +43,6 @@ public class OpeningOperationPlanListVO {
private String supervisorName; private String supervisorName;
@ApiModelProperty("提交申请时间") @ApiModelProperty("提交申请时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date submissionTime; private Date submissionTime;
@ApiModelProperty("审核结果,0待审核，1通过，2拒绝") @ApiModelProperty("审核结果,0待审核，1通过，2拒绝")

4
coolstore-partner-model/src/main/java/com/cool/store/vo/fitmentCheckVO.java
View File

@@ -37,16 +37,12 @@ public class fitmentCheckVO {
@ApiModelProperty("战区经理") @ApiModelProperty("战区经理")
private String fightManager; private String fightManager;
@ApiModelProperty("计划完成时间") @ApiModelProperty("计划完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planEndTime; private Date planEndTime;
@ApiModelProperty("实际完成时间") @ApiModelProperty("实际完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actualEndTime; private Date actualEndTime;
@ApiModelProperty("计划验收时间") @ApiModelProperty("计划验收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planAcceptanceTime; private Date planAcceptanceTime;
@ApiModelProperty("实际验收时间") @ApiModelProperty("实际验收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptanceTime; private Date acceptanceTime;
@ApiModelProperty("验收状态：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过") @ApiModelProperty("验收状态：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过")
private Integer shopSubStageStatus; private Integer shopSubStageStatus;

7
coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java
View File

@@ -5,11 +5,10 @@ import com.cool.store.dto.decoration.ConstructionScheduleDTO;
import com.cool.store.dto.decoration.DecorationModelDTO; import com.cool.store.dto.decoration.DecorationModelDTO;
import com.cool.store.dto.decoration.ThreeAcceptanceDTO; import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
import com.cool.store.request.*; import com.cool.store.request.*;
import com.cool.store.response.FitmentResponse;
import com.cool.store.response.ThreeSignResponse; import com.cool.store.response.ThreeSignResponse;
import com.cool.store.vo.Fitment.DecorationStageVO; 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.Fitment.DesignInfoVo;
import com.cool.store.vo.LinePayVO; import com.cool.store.vo.LinePayVO;
import com.cool.store.vo.PartnerUserInfoVO; import com.cool.store.vo.PartnerUserInfoVO;
@@ -109,13 +108,13 @@ public interface DecorationService {
/** /**
* @Auther: wangshuo * @Auther: wangshuo
* @Date: 2024/5/3 * @Date: 2024/5/3
* @description:获取验收列表 * @description:获取三方验收列表
*/ */
PageInfo<fitmentCheckVO> getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user); PageInfo<fitmentCheckVO> getFitmentAcceptanceList(AcceptanceListRequest request, LoginUserInfo user);
/** /**
* @Auther: wangshuo * @Auther: wangshuo
* @Date: 2024/5/11 * @Date: 2024/5/11
* @description:获取验收列表详情 * @description:三方获取验收列表详情
*/ */
fitmentCheckVO getAcceptanceDetail(Long shopId, LoginUserInfo user); fitmentCheckVO getAcceptanceDetail(Long shopId, LoginUserInfo user);
} }

8
coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java
View File

@@ -52,7 +52,13 @@ public interface UserAuthMappingService {
*/ */
EnterpriseUserDO getUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId); EnterpriseUserDO getUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId);
/**
* 获取有区域权限和职位 所有人
* @param userRoleEnum
* @param regionId
* @return
*/
List<EnterpriseUserDO> getUserByRoleEnumAndRegionIdList(UserRoleEnum userRoleEnum, Long regionId);
/** /**
* 跟进角色和战区获取用户id * 跟进角色和战区获取用户id
* @param roleIds * @param roleIds

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java
View File

@@ -18,7 +18,6 @@ import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.LineInfoMapper; import com.cool.store.mapper.LineInfoMapper;
import com.cool.store.mapper.ShopInfoMapper; import com.cool.store.mapper.ShopInfoMapper;
import com.cool.store.request.*; import com.cool.store.request.*;
import com.cool.store.response.FitmentResponse;
import com.cool.store.response.ThreeSignResponse; import com.cool.store.response.ThreeSignResponse;
import com.cool.store.service.*; 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.utils.poi.StringUtils;
import com.cool.store.vo.AssessmentTemplateVO; import com.cool.store.vo.AssessmentTemplateVO;
import com.cool.store.vo.Fitment.DecorationStageVO; 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.Fitment.DesignInfoVo;
import com.cool.store.vo.LinePayVO; import com.cool.store.vo.LinePayVO;
import com.cool.store.vo.PartnerUserInfoVO; import com.cool.store.vo.PartnerUserInfoVO;

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -140,9 +140,9 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
List<PlanLineDTO> lineInfos = lineInfoDAO.getLines(lines); List<PlanLineDTO> lineInfos = lineInfoDAO.getLines(lines);
Map<Long, PlanLineDTO> lineInfoMap = lineInfos.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, dto -> dto)); Map<Long, PlanLineDTO> lineInfoMap = lineInfos.stream().collect(Collectors.toMap(PlanLineDTO::getLineId, dto -> dto));
for (OpenPlanShopInfoDTO openPlanShopInfoDTO : openPlanShopInfoDTOS) { for (OpenPlanShopInfoDTO openPlanShopInfoDTO : openPlanShopInfoDTOS) {
openPlanShopInfoDTO.setPartnerName(lineInfoMap.get(openPlanShopInfoDTO.getLineId()).getUsername()); openPlanShopInfoDTO.setPartnerName(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getUsername());
openPlanShopInfoDTO.setMobile(lineInfoMap.get(openPlanShopInfoDTO.getLineId()).getMobile()); openPlanShopInfoDTO.setMobile(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getMobile());
openPlanShopInfoDTO.setInvestmentManagerId(lineInfoMap.get(openPlanShopInfoDTO.getLineId()).getInvestmentManagerId()); openPlanShopInfoDTO.setInvestmentManagerId(lineInfoMap.getOrDefault(openPlanShopInfoDTO.getLineId(),new PlanLineDTO()).getInvestmentManagerId());
} }
PageInfo pageInfo = new PageInfo<>(openPlanShopInfoDTOS); PageInfo pageInfo = new PageInfo<>(openPlanShopInfoDTOS);
//开店负责人id，督导id,招商经理id // //开店负责人id，督导id,招商经理id //
@@ -177,7 +177,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
openingOperationPlanListVO.setInvestmentManagerName openingOperationPlanListVO.setInvestmentManagerName
(vonameMap.get(x.getInvestmentManagerId())); (vonameMap.get(x.getInvestmentManagerId()));
openingOperationPlanListVO.setShopManagerName openingOperationPlanListVO.setShopManagerName
(vonameMap.get(x.getInvestmentManagerId())); (vonameMap.get(x.getShopManagerUserId()));
openingOperationPlanListVO.setSupervisorName( openingOperationPlanListVO.setSupervisorName(
vonameMap.get(x.getSupervisorUserId())); vonameMap.get(x.getSupervisorUserId()));
openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime()); openingOperationPlanListVO.setSubmissionTime(x.getSubmissionTime());

89
coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
View File

@@ -29,6 +29,7 @@ import java.util.stream.Collectors;
/** /**
* describe: * describe:
*
* @author wxp * @author wxp
* @date 2020/11/11 * @date 2020/11/11
*/ */
@@ -59,35 +60,35 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
@Override @Override
public List<UserAuthMappingDO> listUserAuthMappingByUserId(String userId) { public List<UserAuthMappingDO> listUserAuthMappingByUserId(String userId) {
if(StringUtils.isBlank(userId)){ if (StringUtils.isBlank(userId)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
return userAuthMappingMapper.listUserAuthMappingByUserId(userId); return userAuthMappingMapper.listUserAuthMappingByUserId(userId);
} }
@Override @Override
public List<String> getAuthRegionIdAndSubRegionIdByUserId(String userId){ public List<String> getAuthRegionIdAndSubRegionIdByUserId(String userId) {
List<UserAuthMappingDO> userAuthMapping = listUserAuthMappingByUserId(userId); List<UserAuthMappingDO> userAuthMapping = listUserAuthMappingByUserId(userId);
if(CollectionUtils.isEmpty(userAuthMapping)){ if (CollectionUtils.isEmpty(userAuthMapping)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
List<String> regionIds = userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList()); List<String> regionIds = userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList());
List<String> subRegionIds = regionMapper.getSubRegionIdsByRegionIds(regionIds); List<String> subRegionIds = regionMapper.getSubRegionIdsByRegionIds(regionIds);
if(CollectionUtils.isNotEmpty(subRegionIds)){ if (CollectionUtils.isNotEmpty(subRegionIds)) {
regionIds.addAll(subRegionIds); regionIds.addAll(subRegionIds);
} }
return regionIds; return regionIds;
} }
@Override @Override
public List<String> getAuthStoreIdAndSubRegionIdByUserId(String userId){ public List<String> getAuthStoreIdAndSubRegionIdByUserId(String userId) {
List<UserAuthMappingDO> userAuthMapping = listUserAuthMappingByUserId(userId); List<UserAuthMappingDO> userAuthMapping = listUserAuthMappingByUserId(userId);
if(CollectionUtils.isEmpty(userAuthMapping)){ if (CollectionUtils.isEmpty(userAuthMapping)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
List<String> regionIds = userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList()); List<String> regionIds = userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList());
List<String> subRegionIds = regionMapper.getStoreIdsByRegionIds(regionIds); List<String> subRegionIds = regionMapper.getStoreIdsByRegionIds(regionIds);
if(CollectionUtils.isNotEmpty(subRegionIds)){ if (CollectionUtils.isNotEmpty(subRegionIds)) {
regionIds.addAll(subRegionIds); regionIds.addAll(subRegionIds);
} }
return regionIds; return regionIds;
@@ -95,6 +96,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
/** /**
* 提供 根据职位 意向区域 查 对应人的接口 同时返回人名字 * 提供 根据职位 意向区域 查 对应人的接口 同时返回人名字
*
* @param userRoleEnum * @param userRoleEnum
* @param wantShopAreaId * @param wantShopAreaId
* @return * @return
@@ -102,31 +104,31 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
@Override @Override
public EnterpriseUserDO getUserByRoleEnumAndWantShopAreaId(UserRoleEnum userRoleEnum, Long wantShopAreaId) { public EnterpriseUserDO getUserByRoleEnumAndWantShopAreaId(UserRoleEnum userRoleEnum, Long wantShopAreaId) {
log.info("getUserByRoleEnumAndAreaId：{}，wantShopAreaId：{}", userRoleEnum, wantShopAreaId); log.info("getUserByRoleEnumAndAreaId：{}，wantShopAreaId：{}", userRoleEnum, wantShopAreaId);
if(Objects.isNull(userRoleEnum) || Objects.isNull(wantShopAreaId)){ if (Objects.isNull(userRoleEnum) || Objects.isNull(wantShopAreaId)) {
return null; return null;
} }
String investmentManagerKey = redisConstantUtil.getInvestmentManagerKey(wantShopAreaId, userRoleEnum.getCode()); String investmentManagerKey = redisConstantUtil.getInvestmentManagerKey(wantShopAreaId, userRoleEnum.getCode());
String suitableUserId = redisUtilPool.rpopStr(investmentManagerKey); String suitableUserId = redisUtilPool.rpopStr(investmentManagerKey);
if(StringUtils.isNotBlank(suitableUserId)){ if (StringUtils.isNotBlank(suitableUserId)) {
EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(suitableUserId); EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(suitableUserId);
return userDO; return userDO;
} }
Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId); Long warRegionId = regionAreaConfigDao.getByWantShopAreaId(wantShopAreaId);
if(warRegionId == null){ if (warRegionId == null) {
return fillDefaultUser(userRoleEnum); return fillDefaultUser(userRoleEnum);
} }
// 查找有战区权限的人 // 查找有战区权限的人
List<String> authWarRegionUserIdList = authWarRegionUser(warRegionId); List<String> authWarRegionUserIdList = authWarRegionUser(warRegionId);
if(CollectionUtils.isEmpty(authWarRegionUserIdList)){ if (CollectionUtils.isEmpty(authWarRegionUserIdList)) {
return fillDefaultUser(userRoleEnum); return fillDefaultUser(userRoleEnum);
} }
Long roleId = userRoleEnum.getCode(); Long roleId = userRoleEnum.getCode();
List<String> hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId))); List<String> hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId)));
if(CollectionUtils.isEmpty(hasRoleUserIdList)){ if (CollectionUtils.isEmpty(hasRoleUserIdList)) {
return fillDefaultUser(userRoleEnum); return fillDefaultUser(userRoleEnum);
} }
authWarRegionUserIdList.retainAll(hasRoleUserIdList); authWarRegionUserIdList.retainAll(hasRoleUserIdList);
if(CollectionUtils.isEmpty(authWarRegionUserIdList)){ if (CollectionUtils.isEmpty(authWarRegionUserIdList)) {
return fillDefaultUser(userRoleEnum); return fillDefaultUser(userRoleEnum);
} }
authWarRegionUserIdList = authWarRegionUserIdList.stream() authWarRegionUserIdList = authWarRegionUserIdList.stream()
@@ -140,6 +142,7 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
/** /**
* 获取有区域权限和职位 的人 * 获取有区域权限和职位 的人
*
* @param userRoleEnum * @param userRoleEnum
* @param regionId * @param regionId
* @return * @return
@@ -148,37 +151,60 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
public EnterpriseUserDO getUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId) { public EnterpriseUserDO getUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId) {
// 查找有区域权限的人 // 查找有区域权限的人
List<String> authRegionUserIdList = authWarRegionUser(regionId); List<String> authRegionUserIdList = authWarRegionUser(regionId);
if(CollectionUtils.isEmpty(authRegionUserIdList)){ if (CollectionUtils.isEmpty(authRegionUserIdList)) {
return null; return null;
} }
Long roleId = userRoleEnum.getCode(); Long roleId = userRoleEnum.getCode();
List<String> hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId))); List<String> hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId)));
if(CollectionUtils.isEmpty(hasRoleUserIdList)){ if (CollectionUtils.isEmpty(hasRoleUserIdList)) {
return null; return null;
} }
authRegionUserIdList.retainAll(hasRoleUserIdList); authRegionUserIdList.retainAll(hasRoleUserIdList);
if(CollectionUtils.isEmpty(authRegionUserIdList)){ if (CollectionUtils.isEmpty(authRegionUserIdList)) {
return null; return null;
} }
if(CollectionUtils.isNotEmpty(authRegionUserIdList)){ if (CollectionUtils.isNotEmpty(authRegionUserIdList)) {
EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(authRegionUserIdList.get(0)); EnterpriseUserDO userDO = enterpriseUserDAO.getUserInfoById(authRegionUserIdList.get(0));
return userDO; return userDO;
} }
return null; return null;
} }
@Override
public List<EnterpriseUserDO> getUserByRoleEnumAndRegionIdList(UserRoleEnum userRoleEnum, Long regionId) {
// 查找有区域权限的人
List<String> authRegionUserIdList = authWarRegionUser(regionId);
if (CollectionUtils.isEmpty(authRegionUserIdList)) {
return null;
}
Long roleId = userRoleEnum.getCode();
List<String> 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) { 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); EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
if(defaultUser == null){ if (defaultUser == null) {
defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER); defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
} }
return defaultUser; 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); EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_SELECT_SITE_MANAGER);
if(defaultUser == null){ if (defaultUser == null) {
defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_SELECT_SITE_MANAGER); defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_SELECT_SITE_MANAGER);
} }
return defaultUser; return defaultUser;
@@ -188,27 +214,28 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
@Override @Override
public Map<String, List<String>> getUserIdByRoleIdAndRegionId(List<String> roleIds, Long regionId) { public Map<String, List<String>> getUserIdByRoleIdAndRegionId(List<String> roleIds, Long regionId) {
if(CollectionUtils.isEmpty(roleIds) || Objects.isNull(regionId)){ if (CollectionUtils.isEmpty(roleIds) || Objects.isNull(regionId)) {
return Maps.newHashMap(); return Maps.newHashMap();
} }
RegionDO regionDO = regionMapper.getByRegionId(regionId); RegionDO regionDO = regionMapper.getByRegionId(regionId);
if(regionDO == null){ if (regionDO == null) {
throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST);
} }
// 查找有区域权限的人 // 查找有区域权限的人
List<String> authRegionUserIdList = authWarRegionUser(regionId); List<String> authRegionUserIdList = authWarRegionUser(regionId);
if(CollectionUtils.isEmpty(authRegionUserIdList)){ if (CollectionUtils.isEmpty(authRegionUserIdList)) {
return Maps.newHashMap(); return Maps.newHashMap();
} }
List<Long> roleIdList = roleIds.stream().map(a -> Long.valueOf(a)).collect(Collectors.toList()); List<Long> roleIdList = roleIds.stream().map(a -> Long.valueOf(a)).collect(Collectors.toList());
List<EnterpriseUserRole> enterpriseUserRoleList = sysRoleMapper.getUserIdListByRoleIdList(roleIdList); List<EnterpriseUserRole> enterpriseUserRoleList = sysRoleMapper.getUserIdListByRoleIdList(roleIdList);
enterpriseUserRoleList = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().filter(o -> authRegionUserIdList.contains(o.getUserId())).collect(Collectors.toList()); enterpriseUserRoleList = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().filter(o -> authRegionUserIdList.contains(o.getUserId())).collect(Collectors.toList());
Map<String, List<String>> enterpriseUserRoleMap = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().collect(Collectors.groupingBy(EnterpriseUserRole::getRoleId, Collectors.mapping(k->k.getUserId(), Collectors.toList()))); Map<String, List<String>> enterpriseUserRoleMap = ListUtils.emptyIfNull(enterpriseUserRoleList).stream().collect(Collectors.groupingBy(EnterpriseUserRole::getRoleId, Collectors.mapping(k -> k.getUserId(), Collectors.toList())));
return enterpriseUserRoleMap; return enterpriseUserRoleMap;
} }
/** /**
* 根据 人 查 这个人管辖区域 对应的意向区域省市code 团队线索 * 根据 人 查 这个人管辖区域 对应的意向区域省市code 团队线索
*
* @param userId * @param userId
* @return * @return
*/ */
@@ -241,22 +268,22 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
// 查找有战区权限的人 // 查找有战区权限的人
public List<String> authWarRegionUser(Long warRegionId) { public List<String> authWarRegionUser(Long warRegionId) {
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
if(Objects.isNull(warRegionId)){ if (Objects.isNull(warRegionId)) {
return result; return result;
} }
RegionDO regionDO = regionMapper.getByRegionId(warRegionId); RegionDO regionDO = regionMapper.getByRegionId(warRegionId);
if(regionDO == null){ if (regionDO == null) {
throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.REGION_NOT_EXIST);
} }
//将拥有管理员角色、角色属性为全企业数据的人查询出来 //将拥有管理员角色、角色属性为全企业数据的人查询出来
List<SysRoleVO> roleUserByRoleId = sysRoleMapper.getRoleUserByRoleEnum(Role.MASTER.getRoleEnum(), null); List<SysRoleVO> roleUserByRoleId = sysRoleMapper.getRoleUserByRoleEnum(Role.MASTER.getRoleEnum(), null);
List<SysRoleVO> roleUserByRoleAuth = sysRoleMapper.getRoleUserByRoleAuth(AuthRoleEnum.ALL.getCode(), null); List<SysRoleVO> roleUserByRoleAuth = sysRoleMapper.getRoleUserByRoleAuth(AuthRoleEnum.ALL.getCode(), null);
//组合出拥有所有门店信息的人 //组合出拥有所有门店信息的人
List<String> allWarRegionUserIdList = getAllWarRegionAuthUserIdList(roleUserByRoleId, roleUserByRoleAuth); List<String> allWarRegionUserIdList = getAllWarRegionAuthUserIdList(roleUserByRoleId, roleUserByRoleAuth);
//查询出有门店权限配置的的人员 //查询出有门店权限配置的的人员
// 1.将门店区域切分出门店所属于的区域ID // 1.将门店区域切分出门店所属于的区域ID
// 2.将配置了区域的人 查询出来 // 2.将配置了区域的人 查询出来
List<String> fullAreaIdList = StrUtil.splitTrim(regionDO.getRegionPath(),"/"); List<String> fullAreaIdList = StrUtil.splitTrim(regionDO.getRegionPath(), "/");
List<String> lastAreaIdList = Collections.singletonList(String.valueOf(regionDO.getId())); List<String> lastAreaIdList = Collections.singletonList(String.valueOf(regionDO.getId()));
//除不包含子区域的可视化范围的区域配置。 //除不包含子区域的可视化范围的区域配置。
List<UserAuthMappingDO> regionUserAuthMappingList = List<UserAuthMappingDO> regionUserAuthMappingList =
@@ -264,13 +291,13 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
//不包含子区域的的直属连接门店的区域下的配置(会重复一些选择了上面数据) //不包含子区域的的直属连接门店的区域下的配置(会重复一些选择了上面数据)
List<UserAuthMappingDO> notIncludeRegionUserAuthMappingList = List<UserAuthMappingDO> notIncludeRegionUserAuthMappingList =
userAuthMappingMapper.listUserAuthMappingByAuth(UserAuthMappingTypeEnum.REGION.getCode(), lastAreaIdList, null, null); userAuthMappingMapper.listUserAuthMappingByAuth(UserAuthMappingTypeEnum.REGION.getCode(), lastAreaIdList, null, null);
List<String> authWarRegionUserIdList = mapAuthStoreUserDTO(regionUserAuthMappingList, allWarRegionUserIdList, notIncludeRegionUserAuthMappingList); List<String> authWarRegionUserIdList = mapAuthStoreUserDTO(regionUserAuthMappingList, allWarRegionUserIdList, notIncludeRegionUserAuthMappingList);
return authWarRegionUserIdList; return authWarRegionUserIdList;
} }
private List<String> getAllWarRegionAuthUserIdList(List<SysRoleVO> roleUserByRoleId, List<SysRoleVO> roleUserByRoleAuth) { private List<String> getAllWarRegionAuthUserIdList(List<SysRoleVO> roleUserByRoleId, List<SysRoleVO> roleUserByRoleAuth) {
List<String> allUserIdList= new ArrayList<>(); List<String> allUserIdList = new ArrayList<>();
List<String> masterUserList = ListUtils.emptyIfNull(roleUserByRoleId).stream() List<String> masterUserList = ListUtils.emptyIfNull(roleUserByRoleId).stream()
.map(SysRoleVO::getEnterpriseDOs) .map(SysRoleVO::getEnterpriseDOs)
.flatMap(Collection::stream) .flatMap(Collection::stream)

11
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java
View File

@@ -2,21 +2,18 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo; import com.cool.store.context.LoginUserInfo;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dto.decoration.ConstructionScheduleDTO; import com.cool.store.dto.decoration.ConstructionScheduleDTO;
import com.cool.store.entity.ShopAuditInfoDO; import com.cool.store.entity.ShopAuditInfoDO;
import com.cool.store.request.*; import com.cool.store.request.*;
import com.cool.store.response.FitmentResponse;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
import com.cool.store.response.ThreeSignResponse; import com.cool.store.response.ThreeSignResponse;
import com.cool.store.service.DecorationService; import com.cool.store.service.DecorationService;
import com.cool.store.service.PreparationService; import com.cool.store.service.PreparationService;
import com.cool.store.service.SeeAcceptanceService; 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.Fitment.DesignInfoVo;
import com.cool.store.vo.LinePayVO; 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.cool.store.vo.fitmentCheckVO;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -71,13 +68,13 @@ public class PCDecorationController {
LoginUserInfo user = CurrentUserHolder.getUser(); LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(decorationService.getFitmentAcceptanceList(request,user)); return ResponseResult.success(decorationService.getFitmentAcceptanceList(request,user));
} }
@ApiOperation("获取验收列表详情") @ApiOperation("获取三方验收列表详情")
@GetMapping("/getAcceptanceDetail") @GetMapping("/getAcceptanceDetail")
public ResponseResult<fitmentCheckVO> getAcceptanceDetail(@RequestParam("shopId") Long shopId){ public ResponseResult<fitmentCheckVO> getAcceptanceDetail(@RequestParam("shopId") Long shopId){
LoginUserInfo user = CurrentUserHolder.getUser(); LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(decorationService.getAcceptanceDetail(shopId,user)); return ResponseResult.success(decorationService.getAcceptanceDetail(shopId,user));
} }
@ApiOperation("预约验收") @ApiOperation("预约三方验收")
@PostMapping("/bookingAcceptance") @PostMapping("/bookingAcceptance")
public ResponseResult<Boolean> submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response){ public ResponseResult<Boolean> submitBookingAcceptance(@RequestBody BookingAcceptanceRequest response){
LoginUserInfo user = CurrentUserHolder.getUser(); LoginUserInfo user = CurrentUserHolder.getUser();

3
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java
View File

@@ -8,7 +8,6 @@ import com.cool.store.entity.ShopAuditInfoDO;
import com.cool.store.request.LinePaySubmitRequest; import com.cool.store.request.LinePaySubmitRequest;
import com.cool.store.request.ThreeAcceptanceCheckRequest; import com.cool.store.request.ThreeAcceptanceCheckRequest;
import com.cool.store.request.ThreeAcceptanceRequest; import com.cool.store.request.ThreeAcceptanceRequest;
import com.cool.store.response.FitmentResponse;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
import com.cool.store.response.ThreeSignResponse; 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.service.SeeAcceptanceService;
import com.cool.store.vo.AssessmentTemplateVO; import com.cool.store.vo.AssessmentTemplateVO;
import com.cool.store.vo.Fitment.DecorationStageVO; 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.Fitment.DesignInfoVo;
import com.cool.store.vo.LinePayVO; import com.cool.store.vo.LinePayVO;
import com.cool.store.vo.PartnerUserInfoVO; import com.cool.store.vo.PartnerUserInfoVO;

75
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

@@ -285,22 +285,19 @@ public class XxlJobHandler {
while (flag < CommonConstants.TWO) { while (flag < CommonConstants.TWO) {
try { try {
Date approach = acceptanceInfoDO.getActualEntryTime(); Date approach = acceptanceInfoDO.getActualEntryTime();
LocalDate plusFDays = DateUtils.getPlusFDays(approach, CommonConstants.FOUR); LocalDate plusFDays = DateUtils.getPlusFDays(approach, CommonConstants.FOUR);
if (plusFDays.equals(LocalDate.now())) { if (plusFDays.equals(LocalDate.now())) {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(acceptanceInfoDO.getShopId()); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(acceptanceInfoDO.getShopId());
EnterpriseUserDO userByRoleEnumAndRegionId = userAuthMappingService List<EnterpriseUserDO> supervisor = userAuthMappingService
.getUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfo.getRegionId()); .getUserByRoleEnumAndRegionIdList(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfo.getRegionId());
if (StringUtils.isBlank(userByRoleEnumAndRegionId.getUserId())) {
log.error("定时任务三方验收待预约钉钉通知,工程监理id为空,shopId:#{}", acceptanceInfoDO.getShopId());
break;
}
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
Map<String, String> messageMap = new HashMap<>(); for (EnterpriseUserDO enterpriseUserDO : supervisor) {
messageMap.put("storeName", shopInfo.getShopName()); Map<String, String> messageMap = new HashMap<>();
messageMap.put("partnerUsername", lineInfo.getUsername()); messageMap.put("storeName", shopInfo.getShopName());
messageMap.put("partnerMobile", lineInfo.getMobile()); messageMap.put("partnerUsername", lineInfo.getUsername());
commonService.sendMessage(Arrays.asList(userByRoleEnumAndRegionId.getUserId()), MessageEnum.MESSAGE_24, messageMap); messageMap.put("partnerMobile", lineInfo.getMobile());
commonService.sendMessage(Arrays.asList(enterpriseUserDO.getUserId()), MessageEnum.MESSAGE_24, messageMap);
}
} }
break; break;
} catch (Exception e) { } catch (Exception e) {
@@ -312,7 +309,6 @@ public class XxlJobHandler {
hasNext = acceptanceInfoDOS.size() >= pageSize; hasNext = acceptanceInfoDOS.size() >= pageSize;
pageNum++; pageNum++;
} }
} }
/** /**
@@ -354,31 +350,36 @@ public class XxlJobHandler {
} }
EnterpriseUserDO supervisor = userAuthMappingService EnterpriseUserDO supervisor = userAuthMappingService
.getUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfo.getRegionId()); .getUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfo.getRegionId());
//获取计划撤场时间 if (Objects.nonNull(supervisor)) {
Date planExitTime = acceptanceInfoDO.getPlanExitTime(); //获取计划撤场时间
//获取施工阶段计划完成时间 Date planExitTime = acceptanceInfoDO.getPlanExitTime();
Date decorationEndTime = acceptanceInfoDO.getDecorationPlannedCompletionTime(); //获取施工阶段计划完成时间
//获取计划验收时间 Date decorationEndTime = acceptanceInfoDO.getDecorationPlannedCompletionTime();
String planAcceptanceTime = CoolDateUtils.DateFormat(acceptanceInfoDO.getPlanAcceptanceTime(), CoolDateUtils.DATE_FORMAT_SEC); //获取计划验收时间
if (StringUtils.isBlank(planAcceptanceTime)) { String planAcceptanceTime = CoolDateUtils.DateFormat(acceptanceInfoDO.getPlanAcceptanceTime(), CoolDateUtils.DATE_FORMAT_SEC);
planAcceptanceTime = ""; if (StringUtils.isBlank(planAcceptanceTime)) {
} planAcceptanceTime = "";
//区域监理手机号
String mobile = supervisor.getMobile();
Map<String, String> 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);
} }
//区域监理手机号
Boolean f = Boolean.TRUE;
String mobile = supervisor.getMobile();
String supervisionName = supervisor.getName();
Map<String, String> 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; break;
@@ -409,7 +410,7 @@ public class XxlJobHandler {
while (hasNext) { while (hasNext) {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
//获取待验收的 //获取待验收的
List<AcceptanceInfoDO> acceptanceInfoDOS = acceptanceInfoDAO List<AcceptanceInfoDO> acceptanceInfoDOS = acceptanceInfoDAO
.selectAcceptanceInfoBySignatures(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121.getShopSubStageStatus()); .selectAcceptanceInfoBySignatures(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121.getShopSubStageStatus());
if (CollectionUtils.isEmpty(acceptanceInfoDOS)) { if (CollectionUtils.isEmpty(acceptanceInfoDOS)) {
log.info("------定时任务结束三方待验收钉钉通知------"); log.info("------定时任务结束三方待验收钉钉通知------");