|
@@ -76,8 +76,8 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
List<Integer> statusList = new ArrayList<>();
|
|
|
if(record.getSearchType() == 1){ // 我的工单
|
|
|
statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
|
|
|
- statusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
|
|
|
- statusList.add(RepairApplicationFormStatusEnum.FINISHED.getValue());
|
|
|
+ statusList.add(PreparationStatusEnum.PROCESSING.getValue());
|
|
|
+ statusList.add(PreparationStatusEnum.FINISHED.getValue());
|
|
|
}else if(record.getSearchType() == 2){ // 待派工单
|
|
|
statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
|
|
|
}
|
|
@@ -217,7 +217,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
Integer detailType = WorkplaceBacklogDetailTypeEnum.PREPARATION_REPAIR.getValue();
|
|
|
String[] values = new String[]{"有一条新的筹建消息!",preparation.getNo(),"无",preparation.getContent(),sbPositionMapper.selectNameById(preparation.getPositionId()),"请尽快派工"};
|
|
|
String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_SEND_SUCCESS_WECHAT_TEMPLATE_ID.name());;
|
|
|
- String detailUrl = "pages/service-detail/service-detail?id=" + preparation.getId();
|
|
|
+ String detailUrl = "pages/preparation/preparation-detail?id=" + preparation.getId();
|
|
|
Map<String,List<String>> maps = getPushReceivers(userVOS);
|
|
|
// 1、站内信
|
|
|
sendWorkplaceAndEmailNew(maps.get("mails"),maps.get("userIds"),preparation.getId(),info, detailType);
|
|
@@ -257,7 +257,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
Integer detailType = WorkplaceBacklogDetailTypeEnum.PREPARATION_REPAIR_DISPATCH.getValue();
|
|
|
String[] values = new String[]{"有新的筹建派工任务!",preparation.getNo(),"无",preparation.getContent(),sbPositionMapper.selectNameById(preparation.getPositionId()),"请尽快处理"};
|
|
|
String wechatTemplateId = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.REPAIR_SEND_SUCCESS_WECHAT_TEMPLATE_ID.name());;
|
|
|
- String detailUrl = "pages/service-detail/service-detail?id=" + preparation.getId();
|
|
|
+ String detailUrl = "pages/preparation/preparation-detail?id=" + preparation.getId();
|
|
|
Map<String,List<String>> maps = getPushReceivers(userVOS);
|
|
|
// 1、站内信
|
|
|
sendWorkplaceAndEmailNew(maps.get("mails"),maps.get("userIds"),preparation.getId(),info, detailType);
|