diff --git a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Treenodeinstance.java b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Treenodeinstance.java
index 7fc13cc..c4da1a3 100644
--- a/auto-solution-behaviour/src/main/java/com/solution/system/domain/Treenodeinstance.java
+++ b/auto-solution-behaviour/src/main/java/com/solution/system/domain/Treenodeinstance.java
@@ -39,11 +39,11 @@ public class Treenodeinstance extends BaseEntity
private Long preconditionTempleteId;
@Excel(name = "节点介绍")
- private String desciption;
+ private String nodeValue;
/** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String uuid;
+ @Excel(name = "是否外部节点", readConverterExp = "0=否,1=是")
+ private String isExtern;
public void setId(Long id)
{
@@ -105,36 +105,33 @@ public class Treenodeinstance extends BaseEntity
return preconditionTempleteId;
}
- public void setUuid(String uuid)
- {
- this.uuid = uuid;
+ public String getNodeValue() {
+ return nodeValue;
}
- public String getUuid()
- {
- return uuid;
+ public void setNodeValue(String nodeValue) {
+ this.nodeValue = nodeValue;
}
- public String getDesciption() {
- return desciption;
+ public String getIsExtern() {
+ return isExtern;
}
- public void setDesciption(String desciption) {
- this.desciption = desciption;
+ public void setIsExtern(String isExtern) {
+ this.isExtern = isExtern;
}
-
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("treeId", getTreeId())
- .append("templateId", getTemplateId())
- .append("instanceName", getInstanceName())
- .append("isRoot", getIsRoot())
- .append("preconditionTempleteId", getPreconditionTempleteId())
- .append("uuid", getUuid())
- .append("desciption", getDesciption())
- .toString();
+ return "Treenodeinstance{" +
+ "id=" + id +
+ ", treeId=" + treeId +
+ ", templateId=" + templateId +
+ ", instanceName='" + instanceName + '\'' +
+ ", isRoot=" + isRoot +
+ ", preconditionTempleteId=" + preconditionTempleteId +
+ ", nodeValue='" + nodeValue + '\'' +
+ ", isExtern='" + isExtern + '\'' +
+ '}';
}
}
diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml
index 1cddc6f..9d22c06 100644
--- a/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml
+++ b/auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml
@@ -23,10 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
diff --git a/auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml b/auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml
index ac5ee3f..4b8a091 100644
--- a/auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml
+++ b/auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml
@@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and instance_name like concat('%', #{instanceName}, '%')
and is_root = #{isRoot}
and precondition_templete_id = #{preconditionTempleteId}
- and uuid = #{uuid}
- and desciption = #{desciption}
+ and node_value = #{nodeValue}
+ and is_extern = #{isExtern}