Commit ef246a05 authored by H2T's avatar H2T

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents aa6a08b5 fdbc64a1
...@@ -594,13 +594,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN ...@@ -594,13 +594,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
} }
public void cancel(JgInstallationNoticeDto noticeDto) { public void cancel(JgInstallationNoticeDto noticeDto) {
//FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId()); FeignClientResult ajaxResult = Workflow.taskV2Client.rollBack(noticeDto.getInstanceId());
//JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr()); JgInstallationNotice jgInstallationNotice = this.baseMapper.selectById(noticeDto.getSequenceNbr());
//if(ajaxResult.getStatus() == 200) { if(ajaxResult.getStatus() == 200) {
// jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode())); jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
// jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.ROBACK.getCode())); jgInstallationNotice.setStatus(String.valueOf(FlowStatusEnum.ROBACK.getCode()));
// jgInstallationNoticeMapper.updateById(jgInstallationNotice); jgInstallationNoticeMapper.updateById(jgInstallationNotice);
//} }
} }
public void accept(JgInstallationNoticeDto dto,String op) { public void accept(JgInstallationNoticeDto dto,String op) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment