diff --git a/backend/src/main/java/io/metersphere/base/domain/Issues.java b/backend/src/main/java/io/metersphere/base/domain/Issues.java index 434f515348..40e357cbf7 100644 --- a/backend/src/main/java/io/metersphere/base/domain/Issues.java +++ b/backend/src/main/java/io/metersphere/base/domain/Issues.java @@ -25,5 +25,9 @@ public class Issues implements Serializable { private String creator; + private Integer num; + + private String resourceId; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/IssuesDao.java b/backend/src/main/java/io/metersphere/base/domain/IssuesDao.java index f8b99ab1cd..bbca3ab6e8 100644 --- a/backend/src/main/java/io/metersphere/base/domain/IssuesDao.java +++ b/backend/src/main/java/io/metersphere/base/domain/IssuesDao.java @@ -9,4 +9,5 @@ public class IssuesDao extends IssuesWithBLOBs { private String model; private String projectName; private String creatorName; + private String resourceName; } diff --git a/backend/src/main/java/io/metersphere/base/domain/IssuesExample.java b/backend/src/main/java/io/metersphere/base/domain/IssuesExample.java index ffd977730e..f70316cb9e 100644 --- a/backend/src/main/java/io/metersphere/base/domain/IssuesExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/IssuesExample.java @@ -783,6 +783,136 @@ public class IssuesExample { addCriterion("creator not between", value1, value2, "creator"); return (Criteria) this; } + + public Criteria andNumIsNull() { + addCriterion("num is null"); + return (Criteria) this; + } + + public Criteria andNumIsNotNull() { + addCriterion("num is not null"); + return (Criteria) this; + } + + public Criteria andNumEqualTo(Integer value) { + addCriterion("num =", value, "num"); + return (Criteria) this; + } + + public Criteria andNumNotEqualTo(Integer value) { + addCriterion("num <>", value, "num"); + return (Criteria) this; + } + + public Criteria andNumGreaterThan(Integer value) { + addCriterion("num >", value, "num"); + return (Criteria) this; + } + + public Criteria andNumGreaterThanOrEqualTo(Integer value) { + addCriterion("num >=", value, "num"); + return (Criteria) this; + } + + public Criteria andNumLessThan(Integer value) { + addCriterion("num <", value, "num"); + return (Criteria) this; + } + + public Criteria andNumLessThanOrEqualTo(Integer value) { + addCriterion("num <=", value, "num"); + return (Criteria) this; + } + + public Criteria andNumIn(List values) { + addCriterion("num in", values, "num"); + return (Criteria) this; + } + + public Criteria andNumNotIn(List values) { + addCriterion("num not in", values, "num"); + return (Criteria) this; + } + + public Criteria andNumBetween(Integer value1, Integer value2) { + addCriterion("num between", value1, value2, "num"); + return (Criteria) this; + } + + public Criteria andNumNotBetween(Integer value1, Integer value2) { + addCriterion("num not between", value1, value2, "num"); + return (Criteria) this; + } + + public Criteria andResourceIdIsNull() { + addCriterion("resource_id is null"); + return (Criteria) this; + } + + public Criteria andResourceIdIsNotNull() { + addCriterion("resource_id is not null"); + return (Criteria) this; + } + + public Criteria andResourceIdEqualTo(String value) { + addCriterion("resource_id =", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotEqualTo(String value) { + addCriterion("resource_id <>", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdGreaterThan(String value) { + addCriterion("resource_id >", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdGreaterThanOrEqualTo(String value) { + addCriterion("resource_id >=", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdLessThan(String value) { + addCriterion("resource_id <", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdLessThanOrEqualTo(String value) { + addCriterion("resource_id <=", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdLike(String value) { + addCriterion("resource_id like", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotLike(String value) { + addCriterion("resource_id not like", value, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdIn(List values) { + addCriterion("resource_id in", values, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotIn(List values) { + addCriterion("resource_id not in", values, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdBetween(String value1, String value2) { + addCriterion("resource_id between", value1, value2, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotBetween(String value1, String value2) { + addCriterion("resource_id not between", value1, value2, "resourceId"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/mapper/IssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/IssuesMapper.xml index d17e5a6147..72867f1552 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/IssuesMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/IssuesMapper.xml @@ -12,6 +12,8 @@ + + @@ -77,7 +79,7 @@ id, title, `status`, create_time, update_time, reporter, lastmodify, platform, project_id, - creator + creator, num, resource_id description, custom_fields @@ -134,13 +136,13 @@ insert into issues (id, title, `status`, create_time, update_time, reporter, lastmodify, platform, project_id, - creator, description, custom_fields - ) + creator, num, resource_id, + description, custom_fields) values (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{reporter,jdbcType=VARCHAR}, #{lastmodify,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, - #{creator,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}, #{customFields,jdbcType=LONGVARCHAR} - ) + #{creator,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{resourceId,jdbcType=VARCHAR}, + #{description,jdbcType=LONGVARCHAR}, #{customFields,jdbcType=LONGVARCHAR}) insert into issues @@ -175,6 +177,12 @@ creator, + + num, + + + resource_id, + description, @@ -213,6 +221,12 @@ #{creator,jdbcType=VARCHAR}, + + #{num,jdbcType=INTEGER}, + + + #{resourceId,jdbcType=VARCHAR}, + #{description,jdbcType=LONGVARCHAR}, @@ -260,6 +274,12 @@ creator = #{record.creator,jdbcType=VARCHAR}, + + num = #{record.num,jdbcType=INTEGER}, + + + resource_id = #{record.resourceId,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=LONGVARCHAR}, @@ -283,6 +303,8 @@ platform = #{record.platform,jdbcType=VARCHAR}, project_id = #{record.projectId,jdbcType=VARCHAR}, creator = #{record.creator,jdbcType=VARCHAR}, + num = #{record.num,jdbcType=INTEGER}, + resource_id = #{record.resourceId,jdbcType=VARCHAR}, description = #{record.description,jdbcType=LONGVARCHAR}, custom_fields = #{record.customFields,jdbcType=LONGVARCHAR} @@ -300,7 +322,9 @@ lastmodify = #{record.lastmodify,jdbcType=VARCHAR}, platform = #{record.platform,jdbcType=VARCHAR}, project_id = #{record.projectId,jdbcType=VARCHAR}, - creator = #{record.creator,jdbcType=VARCHAR} + creator = #{record.creator,jdbcType=VARCHAR}, + num = #{record.num,jdbcType=INTEGER}, + resource_id = #{record.resourceId,jdbcType=VARCHAR} @@ -335,6 +359,12 @@ creator = #{creator,jdbcType=VARCHAR}, + + num = #{num,jdbcType=INTEGER}, + + + resource_id = #{resourceId,jdbcType=VARCHAR}, + description = #{description,jdbcType=LONGVARCHAR}, @@ -355,6 +385,8 @@ platform = #{platform,jdbcType=VARCHAR}, project_id = #{projectId,jdbcType=VARCHAR}, creator = #{creator,jdbcType=VARCHAR}, + num = #{num,jdbcType=INTEGER}, + resource_id = #{resourceId,jdbcType=VARCHAR}, description = #{description,jdbcType=LONGVARCHAR}, custom_fields = #{customFields,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} @@ -369,7 +401,9 @@ lastmodify = #{lastmodify,jdbcType=VARCHAR}, platform = #{platform,jdbcType=VARCHAR}, project_id = #{projectId,jdbcType=VARCHAR}, - creator = #{creator,jdbcType=VARCHAR} + creator = #{creator,jdbcType=VARCHAR}, + num = #{num,jdbcType=INTEGER}, + resource_id = #{resourceId,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml index 052aa1eabe..c21acb844e 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml @@ -14,7 +14,7 @@