diff --git a/lib/taskana-core/src/main/java/org/taskana/model/Task.java b/lib/taskana-core/src/main/java/org/taskana/model/Task.java index 46eae3d98..e7d56e931 100644 --- a/lib/taskana-core/src/main/java/org/taskana/model/Task.java +++ b/lib/taskana-core/src/main/java/org/taskana/model/Task.java @@ -29,6 +29,16 @@ public class Task { private boolean isTransferred; // All objects have to be serializable private Map customAttributes = Collections.emptyMap(); + private String custom1; + private String custom2; + private String custom3; + private String custom4; + private String custom5; + private String custom6; + private String custom7; + private String custom8; + private String custom9; + private String custom10; public String getId() { return id; @@ -182,6 +192,86 @@ public class Task { this.customAttributes = customAttributes; } + public String getCustom1() { + return custom1; + } + + public void setCustom1(String custom1) { + this.custom1 = custom1; + } + + public String getCustom2() { + return custom2; + } + + public void setCustom2(String custom2) { + this.custom2 = custom2; + } + + public String getCustom3() { + return custom3; + } + + public void setCustom3(String custom3) { + this.custom3 = custom3; + } + + public String getCustom4() { + return custom4; + } + + public void setCustom4(String custom4) { + this.custom4 = custom4; + } + + public String getCustom5() { + return custom5; + } + + public void setCustom5(String custom5) { + this.custom5 = custom5; + } + + public String getCustom6() { + return custom6; + } + + public void setCustom6(String custom6) { + this.custom6 = custom6; + } + + public String getCustom7() { + return custom7; + } + + public void setCustom7(String custom7) { + this.custom7 = custom7; + } + + public String getCustom8() { + return custom8; + } + + public void setCustom8(String custom8) { + this.custom8 = custom8; + } + + public String getCustom9() { + return custom9; + } + + public void setCustom9(String custom9) { + this.custom9 = custom9; + } + + public String getCustom10() { + return custom10; + } + + public void setCustom10(String custom10) { + this.custom10 = custom10; + } + public String toString() { StringBuffer sb = new StringBuffer(); sb.append("TASK("); @@ -203,6 +293,16 @@ public class Task { sb.append(", primaryObjRef=" + primaryObjRef); sb.append(", isRead=" + isRead); sb.append(", isTransferred=" + isTransferred); + sb.append(", custom1=" + custom1); + sb.append(", custom2=" + custom2); + sb.append(", custom3=" + custom3); + sb.append(", custom4=" + custom4); + sb.append(", custom5=" + custom5); + sb.append(", custom6=" + custom6); + sb.append(", custom7=" + custom7); + sb.append(", custom8=" + custom8); + sb.append(", custom9=" + custom9); + sb.append(", custom10=" + custom10); sb.append(")"); return sb.toString(); } diff --git a/lib/taskana-core/src/main/java/org/taskana/model/mappings/TaskMapper.java b/lib/taskana-core/src/main/java/org/taskana/model/mappings/TaskMapper.java index 3ade0eb65..aa6be8799 100644 --- a/lib/taskana-core/src/main/java/org/taskana/model/mappings/TaskMapper.java +++ b/lib/taskana-core/src/main/java/org/taskana/model/mappings/TaskMapper.java @@ -28,7 +28,7 @@ public interface TaskMapper { String OBJECTREFERENCEMAPPER_FINDBYID = "org.taskana.model.mappings.ObjectReferenceMapper.findById"; - @Select("SELECT ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, TYPE, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES " + @Select("SELECT ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, TYPE, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 " + "FROM TASK " + "WHERE ID = #{id}") @Results(value = { @@ -50,10 +50,21 @@ public interface TaskMapper { @Result(property = "primaryObjRef", column = "PRIMARY_OBJ_REF_ID", javaType = ObjectReference.class, one = @One(select = OBJECTREFERENCEMAPPER_FINDBYID)), @Result(property = "isRead", column = "IS_READ"), @Result(property = "isTransferred", column = "IS_TRANSFERRED"), - @Result(property = "customAttributes", column = "CUSTOM_ATTRIBUTES", jdbcType = JdbcType.BLOB, javaType = Map.class, typeHandler = MapTypeHandler.class) }) + @Result(property = "customAttributes", column = "CUSTOM_ATTRIBUTES", jdbcType = JdbcType.BLOB, javaType = Map.class, typeHandler = MapTypeHandler.class), + @Result(property = "custom1", column = "CUSTOM_1"), + @Result(property = "custom2", column = "CUSTOM_2"), + @Result(property = "custom3", column = "CUSTOM_3"), + @Result(property = "custom4", column = "CUSTOM_4"), + @Result(property = "custom5", column = "CUSTOM_5"), + @Result(property = "custom6", column = "CUSTOM_6"), + @Result(property = "custom7", column = "CUSTOM_7"), + @Result(property = "custom8", column = "CUSTOM_8"), + @Result(property = "custom9", column = "CUSTOM_9"), + @Result(property = "custom10", column = "CUSTOM_10") + }) Task findById(@Param("id") String id); - @Select("SELECT ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, TYPE, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED " + @Select("SELECT ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, TYPE, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 " + "FROM TASK " + "WHERE WORKBASKETID = #{workbasketId} " + "ORDER BY ID") @@ -75,11 +86,22 @@ public interface TaskMapper { @Result(property = "owner", column = "OWNER"), @Result(property = "primaryObjRef", column = "PRIMARY_OBJ_REF_ID", javaType = ObjectReference.class, one = @One(select = OBJECTREFERENCEMAPPER_FINDBYID)), @Result(property = "isRead", column = "IS_READ"), - @Result(property = "isTransferred", column = "IS_TRANSFERRED") }) + @Result(property = "isTransferred", column = "IS_TRANSFERRED"), + @Result(property = "custom1", column = "CUSTOM_1"), + @Result(property = "custom2", column = "CUSTOM_2"), + @Result(property = "custom3", column = "CUSTOM_3"), + @Result(property = "custom4", column = "CUSTOM_4"), + @Result(property = "custom5", column = "CUSTOM_5"), + @Result(property = "custom6", column = "CUSTOM_6"), + @Result(property = "custom7", column = "CUSTOM_7"), + @Result(property = "custom8", column = "CUSTOM_8"), + @Result(property = "custom9", column = "CUSTOM_9"), + @Result(property = "custom10", column = "CUSTOM_10") + }) List findByWorkBasketId(@Param("workbasketId") String workbasketId); @Select("