|
@@ -94,7 +94,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
userIds.add(unused.getVerityUserId());
|
|
userIds.add(unused.getVerityUserId());
|
|
|
|
|
|
String domain = getAndCheckPcDomain();
|
|
String domain = getAndCheckPcDomain();
|
|
- String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
|
|
|
|
|
|
+ String unusedUrl = domain + "sbUnused/unused/queryById/" + unused.getId();
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
@@ -177,7 +177,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
userIds.add(unused.getVerityUserId());
|
|
userIds.add(unused.getVerityUserId());
|
|
|
|
|
|
String domain = getAndCheckPcDomain();
|
|
String domain = getAndCheckPcDomain();
|
|
- String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
|
|
|
|
|
|
+ String unusedUrl = domain + "sbUnused/unused/queryById/id=" + unused.getId();
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
@@ -219,7 +219,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
if (dto.getStatus()==SbUnusedStatusEnum.refused.getValue()){
|
|
if (dto.getStatus()==SbUnusedStatusEnum.refused.getValue()){
|
|
userIds.add(unused.getApplyUserId());
|
|
userIds.add(unused.getApplyUserId());
|
|
addRecord(userInfo,unused,"审核被拒",dto.getAdvice());
|
|
addRecord(userInfo,unused,"审核被拒",dto.getAdvice());
|
|
- String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
|
|
|
|
|
|
+ String unusedUrl = domain + "sbUnused/unused/queryById/id=" + unused.getId();
|
|
String info = MessageTemplateUtil.getRefuseUnusedSbVmHtmlContent(unusedUrl,
|
|
String info = MessageTemplateUtil.getRefuseUnusedSbVmHtmlContent(unusedUrl,
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
@@ -228,7 +228,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
upd.setVerityUserId2("636c57bd3abe1415981b18ec");
|
|
upd.setVerityUserId2("636c57bd3abe1415981b18ec");
|
|
userIds.add("636c57bd3abe1415981b18ec");//何经理
|
|
userIds.add("636c57bd3abe1415981b18ec");//何经理
|
|
addRecord(userInfo,unused,"审核通过",dto.getAdvice());
|
|
addRecord(userInfo,unused,"审核通过",dto.getAdvice());
|
|
- String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
|
|
|
|
|
|
+ String unusedUrl = domain + "sbUnused/unused/queryById/id=" + unused.getId();
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
@@ -286,7 +286,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
|
|
userIds.add(model.getVerityUserId());
|
|
userIds.add(model.getVerityUserId());
|
|
|
|
|
|
String domain = getAndCheckPcDomain();
|
|
String domain = getAndCheckPcDomain();
|
|
- String unusedUrl = domain + "sbUnused/unused?id=" + unused.getId();
|
|
|
|
|
|
+ String unusedUrl = domain + "/sbUnused/unused/queryById/id=" + unused.getId();
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|
|
sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
|