Commit 35051519 authored by 赵啸非's avatar 赵啸非

修改部分pom

parent d1fd963b
...@@ -14,6 +14,7 @@ import com.mortals.framework.model.PageInfo; ...@@ -14,6 +14,7 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.code.flowable.runtime.CommentTypeEnum; import com.mortals.xhx.common.code.flowable.runtime.CommentTypeEnum;
import com.mortals.xhx.common.code.flowable.runtime.ProcessStatusEnum;
import com.mortals.xhx.common.pdu.api.ApiRespPdu; import com.mortals.xhx.common.pdu.api.ApiRespPdu;
import com.mortals.xhx.common.pdu.flow.*; import com.mortals.xhx.common.pdu.flow.*;
import com.mortals.xhx.feign.flowable.IApiFlowTaskFeign; import com.mortals.xhx.feign.flowable.IApiFlowTaskFeign;
...@@ -618,7 +619,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -618,7 +619,6 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
//todo 完成加签流程 完成任务 携带附件信息 //todo 完成加签流程 完成任务 携带附件信息
ApiRespPdu<String> rsp = new ApiRespPdu<>(YesNoEnum.YES.getValue(), "审批成功"); ApiRespPdu<String> rsp = new ApiRespPdu<>(YesNoEnum.YES.getValue(), "审批成功");
try { try {
if (StringUtils.isNotBlank(completeTaskReq.getProcessInstanceId()) if (StringUtils.isNotBlank(completeTaskReq.getProcessInstanceId())
&& StringUtils.isNotBlank(completeTaskReq.getTaskId())) { && StringUtils.isNotBlank(completeTaskReq.getTaskId())) {
//1.查看当前任务是存在 //1.查看当前任务是存在
...@@ -1366,7 +1366,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT ...@@ -1366,7 +1366,12 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IApiFlowT
ExtendHisprocinstEntity extendHisprocinstEntity = new ExtendHisprocinstEntity(); ExtendHisprocinstEntity extendHisprocinstEntity = new ExtendHisprocinstEntity();
ExtendHisprocinstEntity condition = new ExtendHisprocinstEntity(); ExtendHisprocinstEntity condition = new ExtendHisprocinstEntity();
condition.setProcessInstanceId(baseTaskReq.getProcessInstanceId()); condition.setProcessInstanceId(baseTaskReq.getProcessInstanceId());
if(ObjectUtils.isEmpty(baseTaskReq.getProcessStatusEnum())){
extendHisprocinstEntity.setProcessStatus(ProcessStatusEnum.SPZ.name());
}else {
extendHisprocinstEntity.setProcessStatus(baseTaskReq.getProcessStatusEnum().toString()); extendHisprocinstEntity.setProcessStatus(baseTaskReq.getProcessStatusEnum().toString());
}
extendHisprocinstService.updateBatch(extendHisprocinstEntity, condition, null); extendHisprocinstService.updateBatch(extendHisprocinstEntity, condition, null);
} }
......
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