diff --git a/xm-core/src/main/java/com/xm/core/entity/XmIterationLink.java b/xm-core/src/main/java/com/xm/core/entity/XmIterationLink.java
index c45c89d6..92723bef 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmIterationLink.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmIterationLink.java
@@ -1,19 +1,18 @@
package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmIterationLink所有属性名:
- * iterationId,proId,ctime,cuserid,cusername,linkStatus,ltype;
- * 表 xm_iteration_link 迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表的所有字段名:
- * iteration_id,pro_id,ctime,cuserid,cusername,link_status,ltype;
+ * "iterationId","迭代表主键","proId","产品或者项目表主键","ctime","创建时间","cuserid","创建人编号","cusername","创建人姓名","linkStatus","关联状态1关联0取消关联","ltype","关联类型0-项目，1-产品，为了简化，只关联产品，无须关联项目；项目通过产品关联";
* 当前主键(包括多主键):
* iteration_id,pro_id;
*/
+ @Data
@ApiModel(description="迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表")
public class XmIterationLink implements java.io.Serializable {
@@ -22,7 +21,7 @@ public class XmIterationLink implements java.io.Serializable {
@ApiModelProperty(notes="迭代表主键,主键",allowEmptyValue=true,example="",allowableValues="")
String iterationId;
- @ApiModelProperty(notes="产品/或者项目表主键,主键",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="产品或者项目表主键,主键",allowEmptyValue=true,example="",allowableValues="")
String proId;
@@ -38,103 +37,21 @@ public class XmIterationLink implements java.io.Serializable {
@ApiModelProperty(notes="关联状态1关联0取消关联",allowEmptyValue=true,example="",allowableValues="")
String linkStatus;
- @ApiModelProperty(notes="关联类型0-项目，1-产品",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="关联类型0-项目，1-产品，为了简化，只关联产品，无须关联项目；项目通过产品关联",allowEmptyValue=true,example="",allowableValues="")
String ltype;
- /**迭代表主键,产品或者项目表主键**/
+ /**
+ *迭代表主键,产品或者项目表主键
+ **/
public XmIterationLink(String iterationId,String proId) {
this.iterationId = iterationId;
this.proId = proId;
}
- /**迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表**/
+ /**
+ * 迭代表与产品表的关联关系，一般由迭代管理员将迭代挂接到产品表
+ **/
public XmIterationLink() {
}
-
- /**
- * 迭代表主键
- **/
- public void setIterationId(String iterationId) {
- this.iterationId = iterationId;
- }
- /**
- * 产品\或者项目表主键
- **/
- public void setProId(String proId) {
- this.proId = proId;
- }
- /**
- * 创建时间
- **/
- public void setCtime(Date ctime) {
- this.ctime = ctime;
- }
- /**
- * 创建人编号
- **/
- public void setCuserid(String cuserid) {
- this.cuserid = cuserid;
- }
- /**
- * 创建人姓名
- **/
- public void setCusername(String cusername) {
- this.cusername = cusername;
- }
- /**
- * 关联状态1关联0取消关联
- **/
- public void setLinkStatus(String linkStatus) {
- this.linkStatus = linkStatus;
- }
- /**
- * 关联类型0-项目，1-产品
- **/
- public void setLtype(String ltype) {
- this.ltype = ltype;
- }
-
- /**
- * 迭代表主键
- **/
- public String getIterationId() {
- return this.iterationId;
- }
- /**
- * 产品或者项目表主键
- **/
- public String getProId() {
- return this.proId;
- }
- /**
- * 创建时间
- **/
- public Date getCtime() {
- return this.ctime;
- }
- /**
- * 创建人编号
- **/
- public String getCuserid() {
- return this.cuserid;
- }
- /**
- * 创建人姓名
- **/
- public String getCusername() {
- return this.cusername;
- }
- /**
- * 关联状态1关联0取消关联
- **/
- public String getLinkStatus() {
- return this.linkStatus;
- }
- /**
- * 关联类型0-项目，1-产品
- **/
- public String getLtype() {
- return this.ltype;
- }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProductProjectLink.java b/xm-core/src/main/java/com/xm/core/entity/XmProductProjectLink.java
index 73ff0212..3e36725a 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProductProjectLink.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProductProjectLink.java
@@ -1,19 +1,18 @@
package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProductProjectLink所有属性名:
- * projectId,productId,ctime,cuserid,cusername,linkStatus,seq;
- * 表 xm_product_project_link 产品与项目的关联关系表，一般由产品经理挂接项目到产品上的所有字段名:
- * project_id,product_id,ctime,cuserid,cusername,link_status,seq;
+ * "projectId","项目表中的主键","productId","产品表中的主键","ctime","创建时间","cuserid","创建人编号","cusername","创建人姓名","linkStatus","关联状态1关联0取消关联","seq","显示顺序0-999,从小到大排序";
* 当前主键(包括多主键):
* project_id,product_id;
*/
+ @Data
@ApiModel(description="产品与项目的关联关系表，一般由产品经理挂接项目到产品上")
public class XmProductProjectLink implements java.io.Serializable {
@@ -41,100 +40,18 @@ public class XmProductProjectLink implements java.io.Serializable {
@ApiModelProperty(notes="显示顺序0-999,从小到大排序",allowEmptyValue=true,example="",allowableValues="")
Integer seq;
- /**项目表中的主键,产品表中的主键**/
+ /**
+ *项目表中的主键,产品表中的主键
+ **/
public XmProductProjectLink(String projectId,String productId) {
this.projectId = projectId;
this.productId = productId;
}
- /**产品与项目的关联关系表，一般由产品经理挂接项目到产品上**/
+ /**
+ * 产品与项目的关联关系表，一般由产品经理挂接项目到产品上
+ **/
public XmProductProjectLink() {
}
-
- /**
- * 项目表中的主键
- **/
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
- /**
- * 产品表中的主键
- **/
- public void setProductId(String productId) {
- this.productId = productId;
- }
- /**
- * 创建时间
- **/
- public void setCtime(Date ctime) {
- this.ctime = ctime;
- }
- /**
- * 创建人编号
- **/
- public void setCuserid(String cuserid) {
- this.cuserid = cuserid;
- }
- /**
- * 创建人姓名
- **/
- public void setCusername(String cusername) {
- this.cusername = cusername;
- }
- /**
- * 关联状态1关联0取消关联
- **/
- public void setLinkStatus(String linkStatus) {
- this.linkStatus = linkStatus;
- }
- /**
- * 显示顺序0-999,从小到大排序
- **/
- public void setSeq(Integer seq) {
- this.seq = seq;
- }
-
- /**
- * 项目表中的主键
- **/
- public String getProjectId() {
- return this.projectId;
- }
- /**
- * 产品表中的主键
- **/
- public String getProductId() {
- return this.productId;
- }
- /**
- * 创建时间
- **/
- public Date getCtime() {
- return this.ctime;
- }
- /**
- * 创建人编号
- **/
- public String getCuserid() {
- return this.cuserid;
- }
- /**
- * 创建人姓名
- **/
- public String getCusername() {
- return this.cusername;
- }
- /**
- * 关联状态1关联0取消关联
- **/
- public String getLinkStatus() {
- return this.linkStatus;
- }
- /**
- * 显示顺序0-999,从小到大排序
- **/
- public Integer getSeq() {
- return this.seq;
- }
}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml
index c3b33858..09841522 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationLinkMapper.xml
@@ -77,7 +77,7 @@