diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java index dcba2d28..d6297266 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java @@ -37,19 +37,17 @@ public abstract class FlowNodeActivityBehavior { public final void activity(ExecutionEntity entity) { try { //当前节点 - if (StringUtils.isNotEmpty(entity.getProc_inst_id())){ - iActRuExecutionService.update(new UpdateWrapper() - .eq("proc_inst_id",entity.getProc_inst_id()) - .set("activity_id", entity.getActivityId()) - .set("activity_name", entity.getActivityName()) - .set("form_type", entity.getForm_type()) - .set("form_id", entity.getForm_id()) - .set("remark", "") - .set("status", StatusEnum.FLOW_STATUS.code("执行中")) - .set("form_data", JSONObject.toJSON(entity.getT()).toString()) - .set("update_time", DateUtil.now())); - } this.execute(entity); + iActRuExecutionService.update(new UpdateWrapper() + .eq("proc_inst_id",entity.getProc_inst_id()) + .set("activity_id", entity.getActivityId()) + .set("activity_name", entity.getActivityName()) + .set("form_type", entity.getForm_type()) + .set("form_id", entity.getForm_id()) + .set("remark", "") + .set("status", StatusEnum.FLOW_STATUS.code("执行中")) + .set("form_data", JSONObject.toJSON(entity.getT()).toString()) + .set("update_time", DateUtil.now())); this.leaveActivity(entity); }catch (Exception ex){ ex.printStackTrace(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java index 58070adc..2f4f8428 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java @@ -1,8 +1,12 @@ package org.nl.wms.flow_manage.flow.service.execution.dao; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; + +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +21,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("act_ru_execution") +@TableName(value = "act_ru_execution",autoResultMap = true) public class ActRuExecution implements Serializable { private static final long serialVersionUID = 1L; @@ -87,6 +91,11 @@ public class ActRuExecution implements Serializable { * 业务类型 */ private String form_type; + /** + * 业务数据 + */ + @TableField(typeHandler = FastjsonTypeHandler.class) + private JSONObject form_data; }