|
@@ -94,6 +94,10 @@ public class SysArchiveManager {
|
|
|
|
|
|
/**
|
|
/**
|
|
* 归档计划
|
|
* 归档计划
|
|
|
|
+ *
|
|
|
|
+ * @param operator 操作人
|
|
|
|
+ * @param resource 归档信息
|
|
|
|
+ * @return 处理结果
|
|
*/
|
|
*/
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
public Boolean destroyPlan(SysArchiveDto.OnPlanArchive resource, HnqzUser operator) {
|
|
public Boolean destroyPlan(SysArchiveDto.OnPlanArchive resource, HnqzUser operator) {
|
|
@@ -434,7 +438,7 @@ public class SysArchiveManager {
|
|
}
|
|
}
|
|
|
|
|
|
// 2.2.15 兑付通知记录
|
|
// 2.2.15 兑付通知记录
|
|
- if (CollUtil.isNotEmpty(redemptionNoticeRecords)){
|
|
|
|
|
|
+ if (CollUtil.isNotEmpty(redemptionNoticeRecords)) {
|
|
String clzName = WmPackageRedemptionNotice.class.getSimpleName();
|
|
String clzName = WmPackageRedemptionNotice.class.getSimpleName();
|
|
String fullClzName = WmPackageRedemptionNotice.class.getName();
|
|
String fullClzName = WmPackageRedemptionNotice.class.getName();
|
|
|
|
|
|
@@ -544,7 +548,7 @@ public class SysArchiveManager {
|
|
}
|
|
}
|
|
|
|
|
|
// 3.15 删除执行包兑付通知
|
|
// 3.15 删除执行包兑付通知
|
|
- if (CollUtil.isNotEmpty(redemptionNoticeRecords)){
|
|
|
|
|
|
+ if (CollUtil.isNotEmpty(redemptionNoticeRecords)) {
|
|
Set<Integer> collect = redemptionNoticeRecords.stream().mapToInt(WmPackageRedemptionNotice::getNoticeId).boxed().collect(Collectors.toSet());
|
|
Set<Integer> collect = redemptionNoticeRecords.stream().mapToInt(WmPackageRedemptionNotice::getNoticeId).boxed().collect(Collectors.toSet());
|
|
packageRedemptionNoticeService.removeByIds(collect);
|
|
packageRedemptionNoticeService.removeByIds(collect);
|
|
}
|
|
}
|