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

重新生成工时表

master
陈裕财 4 years ago
parent
34fcf4fb1a
commit
901f0fb6da
2 changed files with 56 additions and 37 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. 39
      xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
  2. 54
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml

39
xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
View File

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmQuestion所有属性名: <br> * 实体 XmQuestion所有属性名: <br>
* id,name,projectId,projectName,caseId,caseName,endTime,askUserid,askUsername,handlerUserid,handlerUsername,priority,solution,description,createUserid,createUsername,createTime,bugStatus,bizProcInstId,bizFlowState,menuId,menuName,budgetWorkload,budgetCost,actWorkload,actCost,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,caseExecId,remarks,productId,repRate,verNum,vpath,pverNum,bugReason,rate,initWorkload;<br>
* id,name,projectId,projectName,caseId,caseName,endTime,askUserid,askUsername,handlerUserid,handlerUsername,priority,solution,description,createUserid,createUsername,createTime,bugStatus,bizProcInstId,bizFlowState,menuId,menuName,budgetWorkload,budgetAt,actWorkload,actAt,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,caseExecId,remarks,productId,repRate,verNum,vpath,pverNum,bugReason,rate,initWorkload,taskOut;<br>
* 表 xm_question xm_question的所有字段名: <br> * 表 xm_question xm_question的所有字段名: <br>
* id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_cost,act_workload,act_cost,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,init_workload;<br>
* id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_at,act_workload,act_at,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,init_workload,task_out;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -90,13 +90,13 @@ public class XmQuestion implements java.io.Serializable {
BigDecimal budgetWorkload; BigDecimal budgetWorkload;
@ApiModelProperty(notes="预估成本金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="预估成本金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal budgetCost;
BigDecimal budgetAt;
@ApiModelProperty(notes="实际工时（取报工实际工时汇总）",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="实际工时（取报工实际工时汇总）",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actWorkload; BigDecimal actWorkload;
@ApiModelProperty(notes="实际总金额",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="实际总金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal actCost;
BigDecimal actAt;
@ApiModelProperty(notes="期望结果",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="期望结果",allowEmptyValue=true,example="",allowableValues="")
String expectResult; String expectResult;
@ -161,6 +161,9 @@ public class XmQuestion implements java.io.Serializable {
@ApiModelProperty(notes="原始预估工作量，budget_workload发生变化后，进行备份",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="原始预估工作量，budget_workload发生变化后，进行备份",allowEmptyValue=true,example="",allowableValues="")
BigDecimal initWorkload; BigDecimal initWorkload;
@ApiModelProperty(notes="是否众包0否1是",allowEmptyValue=true,example="",allowableValues="")
String taskOut;
/**问题编号**/ /**问题编号**/
public XmQuestion(String id) { public XmQuestion(String id) {
this.id = id; this.id = id;
@ -311,8 +314,8 @@ public class XmQuestion implements java.io.Serializable {
/** /**
* 预估成本金额 * 预估成本金额
**/ **/
public void setBudgetCost(BigDecimal budgetCost) {
this.budgetCost = budgetCost;
public void setBudgetAt(BigDecimal budgetAt) {
this.budgetAt = budgetAt;
} }
/** /**
* 实际工时（取报工实际工时汇总） * 实际工时（取报工实际工时汇总）
@ -323,8 +326,8 @@ public class XmQuestion implements java.io.Serializable {
/** /**
* 实际总金额 * 实际总金额
**/ **/
public void setActCost(BigDecimal actCost) {
this.actCost = actCost;
public void setActAt(BigDecimal actAt) {
this.actAt = actAt;
} }
/** /**
* 期望结果 * 期望结果
@ -452,6 +455,12 @@ public class XmQuestion implements java.io.Serializable {
public void setInitWorkload(BigDecimal initWorkload) { public void setInitWorkload(BigDecimal initWorkload) {
this.initWorkload = initWorkload; this.initWorkload = initWorkload;
} }
/**
* 是否众包0否1是
**/
public void setTaskOut(String taskOut) {
this.taskOut = taskOut;
}
/** /**
* 问题编号 * 问题编号
@ -594,8 +603,8 @@ public class XmQuestion implements java.io.Serializable {
/** /**
* 预估成本金额 * 预估成本金额
**/ **/
public BigDecimal getBudgetCost() {
return this.budgetCost;
public BigDecimal getBudgetAt() {
return this.budgetAt;
} }
/** /**
* 实际工时（取报工实际工时汇总） * 实际工时（取报工实际工时汇总）
@ -606,8 +615,8 @@ public class XmQuestion implements java.io.Serializable {
/** /**
* 实际总金额 * 实际总金额
**/ **/
public BigDecimal getActCost() {
return this.actCost;
public BigDecimal getActAt() {
return this.actAt;
} }
/** /**
* 期望结果 * 期望结果
@ -735,5 +744,11 @@ public class XmQuestion implements java.io.Serializable {
public BigDecimal getInitWorkload() { public BigDecimal getInitWorkload() {
return this.initWorkload; return this.initWorkload;
} }
/**
* 是否众包0否1是
**/
public String getTaskOut() {
return this.taskOut;
}
} }

54
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml
View File

@ -35,18 +35,6 @@
<if test="linkIterationId != null and linkIterationId != ''"> and exists (select 1 from xm_menu m where m.iteration_id=#{linkIterationId} and m.menu_id=res.menu_id) </if> <if test="linkIterationId != null and linkIterationId != ''"> and exists (select 1 from xm_menu m where m.iteration_id=#{linkIterationId} and m.menu_id=res.menu_id) </if>
</sql> </sql>
<update id="editSomeFields" parameterType="HashMap">
update xm_question
<set>
<include refid="someFieldSet"/>
</set>
where id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</update>
<select id="getXmQuestionAttDist" parameterType="HashMap" resultType="HashMap"> <select id="getXmQuestionAttDist" parameterType="HashMap" resultType="HashMap">
select count(*) as value,${groupBy} as name from xm_question res select count(*) as value,${groupBy} as name from xm_question res
<where> <where>
@ -121,7 +109,7 @@
</select> </select>
<!-- 获取数据条目 返回long --> <!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmQuestion" resultType="long"> <select id="countByWhere" parameterType="com.xm.core.entity.XmQuestion" resultType="long">
select count(1) from xm_question res
select count(*) from xm_question res
<where> <where>
<include refid="where"/> <include refid="where"/>
</where> </where>
@ -131,7 +119,7 @@
insert into xm_question( insert into xm_question(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{budgetWorkload},#{budgetCost},#{actWorkload},#{actCost},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{caseExecId},#{remarks},#{productId},#{repRate},#{verNum},#{vpath},#{pverNum},#{bugReason},#{rate},#{initWorkload}
#{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{budgetWorkload},#{budgetAt},#{actWorkload},#{actAt},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{caseExecId},#{remarks},#{productId},#{repRate},#{verNum},#{vpath},#{pverNum},#{bugReason},#{rate},#{initWorkload},#{taskOut}
) )
</insert> </insert>
@ -181,6 +169,18 @@
where id = #{item.id} where id = #{item.id}
</foreach> </foreach>
</update> </update>
<!-- 批量修改某几个字段 -->
<delete id="editSomeFields" parameterType="HashMap">
update xm_question
<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_question delete from xm_question
@ -194,7 +194,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_cost,act_workload,act_cost,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,init_workload
id,name,project_id,project_name,case_id,case_name,end_time,ask_userid,ask_username,handler_userid,handler_username,priority,solution,description,create_userid,create_username,create_time,bug_status,biz_proc_inst_id,biz_flow_state,menu_id,menu_name,budget_workload,budget_at,act_workload,act_at,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,init_workload,task_out
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -222,9 +222,9 @@
<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="budgetWorkload != null and budgetWorkload != ''"> and res.budget_workload = #{budgetWorkload} </if> <if test="budgetWorkload != null and budgetWorkload != ''"> and res.budget_workload = #{budgetWorkload} </if>
<if test="budgetCost != null and budgetCost != ''"> and res.budget_cost = #{budgetCost} </if>
<if test="budgetAt != null and budgetAt != ''"> and res.budget_at = #{budgetAt} </if>
<if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if> <if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if>
<if test="actCost != null and actCost != ''"> and res.act_cost = #{actCost} </if>
<if test="actAt != null and actAt != ''"> and res.act_at = #{actAt} </if>
<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="opStep != null and opStep != ''"> and res.op_step = #{opStep} </if> <if test="opStep != null and opStep != ''"> and res.op_step = #{opStep} </if>
<if test="currResult != null and currResult != ''"> and res.curr_result = #{currResult} </if> <if test="currResult != null and currResult != ''"> and res.curr_result = #{currResult} </if>
@ -246,6 +246,7 @@
<if test="bugReason != null and bugReason != ''"> and res.bug_reason = #{bugReason} </if> <if test="bugReason != null and bugReason != ''"> and res.bug_reason = #{bugReason} </if>
<if test="rate != null and rate != ''"> and res.rate = #{rate} </if> <if test="rate != null and rate != ''"> and res.rate = #{rate} </if>
<if test="initWorkload != null and initWorkload != ''"> and res.init_workload = #{initWorkload} </if> <if test="initWorkload != null and initWorkload != ''"> and res.init_workload = #{initWorkload} </if>
<if test="taskOut != null and taskOut != ''"> and res.task_out = #{taskOut} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -271,9 +272,9 @@
menu_id = #{menuId}, menu_id = #{menuId},
menu_name = #{menuName}, menu_name = #{menuName},
budget_workload = #{budgetWorkload}, budget_workload = #{budgetWorkload},
budget_cost = #{budgetCost},
budget_at = #{budgetAt},
act_workload = #{actWorkload}, act_workload = #{actWorkload},
act_cost = #{actCost},
act_at = #{actAt},
expect_result = #{expectResult}, expect_result = #{expectResult},
op_step = #{opStep}, op_step = #{opStep},
curr_result = #{currResult}, curr_result = #{currResult},
@ -294,7 +295,8 @@
pver_num = #{pverNum}, pver_num = #{pverNum},
bug_reason = #{bugReason}, bug_reason = #{bugReason},
rate = #{rate}, rate = #{rate},
init_workload = #{initWorkload}
init_workload = #{initWorkload},
task_out = #{taskOut}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="name != null and name != ''"> name = #{name}, </if> <if test="name != null and name != ''"> name = #{name}, </if>
@ -319,9 +321,9 @@
<if test="menuId != null and menuId != ''"> menu_id = #{menuId}, </if> <if test="menuId != null and menuId != ''"> menu_id = #{menuId}, </if>
<if test="menuName != null and menuName != ''"> menu_name = #{menuName}, </if> <if test="menuName != null and menuName != ''"> menu_name = #{menuName}, </if>
<if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload}, </if> <if test="budgetWorkload != null and budgetWorkload != ''"> budget_workload = #{budgetWorkload}, </if>
<if test="budgetCost != null and budgetCost != ''"> budget_cost = #{budgetCost}, </if>
<if test="budgetAt != null and budgetAt != ''"> budget_at = #{budgetAt}, </if>
<if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload}, </if> <if test="actWorkload != null and actWorkload != ''"> act_workload = #{actWorkload}, </if>
<if test="actCost != null and actCost != ''"> act_cost = #{actCost}, </if>
<if test="actAt != null and actAt != ''"> act_at = #{actAt}, </if>
<if test="expectResult != null and expectResult != ''"> expect_result = #{expectResult}, </if> <if test="expectResult != null and expectResult != ''"> expect_result = #{expectResult}, </if>
<if test="opStep != null and opStep != ''"> op_step = #{opStep}, </if> <if test="opStep != null and opStep != ''"> op_step = #{opStep}, </if>
<if test="currResult != null and currResult != ''"> curr_result = #{currResult}, </if> <if test="currResult != null and currResult != ''"> curr_result = #{currResult}, </if>
@ -343,6 +345,7 @@
<if test="bugReason != null and bugReason != ''"> bug_reason = #{bugReason}, </if> <if test="bugReason != null and bugReason != ''"> bug_reason = #{bugReason}, </if>
<if test="rate != null and rate != ''"> rate = #{rate}, </if> <if test="rate != null and rate != ''"> rate = #{rate}, </if>
<if test="initWorkload != null and initWorkload != ''"> init_workload = #{initWorkload}, </if> <if test="initWorkload != null and initWorkload != ''"> init_workload = #{initWorkload}, </if>
<if test="taskOut != null and taskOut != ''"> task_out = #{taskOut}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -368,9 +371,9 @@
menu_id = #{item.menuId}, menu_id = #{item.menuId},
menu_name = #{item.menuName}, menu_name = #{item.menuName},
budget_workload = #{item.budgetWorkload}, budget_workload = #{item.budgetWorkload},
budget_cost = #{item.budgetCost},
budget_at = #{item.budgetAt},
act_workload = #{item.actWorkload}, act_workload = #{item.actWorkload},
act_cost = #{item.actCost},
act_at = #{item.actAt},
expect_result = #{item.expectResult}, expect_result = #{item.expectResult},
op_step = #{item.opStep}, op_step = #{item.opStep},
curr_result = #{item.currResult}, curr_result = #{item.currResult},
@ -391,6 +394,7 @@
pver_num = #{item.pverNum}, pver_num = #{item.pverNum},
bug_reason = #{item.bugReason}, bug_reason = #{item.bugReason},
rate = #{item.rate}, rate = #{item.rate},
init_workload = #{item.initWorkload}
init_workload = #{item.initWorkload},
task_out = #{item.taskOut}
</sql> </sql>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save