|
@@ -87,6 +87,9 @@ public class RepairApplicationFormServiceImpl
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public void refuseOrder(RepairApplicationFormDTO repairApplicationFormDTO) {
|
|
public void refuseOrder(RepairApplicationFormDTO repairApplicationFormDTO) {
|
|
|
|
|
+ // 先从数据库查询完整记录,确保通知邮件能获取到单号等完整字段
|
|
|
|
|
+ RepairApplicationForm fullForm = mapper.selectById(repairApplicationFormDTO.getId());
|
|
|
|
|
+
|
|
|
repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.REFUSED.getValue());
|
|
repairApplicationFormDTO.setStatus(RepairApplicationFormStatusEnum.REFUSED.getValue());
|
|
|
mapper.updateByPrimaryKeySelective(
|
|
mapper.updateByPrimaryKeySelective(
|
|
|
BeanConverterUtil.copyObjectProperties(repairApplicationFormDTO, RepairApplicationForm.class));
|
|
BeanConverterUtil.copyObjectProperties(repairApplicationFormDTO, RepairApplicationForm.class));
|
|
@@ -126,13 +129,17 @@ public class RepairApplicationFormServiceImpl
|
|
|
if (!domain.endsWith("/")) {
|
|
if (!domain.endsWith("/")) {
|
|
|
domain = domain + "/";
|
|
domain = domain + "/";
|
|
|
}
|
|
}
|
|
|
- String repairUrl = domain + "repair/form?no=" + repairApplicationFormDTO.getNo();
|
|
|
|
|
|
|
+ String repairUrl = domain + "repair/form?no=" + fullForm.getNo();
|
|
|
|
|
+
|
|
|
|
|
+ // 使用数据库完整记录构建邮件模板,保留前端传入的拒单备注
|
|
|
|
|
+ fullForm.setRefuseRemark(repairApplicationFormDTO.getRefuseRemark());
|
|
|
|
|
+ RepairApplicationFormDTO fullDTO = BeanConverterUtil.copyObjectProperties(fullForm, RepairApplicationFormDTO.class);
|
|
|
|
|
|
|
|
// 发送邮件给机台人员
|
|
// 发送邮件给机台人员
|
|
|
SpringContextHolder.publishEvent(new WorkplaceBacklogEvent(WorkplaceBacklogTypeEnum.REPAIR.getValue(),
|
|
SpringContextHolder.publishEvent(new WorkplaceBacklogEvent(WorkplaceBacklogTypeEnum.REPAIR.getValue(),
|
|
|
WorkplaceBacklogDetailTypeEnum.REPAIR_APPLICATION.getValue(),
|
|
WorkplaceBacklogDetailTypeEnum.REPAIR_APPLICATION.getValue(),
|
|
|
repairApplicationFormDTO.getId(),
|
|
repairApplicationFormDTO.getId(),
|
|
|
- MessageTemplateUtil.getFreemarkerHtmlContentRefuse(repairUrl, repairApplicationFormDTO, sbInfo),
|
|
|
|
|
|
|
+ MessageTemplateUtil.getFreemarkerHtmlContentRefuse(repairUrl, fullDTO, sbInfo),
|
|
|
repairApplicationFormDTO.getId(), userIds, mails));
|
|
repairApplicationFormDTO.getId(), userIds, mails));
|
|
|
|
|
|
|
|
// 发送微信通知给所有维修人角色
|
|
// 发送微信通知给所有维修人角色
|
|
@@ -147,7 +154,7 @@ public class RepairApplicationFormServiceImpl
|
|
|
String mobileRepairUrl = mobileDomain + "pages/repair-detail/repair-detail?detailId="
|
|
String mobileRepairUrl = mobileDomain + "pages/repair-detail/repair-detail?detailId="
|
|
|
+ repairApplicationFormDTO.getId();
|
|
+ repairApplicationFormDTO.getId();
|
|
|
for (String openId : openIds) {
|
|
for (String openId : openIds) {
|
|
|
- WeChatMessageUtil.repairRefuseMessage(openId, mobileRepairUrl, repairApplicationFormDTO, sbInfo);
|
|
|
|
|
|
|
+ WeChatMessageUtil.repairRefuseMessage(openId, mobileRepairUrl, fullDTO, sbInfo);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|