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 957e74a6..6669c945 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 @@ -7,9 +7,9 @@ import java.util.Date; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProductProjectLink所有属性名:
- * projectId,productId,ctime,cuserid,cusername,linkStatus;
- * 表 XM.xm_product_project_link 产品与项目的关联关系表,一般由产品经理挂接项目到产品上的所有字段名:
- * project_id,product_id,ctime,cuserid,cusername,link_status;
+ * projectId,productId,ctime,cuserid,cusername,linkStatus,seq;
+ * 表 xm_product_project_link 产品与项目的关联关系表,一般由产品经理挂接项目到产品上的所有字段名:
+ * project_id,product_id,ctime,cuserid,cusername,link_status,seq;
* 当前主键(包括多主键):
* project_id,product_id;
*/ @@ -36,6 +36,9 @@ public class XmProductProjectLink implements java.io.Serializable { @ApiModelProperty(notes="关联状态1关联0取消关联",allowEmptyValue=true,example="",allowableValues="") String linkStatus; + + @ApiModelProperty(notes="显示顺序0-999,从小到大排序",allowEmptyValue=true,example="",allowableValues="") + Integer seq; /**项目表中的主键,产品表中的主键**/ public XmProductProjectLink(String projectId,String productId) { @@ -83,6 +86,12 @@ public class XmProductProjectLink implements java.io.Serializable { public void setLinkStatus(String linkStatus) { this.linkStatus = linkStatus; } + /** + * 显示顺序0-999,从小到大排序 + **/ + public void setSeq(Integer seq) { + this.seq = seq; + } /** * 项目表中的主键 @@ -120,5 +129,11 @@ public class XmProductProjectLink implements java.io.Serializable { 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/XmProductProjectLinkMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductProjectLinkMapper.xml index cee6a091..9b87a956 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductProjectLinkMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductProjectLinkMapper.xml @@ -3,14 +3,21 @@ - - + + + and (res.project_id, res.product_id) in + + ( #{item.projectId}, #{item.productId}) + + + + - + @@ -19,15 +26,9 @@ @@ -46,7 +47,13 @@ res.project_id = #{projectId} and res.product_id = #{productId} - +