diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
index 9ad7e50b..17fdaa6b 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
@@ -7,9 +7,9 @@ import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProduct所有属性名:
- * id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assistantUserid,assistantUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime;
+ * id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assistantUserid,assistantUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime,code;
* 表 xm_product 产品表的所有字段名:
- * id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,assistant_userid,assistant_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time;
+ * id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,assistant_userid,assistant_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code;
* 当前主键(包括多主键):
* id;
*/
@@ -84,6 +84,9 @@ public class XmProduct implements java.io.Serializable {
@ApiModelProperty(notes="基线时间",allowEmptyValue=true,example="",allowableValues="")
Date baseTime;
+
+ @ApiModelProperty(notes="产品编码",allowEmptyValue=true,example="",allowableValues="")
+ String code;
/**产品编号**/
public XmProduct(String id) {
@@ -226,6 +229,12 @@ public class XmProduct implements java.io.Serializable {
public void setBaseTime(Date baseTime) {
this.baseTime = baseTime;
}
+ /**
+ * 产品编码
+ **/
+ public void setCode(String code) {
+ this.code = code;
+ }
/**
* 产品编号
@@ -359,5 +368,11 @@ public class XmProduct implements java.io.Serializable {
public Date getBaseTime() {
return this.baseTime;
}
+ /**
+ * 产品编码
+ **/
+ public String getCode() {
+ return this.code;
+ }
}
\ No newline at end of file
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
index 20ade564..68e901fd 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
@@ -99,7 +99,7 @@
insert into xm_product(
) values (
- #{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid},#{pstatus},#{startTime},#{endTime},#{deptName},#{admUserid},#{admUsername},#{assistantUserid},#{assistantUsername},#{bizProcInstId},#{bizFlowState},#{isTpl},#{baselineId},#{baseTime}
+ #{id},#{productName},#{branchId},#{remark},#{version},#{pmUserid},#{pmUsername},#{ctime},#{deptid},#{pstatus},#{startTime},#{endTime},#{deptName},#{admUserid},#{admUsername},#{assistantUserid},#{assistantUsername},#{bizProcInstId},#{bizFlowState},#{isTpl},#{baselineId},#{baseTime},#{code}
)
@@ -162,7 +162,7 @@
- id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,assistant_userid,assistant_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time
+ id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,assistant_userid,assistant_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code
@@ -189,6 +189,7 @@
and res.is_tpl = #{isTpl}
and res.baseline_id = #{baselineId}
and date_format(res.base_time,'%Y-%m-%d') = date_format(#{baseTime},'%Y-%m-%d')
+ and res.code = #{code}
@@ -212,7 +213,8 @@
biz_flow_state = #{bizFlowState},
is_tpl = #{isTpl},
baseline_id = #{baselineId},
- base_time = #{baseTime}
+ base_time = #{baseTime},
+ code = #{code}
product_name = #{productName},
@@ -236,6 +238,7 @@
is_tpl = #{isTpl},
baseline_id = #{baselineId},
base_time = #{baseTime},
+ code = #{code},
@@ -259,6 +262,7 @@
biz_flow_state = #{item.bizFlowState},
is_tpl = #{item.isTpl},
baseline_id = #{item.baselineId},
- base_time = #{item.baseTime}
+ base_time = #{item.baseTime},
+ code = #{item.code}
\ No newline at end of file