Browse Source

投标直通车

master
陈裕财 3 years ago
parent
commit
dff3c0e9be
  1. 12
      xm-core/src/main/java/com/xm/core/entity/XmTestCase.java
  2. 12
      xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java
  3. 20
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml
  4. 20
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml

12
xm-core/src/main/java/com/xm/core/entity/XmTestCase.java

@ -4,11 +4,12 @@ import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTestCase所有属性名: <br>
* "id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态1正常0废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级菜单名称列表逗号分割","preRemark","前置条件描述","caseType","用例类型","cpriority","优先级";<br>
* "id","主键","caseName","标题","caseRemark","备注","testStep","测试步骤","expectResult","期望结果","menuId","关联的故事","menuName","关联故事名","ctime","创建时间","ltime","更新时间","luserid","更新人编号","lusername","更新人姓名","cbranchId","创建机构","moduleId","模块编号","moduleName","模块名称","caseStatus","用例状态1正常0废弃","cuserid","创建人编号","cusername","创建人姓名","productId","产品编号","verNum","版本号","casedbId","用例库编号","casedbName","用例库名称","funcId","功能菜单编号","funcName","功能菜单名称","funcPnames","上级菜单名称列表逗号分割","preRemark","前置条件描述","caseType","用例类型","cpriority","优先级","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时";<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ -99,6 +100,15 @@ public class XmTestCase implements java.io.Serializable {
@ApiModelProperty(notes="优先级",allowEmptyValue=true,example="",allowableValues="")
String cpriority;
@ApiModelProperty(notes="预算工时",allowEmptyValue=true,example="",allowableValues="")
BigDecimal budgetWorkload;
@ApiModelProperty(notes="实际工时",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actWorkload;
@ApiModelProperty(notes="原估工时",allowEmptyValue=true,example="",allowableValues="")
BigDecimal initWorkload;
/**
*主键

12
xm-core/src/main/java/com/xm/core/entity/XmTestPlanCase.java

@ -4,11 +4,12 @@ import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTestPlanCase所有属性名: <br>
* "bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测,1-通过,2-受阻,3-忽略,4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号";<br>
* "bugs","bug数目","execUserid","执行人","caseId","测试用例编号","ltime","更新时间","ctime","创建时间","execStatus","0-未测,1-通过,2-受阻,3-忽略,4-失败","execUsername","执行人姓名","priority","优先级","remark","执行备注","testStep","测试步骤","planId","计划编号","projectId","项目编号","budgetWorkload","预算工时","actWorkload","实际工时","initWorkload","原估工时";<br>
* 当前主键(包括多主键):<br>
* case_id,plan_id;<br>
*/
@ -54,6 +55,15 @@ public class XmTestPlanCase implements java.io.Serializable {
@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
String projectId;
@ApiModelProperty(notes="预算工时",allowEmptyValue=true,example="",allowableValues="")
BigDecimal budgetWorkload;
@ApiModelProperty(notes="实际工时",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actWorkload;
@ApiModelProperty(notes="原估工时",allowEmptyValue=true,example="",allowableValues="")
BigDecimal initWorkload;
/**
*测试用例编号,计划编号

20
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestCaseMapper.xml

@ -89,7 +89,7 @@
insert into xm_test_case(
<include refid="columns"/>
) values (
#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus},#{cuserid},#{cusername},#{productId},#{verNum},#{casedbId},#{casedbName},#{funcId},#{funcName},#{funcPnames},#{preRemark},#{caseType},#{cpriority}
#{id},#{caseName},#{caseRemark},#{testStep},#{expectResult},#{menuId},#{menuName},#{ctime},#{ltime},#{luserid},#{lusername},#{cbranchId},#{moduleId},#{moduleName},#{caseStatus},#{cuserid},#{cusername},#{productId},#{verNum},#{casedbId},#{casedbName},#{funcId},#{funcName},#{funcPnames},#{preRemark},#{caseType},#{cpriority},#{budgetWorkload},#{actWorkload},#{initWorkload}
)
</insert>
@ -164,7 +164,7 @@
<!--sql片段 列-->
<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,cuserid,cusername,product_id,ver_num,casedb_id,casedb_name,func_id,func_name,func_pnames,pre_remark,case_type,cpriority
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,func_id,func_name,func_pnames,pre_remark,case_type,cpriority,budget_workload,act_workload,init_workload
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -196,6 +196,9 @@
<if test="preRemark != null and preRemark != ''"> and res.pre_remark = #{preRemark} </if>
<if test="caseType != null and caseType != ''"> and res.case_type = #{caseType} </if>
<if test="cpriority != null and cpriority != ''"> and res.cpriority = #{cpriority} </if>
<if test="budgetWorkload != null and budgetWorkload != ''"> and res.budget_workload = #{budgetWorkload} </if>
<if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if>
<if test="initWorkload != null and initWorkload != ''"> and res.init_workload = #{initWorkload} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -224,7 +227,10 @@
func_pnames = #{funcPnames},
pre_remark = #{preRemark},
case_type = #{caseType},
cpriority = #{cpriority}
cpriority = #{cpriority},
budget_workload = #{budgetWorkload},
act_workload = #{actWorkload},
init_workload = #{initWorkload}
</sql>
<sql id="someFieldSet">
<if test="caseName != null and caseName != ''"> case_name = #{caseName}, </if>
@ -253,6 +259,9 @@
<if test="preRemark != null and preRemark != ''"> pre_remark = #{preRemark}, </if>
<if test="caseType != null and caseType != ''"> case_type = #{caseType}, </if>
<if test="cpriority != null and cpriority != ''"> cpriority = #{cpriority}, </if>
<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload}, </if>
<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload}, </if>
<if test="initWorkload != null and initWorkload != ''"> init_workload = #{initWorkload}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -281,6 +290,9 @@
func_pnames = #{item.funcPnames},
pre_remark = #{item.preRemark},
case_type = #{item.caseType},
cpriority = #{item.cpriority}
cpriority = #{item.cpriority},
budget_workload = #{item.budgetWorkload},
act_workload = #{item.actWorkload},
init_workload = #{item.initWorkload}
</sql>
</mapper>

20
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTestPlanCaseMapper.xml

@ -94,7 +94,7 @@
insert into xm_test_plan_case(
<include refid="columns"/>
) values (
#{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId}
#{bugs},#{execUserid},#{caseId},#{ltime},#{ctime},#{execStatus},#{execUsername},#{priority},#{remark},#{testStep},#{planId},#{projectId},#{budgetWorkload},#{actWorkload},#{initWorkload}
)
</insert>
@ -169,7 +169,7 @@
<!--sql片段 列-->
<sql id="columns">
bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id,project_id
bugs,exec_userid,case_id,ltime,ctime,exec_status,exec_username,priority,remark,test_step,plan_id,project_id,budget_workload,act_workload,init_workload
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -186,6 +186,9 @@
<if test="testStep != null and testStep != ''"> and res.test_step = #{testStep} </if>
<if test="planId != null and planId != ''"> and res.plan_id = #{planId} </if>
<if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if>
<if test="budgetWorkload != null and budgetWorkload != ''"> and res.budget_workload = #{budgetWorkload} </if>
<if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if>
<if test="initWorkload != null and initWorkload != ''"> and res.init_workload = #{initWorkload} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -198,7 +201,10 @@
priority = #{priority},
remark = #{remark},
test_step = #{testStep},
project_id = #{projectId}
project_id = #{projectId},
budget_workload = #{budgetWorkload},
act_workload = #{actWorkload},
init_workload = #{initWorkload}
</sql>
<sql id="someFieldSet">
<if test="bugs != null and bugs != ''"> bugs = #{bugs}, </if>
@ -211,6 +217,9 @@
<if test="remark != null and remark != ''"> remark = #{remark}, </if>
<if test="testStep != null and testStep != ''"> test_step = #{testStep}, </if>
<if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if>
<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload}, </if>
<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload}, </if>
<if test="initWorkload != null and initWorkload != ''"> init_workload = #{initWorkload}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -223,6 +232,9 @@
priority = #{item.priority},
remark = #{item.remark},
test_step = #{item.testStep},
project_id = #{item.projectId}
project_id = #{item.projectId},
budget_workload = #{item.budgetWorkload},
act_workload = #{item.actWorkload},
init_workload = #{item.initWorkload}
</sql>
</mapper>
Loading…
Cancel
Save