Commit 9d180217 authored by zhangsen's avatar zhangsen

移装告知和安装告知代办问题 与列表按钮等问题修改

parent e516d8d5
......@@ -25,7 +25,8 @@
isn.equ_address AS equAddress,
isn.handle_date AS handleDate,
isn.equ_list AS equList,
isn.notice_report_url AS noticeReportUrl
isn.notice_report_url AS noticeReportUrl,
isn.create_user_id as createUserId
FROM
tzs_jg_installation_notice isn
<where>
......
......@@ -24,7 +24,8 @@
tjtn.instance_status AS instanceStatus,
tjtn.notice_report_url AS noticeReportUrl,
ec."name" AS equipCateName,
tjtn.handle_date AS handleDate
tjtn.handle_date AS handleDate,
tjtn.create_user_id as createUserId
FROM
tzs_jg_transfer_notice tjtn
LEFT JOIN tzs_jg_transfer_notice_eq re ON re.equip_transfer_id = tjtn.sequence_nbr
......
......@@ -899,9 +899,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
} else {
commMap.put("approvalStatus", op);
}
commMap.put("approvalStatus", op);
workDto.setVariable(commMap);
workDto.setComment(jgTransferNotice.getProcessAdvice());
workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCreditCode());
workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCreditCode());
processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
// 提取节点等信息
workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
......
......@@ -730,6 +730,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
commMap.put("approvalStatus", op);
}
workDto.setNextExecuteUserCompanyCode(jgTransferNotice.getReceiveOrgCode());
workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgTransferNotice.getInstallUnitCreditCode() : jgTransferNotice.getReceiveOrgCode());
workDto.setVariable(commMap);
workDto.setComment(opinion);
processTaskDTO = iCmWorkflowService.complete(jgTransferNotice.getNextTaskId(), workDto);
......
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