diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/entity/TaskTask.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/entity/TaskTask.java index bbc5bf6..63195da 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/entity/TaskTask.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/tasktask/entity/TaskTask.java @@ -4,10 +4,12 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; +import java.util.List; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; @@ -230,34 +232,11 @@ public class TaskTask implements Serializable { private java.lang.String formUrl; /**流程变量*/ @Excel(name = "流程变量", width = 15) - private transient java.lang.String jsonDataString; + @TableField(value = "json_data", typeHandler = FastjsonTypeHandler.class) + private List jsonData; + @Excel(name = "是否立即发起流程", width = 15) @Schema(description = "1立即发起且非周期性发起,2不立即发起但周期性发起,3立即发起且周期性发起") private java.lang.Integer triggerType; - private byte[] jsonData; - - public byte[] getJsonData(){ - if(jsonDataString==null){ - return null; - } - try { - return jsonDataString.getBytes("UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return null; - } - - public String getJsonDataString(){ - if(jsonData==null || jsonData.length==0){ - return ""; - } - try { - return new String(jsonData,"UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - return ""; - } }