diff --git a/xm-core/src/main/java/com/xm/core/entity/XmIteration.java b/xm-core/src/main/java/com/xm/core/entity/XmIteration.java
index 2acce3cb..58aa753d 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmIteration.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmIteration.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmIteration所有属性名:
- * "id","迭代编码","branchId","机构编号","iterationName","迭代名称","startTime","开始时间","endTime","结束时间","onlineTime","上线时间","pid","上级迭代-作废,不以树状结构","adminUserid","负责人","adminUsername","负责人姓名","ctime","创建时间","budgetCost","预算成本","budgetWorkload","预算工作量","seqNo","顺序号","istatus","迭代状态0未结束1已结束","cuserid","创建人编号","cusername","创建人人姓名","remark","备注","iphase","迭代阶段:0未开始,1需求评审,2计划会,3研发中,4测试中,5迭代上线,6已完成7已关闭","isTpl","是否为模板","productId","产品编号";
+ * "id","迭代编码","branchId","机构编号","iterationName","迭代名称","startTime","开始时间","endTime","结束时间","onlineTime","上线时间","pid","上级迭代-作废,不以树状结构","adminUserid","负责人","adminUsername","负责人姓名","ctime","创建时间","budgetCost","预算成本","budgetWorkload","预算工作量","seqNo","顺序号","istatus","迭代状态0未结束1已结束","cuserid","创建人编号","cusername","创建人人姓名","remark","备注","iphase","迭代阶段:0未开始,1需求评审,2计划会,3研发中,4测试中,5迭代上线,6已完成7已关闭","isTpl","是否为模板","productId","产品编号","productName","产品名称";
* 当前主键(包括多主键):
* id;
*/
@@ -79,6 +79,9 @@ public class XmIteration implements java.io.Serializable {
@ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="")
String productId;
+
+ @ApiModelProperty(notes="产品名称",allowEmptyValue=true,example="",allowableValues="")
+ String productName;
/**
*迭代编码
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
index 969b6fca..b1e27f21 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmIterationMapper.xml
@@ -108,7 +108,7 @@
insert into xm_iteration(
) values (
- #{id},#{branchId},#{iterationName},#{startTime},#{endTime},#{onlineTime},#{pid},#{adminUserid},#{adminUsername},#{ctime},#{budgetCost},#{budgetWorkload},#{seqNo},#{istatus},#{cuserid},#{cusername},#{remark},#{iphase},#{isTpl},#{productId}
+ #{id},#{branchId},#{iterationName},#{startTime},#{endTime},#{onlineTime},#{pid},#{adminUserid},#{adminUsername},#{ctime},#{budgetCost},#{budgetWorkload},#{seqNo},#{istatus},#{cuserid},#{cusername},#{remark},#{iphase},#{isTpl},#{productId},#{productName}
)
@@ -183,7 +183,7 @@
- id,branch_id,iteration_name,start_time,end_time,online_time,pid,admin_userid,admin_username,ctime,budget_cost,budget_workload,seq_no,istatus,cuserid,cusername,remark,iphase,is_tpl,product_id
+ id,branch_id,iteration_name,start_time,end_time,online_time,pid,admin_userid,admin_username,ctime,budget_cost,budget_workload,seq_no,istatus,cuserid,cusername,remark,iphase,is_tpl,product_id,product_name
@@ -208,6 +208,7 @@
and res.iphase = #{iphase}
and res.is_tpl = #{isTpl}
and res.product_id = #{productId}
+ and res.product_name = #{productName}
@@ -229,7 +230,8 @@
remark = #{remark},
iphase = #{iphase},
is_tpl = #{isTpl},
- product_id = #{productId}
+ product_id = #{productId},
+ product_name = #{productName}
branch_id = #{branchId},
@@ -251,6 +253,7 @@
iphase = #{iphase},
is_tpl = #{isTpl},
product_id = #{productId},
+ product_name = #{productName},
@@ -272,6 +275,7 @@
remark = #{item.remark},
iphase = #{item.iphase},
is_tpl = #{item.isTpl},
- product_id = #{item.productId}
+ product_id = #{item.productId},
+ product_name = #{item.productName}
\ No newline at end of file