|
|
@ -758,7 +758,7 @@ public class ErfExpApplyServiceImpl extends ServiceImpl<ErfExpApplyMapper, ErfEx |
|
|
ErfFlowNodeInstance nodeInstance = erfFlowNodeInstanceMapper.selectOne(nodeQuery); |
|
|
ErfFlowNodeInstance nodeInstance = erfFlowNodeInstanceMapper.selectOne(nodeQuery); |
|
|
|
|
|
|
|
|
if (nodeInstance != null) { |
|
|
if (nodeInstance != null) { |
|
|
if ("已批准".equals(nodeInstance.getStatus()) || "已完成".equals(nodeInstance.getStatus())) { |
|
|
|
|
|
|
|
|
if ("已批准".equals(nodeInstance.getStatus()) || "已完成".equals(nodeInstance.getStatus()) || "已跳过".equals(nodeInstance.getStatus())) { |
|
|
stage.setStatus("completed"); |
|
|
stage.setStatus("completed"); |
|
|
if (nodeInstance.getCompleteTime() != null) { |
|
|
if (nodeInstance.getCompleteTime() != null) { |
|
|
stage.setCompleteTime(new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss") |
|
|
stage.setCompleteTime(new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss") |
|
|
|