end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug

master
陈裕财 4 years ago
parent
6ff182efc8
commit
a0451d0b32
2 changed files with 124 additions and 241 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 223
      xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
  2. 142
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml

223
xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
View File

@ -1,19 +1,18 @@
package com.xm.core.entity;
package com.xm.core.entity;
import lombok.Data;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.util.Date; import java.util.Date;
/** /**
* 组织 com.qqkj 顶级模块 xm 大模块 core 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTestCase所有属性名: <br> * 实体 XmTestCase所有属性名: <br>
* id,caseName,caseRemark,testStep,expectResult,menuId,menuName,ctime,ltime,luserid,lusername,cbranchId,moduleId,moduleName,caseStatus;<br>
* 表 XM.xm_test_case 测试用例的所有字段名: <br>
* id,case_name,case_remark,test_step,expect_result,menu_id,menu_name,ctime,ltime,luserid,lusername,cbranch_id,module_id,module_name,case_status;<br>
* "id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态1正常0废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称";<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@Data
@ApiModel(description="测试用例") @ApiModel(description="测试用例")
public class XmTestCase implements java.io.Serializable { public class XmTestCase implements java.io.Serializable {
@ -35,10 +34,10 @@ public class XmTestCase implements java.io.Serializable {
@ApiModelProperty(notes="期望结果",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="期望结果",allowEmptyValue=true,example="",allowableValues="")
String expectResult; String expectResult;
@ApiModelProperty(notes="关联的需求",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="关联的故事",allowEmptyValue=true,example="",allowableValues="")
String menuId; String menuId;
@ApiModelProperty(notes="关联需求名",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="关联故事名",allowEmptyValue=true,example="",allowableValues="")
String menuName; String menuName;
@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
@ -64,196 +63,36 @@ public class XmTestCase implements java.io.Serializable {
@ApiModelProperty(notes="用例状态1正常0废弃",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="用例状态1正常0废弃",allowEmptyValue=true,example="",allowableValues="")
String caseStatus; String caseStatus;
@ApiModelProperty(notes="创建人编号",allowEmptyValue=true,example="",allowableValues="")
String cuserid;
@ApiModelProperty(notes="创建人姓名",allowEmptyValue=true,example="",allowableValues="")
String cusername;
@ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="")
String productId;
@ApiModelProperty(notes="版本号",allowEmptyValue=true,example="",allowableValues="")
String verNum;
@ApiModelProperty(notes="用例库编号",allowEmptyValue=true,example="",allowableValues="")
String casedbId;
@ApiModelProperty(notes="用例库名称",allowEmptyValue=true,example="",allowableValues="")
String casedbName;
/**主键**/
/**
*主键
**/
public XmTestCase(String id) { public XmTestCase(String id) {
this.id = id; this.id = id;
} }
/**测试用例**/
/**
* 测试用例
**/
public XmTestCase() { public XmTestCase() {
} }
/**
* 主键
**/
public void setId(String id) {
this.id = id;
}
/**
* 标题
**/
public void setCaseName(String caseName) {
this.caseName = caseName;
}
/**
* 备注
**/
public void setCaseRemark(String caseRemark) {
this.caseRemark = caseRemark;
}
/**
* 测试步骤
**/
public void setTestStep(String testStep) {
this.testStep = testStep;
}
/**
* 期望结果
**/
public void setExpectResult(String expectResult) {
this.expectResult = expectResult;
}
/**
* 关联的需求
**/
public void setMenuId(String menuId) {
this.menuId = menuId;
}
/**
* 关联需求名
**/
public void setMenuName(String menuName) {
this.menuName = menuName;
}
/**
* 创建时间
**/
public void setCtime(Date ctime) {
this.ctime = ctime;
}
/**
* 更新时间
**/
public void setLtime(Date ltime) {
this.ltime = ltime;
}
/**
* 更新人编号
**/
public void setLuserid(String luserid) {
this.luserid = luserid;
}
/**
* 更新人姓名
**/
public void setLusername(String lusername) {
this.lusername = lusername;
}
/**
* 创建机构
**/
public void setCbranchId(String cbranchId) {
this.cbranchId = cbranchId;
}
/**
* 模块编号
**/
public void setModuleId(String moduleId) {
this.moduleId = moduleId;
}
/**
* 模块名称
**/
public void setModuleName(String moduleName) {
this.moduleName = moduleName;
}
/**
* 用例状态1正常0废弃
**/
public void setCaseStatus(String caseStatus) {
this.caseStatus = caseStatus;
}
/**
* 主键
**/
public String getId() {
return this.id;
}
/**
* 标题
**/
public String getCaseName() {
return this.caseName;
}
/**
* 备注
**/
public String getCaseRemark() {
return this.caseRemark;
}
/**
* 测试步骤
**/
public String getTestStep() {
return this.testStep;
}
/**
* 期望结果
**/
public String getExpectResult() {
return this.expectResult;
}
/**
* 关联的需求
**/
public String getMenuId() {
return this.menuId;
}
/**
* 关联需求名
**/
public String getMenuName() {
return this.menuName;
}
/**
* 创建时间
**/
public Date getCtime() {
return this.ctime;
}
/**
* 更新时间
**/
public Date getLtime() {
return this.ltime;
}
/**
* 更新人编号
**/
public String getLuserid() {
return this.luserid;
}
/**
* 更新人姓名
**/
public String getLusername() {
return this.lusername;
}
/**
* 创建机构
**/
public String getCbranchId() {
return this.cbranchId;
}
/**
* 模块编号
**/
public String getModuleId() {
return this.moduleId;
}
/**
* 模块名称
**/
public String getModuleName() {
return this.moduleName;
}
/**
* 用例状态1正常0废弃
**/
public String getCaseStatus() {
return this.caseStatus;
}
} }

142
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
View File

@ -3,11 +3,35 @@
<mapper namespace="com.xm.core.entity.XmTestCase"> <mapper namespace="com.xm.core.entity.XmTestCase">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test=" ctimeStart !=null "> and res.ctime &gt; #{ctimeStart} </if>
<if test=" ctimeTimeEnd !=null "> and res.ctime &lt; #{ctimeTimeEnd} </if>
<if test=" myUserid!=null and myUserid!='' "> and (res.luserid=#{myUserid} or res.cuserid=#{myUserid})</if>
<if test=" compete!=null and compete!='' "> and (res.luserid=#{compete} or res.cuserid=#{compete})</if>
<if test="menuIds != null"> and
res.menu_id in
<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<if test="projectId !=null and projectId !=''"> and exists ( select 1 from xm_test_case_exec c where c.case_id=res.id and c.project_id=#{projectId} )</if>
<if test="(productId != null and productId !='') or (iterationId!=null and iterationId!='')"> and exists( select 1 from xm_menu m where m.menu_id =res.menu_id
<if test="productId != null and productId !=''" >and m.product_id=#{productId} </if>
<if test="iterationId != null and iterationId !=''" >and m.iteration_id=#{iterationId} </if>
)
</if>
<if test="key != null and key !='' "> and res.case_name like #{key} </if>
</sql>
<!--结束 自定义sql函数区域--> <!--结束 自定义sql函数区域-->
@ -15,32 +39,9 @@
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select * from xm_test_case res select * from xm_test_case res
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<if test=" ctimeStart !=null "> and res.ctime &gt; #{ctimeStart} </if>
<if test=" ctimeTimeEnd !=null "> and res.ctime &lt; #{ctimeTimeEnd} </if>
<where>
<include refid="whereForMap"/>
<include refid="where"/> <include refid="where"/>
<if test=" myUserid!=null and myUserid!='' "> and (res.luserid=#{myUserid} or res.cuserid=#{myUserid})</if>
<if test=" compete!=null and compete!='' "> and (res.luserid=#{compete} or res.cuserid=#{compete})</if>
<if test="menuIds != null"> and
res.menu_id in
<foreach collection="menuIds" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<if test="projectId !=null and projectId !=''"> and exists ( select 1 from xm_test_case_exec c where c.case_id=res.id and c.project_id=#{projectId} )</if>
<if test="(productId != null and productId !='') or (iterationId!=null and iterationId!='')"> and exists( select 1 from xm_menu m where m.menu_id =res.menu_id
<if test="productId != null and productId !=''" >and m.product_id=#{productId} </if>
<if test="iterationId != null and iterationId !=''" >and m.iteration_id=#{iterationId} </if>
)
</if>
<if test="key != null and key !='' "> and res.case_name like #{key} </if>
</where> </where>
</select> </select>
@ -58,7 +59,13 @@
where where
res.id = #{id} res.id = #{id}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmTestCase">
select * from xm_test_case res
where (res.id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_test_case res select * from xm_test_case res
@ -67,17 +74,17 @@
</select> </select>
<!-- 获取数据条目 返回long --> <!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmTestCase" resultType="long"> <select id="countByWhere" parameterType="com.xm.core.entity.XmTestCase" resultType="long">
select count(1) from xm_test_case res
select count(*) from xm_test_case res
<where> <where>
<include refid="where"/> <include refid="where"/>
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmTestCase" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmTestCase" useGeneratedKeys="false" keyProperty="id">
insert into xm_test_case( insert into xm_test_case(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus}
#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus},#{cuserid},#{cusername},#{productId},#{verNum},#{casedbId},#{casedbName}
) )
</insert> </insert>
@ -91,13 +98,13 @@
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmTestCase"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmTestCase">
delete from xm_test_case
delete from xm_test_case
where id = #{id} where id = #{id}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
<update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmTestCase"> <update id="updateSomeFieldByPk" parameterType="com.xm.core.entity.XmTestCase">
update xm_test_case
update xm_test_case
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
@ -106,7 +113,7 @@
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
<update id="updateByPk" parameterType="com.xm.core.entity.XmTestCase"> <update id="updateByPk" parameterType="com.xm.core.entity.XmTestCase">
update xm_test_case
update xm_test_case
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
@ -121,27 +128,40 @@
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="batchUpdate" parameterType="List"> <update id="batchUpdate" parameterType="List">
<foreach collection="list" item="item" index="index" separator=";" > <foreach collection="list" item="item" index="index" separator=";" >
update xm_test_case
update xm_test_case
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id} where id = #{item.id}
</foreach> </foreach>
</update> </update>
<!-- 批量修改某几个字段 -->
<delete id="editSomeFields" parameterType="HashMap">
update xm_test_case
<set>
<include refid="someFieldSet"/>
</set>
where (id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</delete>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_test_case
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
delete from xm_test_case
where
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id} )
</foreach>
</delete> </delete>
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,case_name,case_remark,test_step,expect_result,menu_id,menu_name,ctime,ltime,luserid,lusername,cbranch_id,module_id,module_name,case_status
id,case_name,case_remark,test_step,expect_result,menu_id,menu_name,ctime,ltime,luserid,lusername,cbranch_id,module_id,module_name,case_status,cuserid,cusername,product_id,ver_num,casedb_id,casedb_name
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
<sql id="where"> <sql id="where">
<if test="id != null and id != ''"> and res.id = #{id} </if> <if test="id != null and id != ''"> and res.id = #{id} </if>
@ -151,14 +171,20 @@
<if test="expectResult != null and expectResult != ''"> and res.expect_result = #{expectResult} </if> <if test="expectResult != null and expectResult != ''"> and res.expect_result = #{expectResult} </if>
<if test="menuId != null and menuId != ''"> and res.menu_id = #{menuId} </if> <if test="menuId != null and menuId != ''"> and res.menu_id = #{menuId} </if>
<if test="menuName != null and menuName != ''"> and res.menu_name = #{menuName} </if> <if test="menuName != null and menuName != ''"> and res.menu_name = #{menuName} </if>
<if test="ctime != null"> and TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD') </if>
<if test="ltime != null"> and TO_CHAR(res.ltime,'YYYY-MM-DD') = TO_CHAR(#{ltime},'YYYY-MM-DD') </if>
<if test="ctime != null"> and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') </if>
<if test="ltime != null"> and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') </if>
<if test="luserid != null and luserid != ''"> and res.luserid = #{luserid} </if> <if test="luserid != null and luserid != ''"> and res.luserid = #{luserid} </if>
<if test="lusername != null and lusername != ''"> and res.lusername = #{lusername} </if> <if test="lusername != null and lusername != ''"> and res.lusername = #{lusername} </if>
<if test="cbranchId != null and cbranchId != ''"> and res.cbranch_id = #{cbranchId} </if> <if test="cbranchId != null and cbranchId != ''"> and res.cbranch_id = #{cbranchId} </if>
<if test="moduleId != null and moduleId != ''"> and res.module_id = #{moduleId} </if> <if test="moduleId != null and moduleId != ''"> and res.module_id = #{moduleId} </if>
<if test="moduleName != null and moduleName != ''"> and res.module_name = #{moduleName} </if> <if test="moduleName != null and moduleName != ''"> and res.module_name = #{moduleName} </if>
<if test="caseStatus != null and caseStatus != ''"> and res.case_status = #{caseStatus} </if> <if test="caseStatus != null and caseStatus != ''"> and res.case_status = #{caseStatus} </if>
<if test="cuserid != null and cuserid != ''"> and res.cuserid = #{cuserid} </if>
<if test="cusername != null and cusername != ''"> and res.cusername = #{cusername} </if>
<if test="productId != null and productId != ''"> and res.product_id = #{productId} </if>
<if test="verNum != null and verNum != ''"> and res.ver_num = #{verNum} </if>
<if test="casedbId != null and casedbId != ''"> and res.casedb_id = #{casedbId} </if>
<if test="casedbName != null and casedbName != ''"> and res.casedb_name = #{casedbName} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -175,7 +201,13 @@
cbranch_id = #{cbranchId}, cbranch_id = #{cbranchId},
module_id = #{moduleId}, module_id = #{moduleId},
module_name = #{moduleName}, module_name = #{moduleName},
case_status = #{caseStatus}
case_status = #{caseStatus},
cuserid = #{cuserid},
cusername = #{cusername},
product_id = #{productId},
ver_num = #{verNum},
casedb_id = #{casedbId},
casedb_name = #{casedbName}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="caseName != null and caseName != ''"> case_name = #{caseName}, </if> <if test="caseName != null and caseName != ''"> case_name = #{caseName}, </if>
@ -192,6 +224,12 @@
<if test="moduleId != null and moduleId != ''"> module_id = #{moduleId}, </if> <if test="moduleId != null and moduleId != ''"> module_id = #{moduleId}, </if>
<if test="moduleName != null and moduleName != ''"> module_name = #{moduleName}, </if> <if test="moduleName != null and moduleName != ''"> module_name = #{moduleName}, </if>
<if test="caseStatus != null and caseStatus != ''"> case_status = #{caseStatus}, </if> <if test="caseStatus != null and caseStatus != ''"> case_status = #{caseStatus}, </if>
<if test="cuserid != null and cuserid != ''"> cuserid = #{cuserid}, </if>
<if test="cusername != null and cusername != ''"> cusername = #{cusername}, </if>
<if test="productId != null and productId != ''"> product_id = #{productId}, </if>
<if test="verNum != null and verNum != ''"> ver_num = #{verNum}, </if>
<if test="casedbId != null and casedbId != ''"> casedb_id = #{casedbId}, </if>
<if test="casedbName != null and casedbName != ''"> casedb_name = #{casedbName}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -208,6 +246,12 @@
cbranch_id = #{item.cbranchId}, cbranch_id = #{item.cbranchId},
module_id = #{item.moduleId}, module_id = #{item.moduleId},
module_name = #{item.moduleName}, module_name = #{item.moduleName},
case_status = #{item.caseStatus}
case_status = #{item.caseStatus},
cuserid = #{item.cuserid},
cusername = #{item.cusername},
product_id = #{item.productId},
ver_num = #{item.verNum},
casedb_id = #{item.casedbId},
casedb_name = #{item.casedbName}
</sql> </sql>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save