Merge remote-tracking branch 'origin/master'

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 + '\'' +
+                '}';
     }
 }

auto-solution-behaviour/src/main/resources/mapper/system/NodeparameterMapper.xml

@@ -24,9 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectNodeparameterList" parameterType="Nodeparameter" resultMap="NodeparameterResult">
         <include refid="selectNodeparameterVo"/>
         <where>
+            <if test="id != null"> and id = #{id}</if>
+             <if test="treeId != null"> and tree_id = #{treeId}</if>
             <if test="nodeInstanceId != null "> and node_instance_id = #{nodeInstanceId}</if>
             <if test="paramDefId != null "> and param_def_id = #{paramDefId}</if>
             <if test="value != null  and value != ''"> and value = #{value}</if>
+             <if test="groupIndex != null"> and group_index = #{groupIndex}</if>
         </where>
     </select>
     

auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml

@@ -31,8 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instanceName != null  and instanceName != ''"> and instance_name like concat('%', #{instanceName}, '%')</if>
             <if test="isRoot != null "> and is_root = #{isRoot}</if>
             <if test="preconditionTempleteId != null "> and precondition_templete_id = #{preconditionTempleteId}</if>
-            <if test="uuid != null  and uuid != ''"> and uuid = #{uuid}</if>
-            <if test="desciption != null  and desciption != ''"> and desciption = #{desciption}</if>
+            <if test="nodeValue != null  and nodeValue != ''"> and node_value = #{nodeValue}</if>
+            <if test="isExtern != null  and isExtern != ''"> and is_extern = #{isExtern}</if>
         </where>
     </select>