zouju/auto-solution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
yitaikarma
2026-04-17 15:47:01 +08:00
parent bcaaf1da4f 0cd142bb82
commit 4d5f966b0a
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
auto-solution-behaviour/src/main/java/com/solution/system/domain/Treenodeinstance.java
View File

@@ -39,11 +39,11 @@ public class Treenodeinstance extends BaseEntity
private Long preconditionTempleteId; private Long preconditionTempleteId;
@Excel(name = "节点介绍") @Excel(name = "节点介绍")
private String desciption; private String nodeValue;
/** $column.columnComment */ /** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @Excel(name = "是否外部节点", readConverterExp = "0=否,1=是")
private String uuid; private String isExtern;
public void setId(Long id) public void setId(Long id)
{ {
@@ -105,36 +105,33 @@ public class Treenodeinstance extends BaseEntity
return preconditionTempleteId; return preconditionTempleteId;
} }
public void setUuid(String uuid) public String getNodeValue() {
{ return nodeValue;
this.uuid = uuid;
} }
public String getUuid() public void setNodeValue(String nodeValue) {
{ this.nodeValue = nodeValue;
return uuid;
} }
public String getDesciption() { public String getIsExtern() {
return desciption; return isExtern;
} }
public void setDesciption(String desciption) { public void setIsExtern(String isExtern) {
this.desciption = desciption; this.isExtern = isExtern;
} }
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return "Treenodeinstance{" +
.append("id", getId()) "id=" + id +
.append("treeId", getTreeId()) ", treeId=" + treeId +
.append("templateId", getTemplateId()) ", templateId=" + templateId +
.append("instanceName", getInstanceName()) ", instanceName='" + instanceName + '\'' +
.append("isRoot", getIsRoot()) ", isRoot=" + isRoot +
.append("preconditionTempleteId", getPreconditionTempleteId()) ", preconditionTempleteId=" + preconditionTempleteId +
.append("uuid", getUuid()) ", nodeValue='" + nodeValue + '\'' +
.append("desciption", getDesciption()) ", isExtern='" + isExtern + '\'' +
.toString(); '}';
} }
} }

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

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

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

@@ -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="instanceName != null and instanceName != ''"> and instance_name like concat('%', #{instanceName}, '%')</if>
<if test="isRoot != null "> and is_root = #{isRoot}</if> <if test="isRoot != null "> and is_root = #{isRoot}</if>
<if test="preconditionTempleteId != null "> and precondition_templete_id = #{preconditionTempleteId}</if> <if test="preconditionTempleteId != null "> and precondition_templete_id = #{preconditionTempleteId}</if>
<if test="uuid != null and uuid != ''"> and uuid = #{uuid}</if> <if test="nodeValue != null and nodeValue != ''"> and node_value = #{nodeValue}</if>
<if test="desciption != null and desciption != ''"> and desciption = #{desciption}</if> <if test="isExtern != null and isExtern != ''"> and is_extern = #{isExtern}</if>
</where> </where>
</select> </select>