rptConfig

xm-core/src/main/java/com/xm/core/entity/XmTestPlan.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmTestPlan所有属性名: <br>
- *	"id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结";<br>
+ *	"id","测试计划编号","name","计划名称","casedbId","用例库编号","casedbName","用例库名称","projectId","项目编号","projectName","项目名称","cuserid","创建人编号","cusername","创建人名称","ctime","创建时间","stime","开始时间","etime","结束时间","status","状态0-未开始，1-进行中，2已结束","tcode","测试结果0未通过，1已通过","totalCases","总用例数","okCases","通过用例数","errCases","失败用例数","igCases","忽略用例数","blCases","阻塞用例数","productId","产品编号","productName","产品名称","flowState","评审结果0-待评审，1-已评审通过，2-已拒绝","bugCnt","bug数目","closedBugs","已关闭bug总数","resolvedBugs","已解决bug总数","activeBugs","激活的bug总数","confirmedBugs","已解决bug总数","menus","需求数目","funcs","功能模块数","budgetWorkload","预算工时","actWorkload","实际工时","summaryRemark","报告总结","cbranchId","创建机构编号";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -113,6 +113,9 @@ public class XmTestPlan  implements java.io.Serializable {
 	@ApiModelProperty(notes="报告总结",allowEmptyValue=true,example="",allowableValues="")
 	String summaryRemark;
 	
+	@ApiModelProperty(notes="创建机构编号",allowEmptyValue=true,example="",allowableValues="")
+	String cbranchId;
+
 	/**
 	 *测试计划编号
 	 **/

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

@@ -67,7 +67,7 @@
 		insert into xm_test_plan(
 			<include refid="columns"/>
 		) values (
-		#{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark}
+		#{id},#{name},#{casedbId},#{casedbName},#{projectId},#{projectName},#{cuserid},#{cusername},#{ctime},#{stime},#{etime},#{status},#{tcode},#{totalCases},#{okCases},#{errCases},#{igCases},#{blCases},#{productId},#{productName},#{flowState},#{bugCnt},#{closedBugs},#{resolvedBugs},#{activeBugs},#{confirmedBugs},#{menus},#{funcs},#{budgetWorkload},#{actWorkload},#{summaryRemark},#{cbranchId}
 		)
 	</insert>
 	
@@ -142,7 +142,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,name,casedb_id,casedb_name,project_id,project_name,cuserid,cusername,ctime,stime,etime,status,tcode,total_cases,ok_cases,err_cases,ig_cases,bl_cases,product_id,product_name,flow_state,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,menus,funcs,budget_workload,act_workload,summary_remark
+		id,name,casedb_id,casedb_name,project_id,project_name,cuserid,cusername,ctime,stime,etime,status,tcode,total_cases,ok_cases,err_cases,ig_cases,bl_cases,product_id,product_name,flow_state,bug_cnt,closed_bugs,resolved_bugs,active_bugs,confirmed_bugs,menus,funcs,budget_workload,act_workload,summary_remark,cbranch_id
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -178,6 +178,7 @@
 		<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="summaryRemark != null and summaryRemark != ''">      and res.summary_remark = #{summaryRemark}     </if>
+		<if test="cbranchId != null and cbranchId != ''">      and res.cbranch_id = #{cbranchId}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -210,7 +211,8 @@
 		funcs = #{funcs},
 		budget_workload = #{budgetWorkload},
 		act_workload = #{actWorkload},
-		summary_remark = #{summaryRemark}
+		summary_remark = #{summaryRemark},
+		cbranch_id = #{cbranchId}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="name != null and name != ''"> name = #{name},     </if>
@@ -243,6 +245,7 @@
 		<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload},     </if>
 		<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload},     </if>
 		<if test="summaryRemark != null and summaryRemark != ''"> summary_remark = #{summaryRemark},     </if>
+		<if test="cbranchId != null and cbranchId != ''"> cbranch_id = #{cbranchId},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -275,6 +278,7 @@
 			funcs = #{item.funcs},
 			budget_workload = #{item.budgetWorkload},
 			act_workload = #{item.actWorkload},
-			summary_remark = #{item.summaryRemark}
+			summary_remark = #{item.summaryRemark},
+			cbranch_id = #{item.cbranchId}
 	</sql>
 </mapper>