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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-05-14 15:16:59 +08:00
parent b87fd21870 7d138edaa2
commit a973ef9364
15 changed files with 176 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,6 +102,12 @@ public class EmployeeTrainingController {
@ApiOperation("培训-战区经理-考核员工列表")
@PostMapping("/assessmentUserList")
public ResponseResult<PageInfo<EmployeeTrainingVO>> assessmentUserList(@RequestBody EmployeeAssessmentRequest request) {
return ResponseResult.success(employeeTrainingService.assessmentUserList(null, request));
}
@ApiOperation("培训-督导-考核员工列表")
@PostMapping("/supervisorUserList")
public ResponseResult<PageInfo<EmployeeTrainingVO>> supervisorUserList(@RequestBody EmployeeAssessmentRequest request) {
return ResponseResult.success(employeeTrainingService.assessmentUserList(CurrentUserHolder.getUserId(), request));
}

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

@@ -242,7 +242,7 @@ public class XxlJobHandler {
}
}
shopStageInfoDAO.batchUpdateShopStageStatus(shopIds, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120.getShopSubStageStatus());
shopStageInfoDAO.batchUpdateShopStageStatus(shopIds, ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120.getShopSubStageStatus());
hasNext = acceptanceInfoDOS.size() >= pageSize;
pageNum++;
}
@@ -263,10 +263,9 @@ public class XxlJobHandler {
int pageSize = 50;
while (hasNext) {
PageHelper.startPage(pageNum, pageSize);
//获取为带预约状态的和进场时间不为空的
//进场时间不为空的
List<AcceptanceInfoDO> acceptanceInfoDOS = acceptanceInfoDAO
.selectAcceptanceInfoBySignatures(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120.getShopSubStageStatus());
.selectListNotNullEntryTime();
if (CollectionUtils.isEmpty(acceptanceInfoDOS)) {
log.info("------定时任务结束三方验收待预约钉钉通知------");
return;
@@ -277,24 +276,22 @@ public class XxlJobHandler {
while (flag < CommonConstants.TWO) {
try {
Date approach = acceptanceInfoDO.getActualEntryTime();
if (Objects.nonNull(approach)) {
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;
}
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
Map<String, String> 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);
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;
}
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
Map<String, String> 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);
}
break;
} catch (Exception e) {
@@ -309,7 +306,6 @@ public class XxlJobHandler {
}
/**
* @Auther: wangshuo
* @Date: 2024/5/7
@@ -330,7 +326,6 @@ public class XxlJobHandler {
log.info("------定时任务结束三方验收预约短信通知------");
return;
}
for (AcceptanceInfoDO acceptanceInfoDO : acceptanceInfoDOS) {
int flag = CommonConstants.ZERO;
while (flag < CommonConstants.TWO) {
@@ -356,6 +351,9 @@ public class XxlJobHandler {
Date decorationEndTime = acceptanceInfoDO.getDecorationPlannedCompletionTime();
//获取计划验收时间
String planAcceptanceTime = CoolDateUtils.DateFormat(acceptanceInfoDO.getPlanAcceptanceTime(), CoolDateUtils.DATE_FORMAT_SEC);
if (StringUtils.isBlank(planAcceptanceTime)) {
planAcceptanceTime = "";
}
//区域监理手机号
String mobile = supervisor.getMobile();
Map<String, String> messageMap = new HashMap<>();
@@ -366,6 +364,8 @@ public class XxlJobHandler {
if (Objects.nonNull(decorationEndTime)) {
String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, decorationEndTime);
messageMap.put("demolitionPlanTime", date);
} else {
messageMap.put("demolitionPlanTime", "");
}
}
messageMap.put("palnAcceptanceTime", planAcceptanceTime);
@@ -379,8 +379,6 @@ public class XxlJobHandler {
log.error("定时任务三方验收预约短信通知失败 shopId:{}", acceptanceInfoDO.getShopId());
flag++;
}
}
}
@@ -405,8 +403,7 @@ public class XxlJobHandler {
PageHelper.startPage(pageNum, pageSize);
//获取待验收的
List<AcceptanceInfoDO> acceptanceInfoDOS = acceptanceInfoDAO
.selectAcceptanceInfoBySignatures(ShopSubStageEnum.SHOP_STAGE_12.getShopSubStage(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121.getShopSubStageStatus());
.selectListNotNullEntryTime();
if (CollectionUtils.isEmpty(acceptanceInfoDOS)) {
log.info("------定时任务结束三方待验收钉钉通知------");
return;