|
@@ -85,23 +85,23 @@ public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMappe
|
|
|
//新增主键id
|
|
|
acquisitionInfo.setId(IdGenerator.generateUUID());
|
|
|
acquisitionInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
|
|
|
- acquisitionInfo.setStatusFlag(StatusEnum.GRAIN_REVIEWED.getFlag());
|
|
|
- acquisitionInfo.setStatus(StatusEnum.GRAIN_REVIEWED.getName());
|
|
|
+ acquisitionInfo.setStatusFlag(StatusEnum.GRAIN_ADOPT.getFlag());
|
|
|
+ acquisitionInfo.setStatus(StatusEnum.GRAIN_ADOPT.getName());
|
|
|
//操作主表数据
|
|
|
this.insert(acquisitionInfo);
|
|
|
- // 先删除任务
|
|
|
- noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
|
|
|
- acquisitionInfo.getId(), null);
|
|
|
- tesk(acquisitionInfo);
|
|
|
+// // 先删除任务
|
|
|
+// noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
|
|
|
+// acquisitionInfo.getId(), null);
|
|
|
+// tesk(acquisitionInfo);
|
|
|
}else{
|
|
|
//有id是修改
|
|
|
- acquisitionInfo.setStatusFlag(StatusEnum.GRAIN_REVIEWED.getFlag());
|
|
|
- acquisitionInfo.setStatus(StatusEnum.GRAIN_REVIEWED.getName());
|
|
|
+// acquisitionInfo.setStatusFlag(StatusEnum.GRAIN_ADOPT.getFlag());
|
|
|
+// acquisitionInfo.setStatus(StatusEnum.GRAIN_ADOPT.getName());
|
|
|
this.updateById(acquisitionInfo);
|
|
|
- // 先删除任务
|
|
|
- noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
|
|
|
- acquisitionInfo.getId(), null);
|
|
|
- tesk(acquisitionInfo);
|
|
|
+// // 先删除任务
|
|
|
+// noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
|
|
|
+// acquisitionInfo.getId(), null);
|
|
|
+// tesk(acquisitionInfo);
|
|
|
}
|
|
|
return acquisitionInfo.getId();
|
|
|
}
|