diff --git a/xm-core/src/main/java/com/xm/core/entity/XmRptConfig.java b/xm-core/src/main/java/com/xm/core/entity/XmRptConfig.java index a670c084..90424cf5 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmRptConfig.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmRptConfig.java @@ -8,7 +8,7 @@ import java.util.Date; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmRptConfig所有属性名:
- * "bizId","业务编号","id","报告编号","name","报告名称","cuserid","创建人","cusername","创建人姓名","ctime","创建时间","cbranchId","创建机构","cfg","报告配置项";
+ * "bizId","业务编号","id","报告编号","name","报告名称","cuserid","创建人","cusername","创建人姓名","ctime","创建时间","cbranchId","创建机构","cfg","报告配置项","bizType","业务类型1-产品报告,2-迭代报告,3-测试计划报告,4-项目报告,5-企业报告,6-测试库报告";
* 当前主键(包括多主键):
* id;
*/ @@ -42,6 +42,9 @@ public class XmRptConfig implements java.io.Serializable { @ApiModelProperty(notes="报告配置项",allowEmptyValue=true,example="",allowableValues="") String cfg; + + @ApiModelProperty(notes="业务类型1-产品报告,2-迭代报告,3-测试计划报告,4-项目报告,5-企业报告,6-测试库报告",allowEmptyValue=true,example="",allowableValues="") + String bizType; /** *报告编号 diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml index d0d14c15..8417bbf2 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmRptConfigMapper.xml @@ -67,7 +67,7 @@ insert into xm_rpt_config( ) values ( - #{bizId},#{id},#{name},#{cuserid},#{cusername},#{ctime},#{cbranchId},#{cfg} + #{bizId},#{id},#{name},#{cuserid},#{cusername},#{ctime},#{cbranchId},#{cfg},#{bizType} ) @@ -142,7 +142,7 @@ - biz_id,id,name,cuserid,cusername,ctime,cbranch_id,cfg + biz_id,id,name,cuserid,cusername,ctime,cbranch_id,cfg,biz_type @@ -155,6 +155,7 @@ and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') and res.cbranch_id = #{cbranchId} and res.cfg = #{cfg} + and res.biz_type = #{bizType} @@ -164,7 +165,8 @@ cusername = #{cusername}, ctime = #{ctime}, cbranch_id = #{cbranchId}, - cfg = #{cfg} + cfg = #{cfg}, + biz_type = #{bizType} biz_id = #{bizId}, @@ -174,6 +176,7 @@ ctime = #{ctime}, cbranch_id = #{cbranchId}, cfg = #{cfg}, + biz_type = #{bizType}, @@ -183,6 +186,7 @@ cusername = #{item.cusername}, ctime = #{item.ctime}, cbranch_id = #{item.cbranchId}, - cfg = #{item.cfg} + cfg = #{item.cfg}, + biz_type = #{item.bizType} \ No newline at end of file