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

bug增加最后更新时间

master
陈裕财 5 years ago
parent
1e07a5192f
commit
d6b2c6b5cd
3 changed files with 60 additions and 36 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. 26
      xm-core/src/main/java/com/xm/core/entity/XmQuestion.java
  2. 3
      xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
  3. 67
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml

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

@ -1,17 +1,16 @@
package com.xm.core.entity;
package com.xm.core.entity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
/** /**
* 组织 com.qqkj 顶级模块 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,planWorkload,planCostAmount,totalActWorkload,totalActCostAmount,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,taskId,taskName,iterationId,iterationName,caseExecId;<br>
* id,name,projectId,projectName,caseId,caseName,endTime,askUserid,askUsername,handlerUserid,handlerUsername,priority,solution,description,createUserid,createUsername,createTime,bugStatus,bizProcInstId,bizFlowState,menuId,menuName,planWorkload,planCostAmount,totalActWorkload,totalActCostAmount,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,taskId,taskName,iterationId,iterationName,caseExecId,lremark;<br>
* 表 XM.xm_question xm_question的所有字段名: <br> * 表 XM.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,plan_workload,plan_cost_amount,total_act_workload,total_act_cost_amount,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,task_id,task_name,iteration_id,iteration_name,case_exec_id;<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,plan_workload,plan_cost_amount,total_act_workload,total_act_cost_amount,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,task_id,task_name,iteration_id,iteration_name,case_exec_id,lremark;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -146,6 +145,9 @@ public class XmQuestion implements java.io.Serializable {
@ApiModelProperty(notes="关联的案例执行编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="关联的案例执行编号",allowEmptyValue=true,example="",allowableValues="")
String caseExecId; String caseExecId;
@ApiModelProperty(notes="最后更新说明",allowEmptyValue=true,example="",allowableValues="")
String lremark;
/**问题编号**/ /**问题编号**/
public XmQuestion(String id) { public XmQuestion(String id) {
@ -408,6 +410,12 @@ public class XmQuestion implements java.io.Serializable {
public void setCaseExecId(String caseExecId) { public void setCaseExecId(String caseExecId) {
this.caseExecId = caseExecId; this.caseExecId = caseExecId;
} }
/**
* 最后更新说明
**/
public void setLremark(String lremark) {
this.lremark = lremark;
}
/** /**
* 问题编号 * 问题编号
@ -661,5 +669,11 @@ public class XmQuestion implements java.io.Serializable {
public String getCaseExecId() { public String getCaseExecId() {
return this.caseExecId; return this.caseExecId;
} }
/**
* 最后更新说明
**/
public String getLremark() {
return this.lremark;
}
} }

3
xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
View File

@ -73,6 +73,9 @@ public class XmQuestionService extends BaseService {
xmQuestion.setHandlerUsername(xmQuestionVo.getHandlerUsername()); xmQuestion.setHandlerUsername(xmQuestionVo.getHandlerUsername());
xmQuestion.setBugStatus(xmQuestionVo.getTardgetBugStatus()); xmQuestion.setBugStatus(xmQuestionVo.getTardgetBugStatus());
xmQuestion.setLtime(new Date()); xmQuestion.setLtime(new Date());
xmQuestion.setLremark(xmQuestionVo.getReceiptMessage());
this.updateSomeFieldByPk(xmQuestion); this.updateSomeFieldByPk(xmQuestion);
XmQuestionHandle handle=new XmQuestionHandle(); XmQuestionHandle handle=new XmQuestionHandle();

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

@ -18,16 +18,16 @@
#{id},#{questionId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} #{id},#{questionId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
) )
</insert> </insert>
<!-- 同时修改业务表及流程审批表数据状态 --> <!-- 同时修改业务表及流程审批表数据状态 -->
<update id="updateProcessApprova" <update id="updateProcessApprova"
parameterType="HashMap"> parameterType="HashMap">
update XM.xm_question b ,XM.xm_question_process_approva pa
update XM.xm_question b ,XM.xm_question_process_approva pa
<set> <set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if> <if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if> <if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if> <if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if> <if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(), pa.flow_last_time = now(),
@ -37,29 +37,29 @@
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if> <if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
</set> </set>
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
and b.id=pa.question_id
</update>
and b.id=pa.question_id
</update>
<update id="updateFlowStateByProcInstForDeleteSuccess" <update id="updateFlowStateByProcInstForDeleteSuccess"
parameterType="HashMap"> parameterType="HashMap">
update XM.xm_question_process_approva pa set pa.flow_state='2' update XM.xm_question_process_approva pa set pa.flow_state='2'
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
</update>
</update>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByProcInstId" parameterType="HashMap"> <delete id="deleteByProcInstId" parameterType="HashMap">
delete from XM.xm_question
delete from XM.xm_question
where biz_proc_inst_id=#{procInstId} where biz_proc_inst_id=#{procInstId}
</delete> </delete>
<!--结束 自定义sql函数区域-->
<!--结束 自定义sql函数区域-->
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from XM.xm_question res left join XM.xm_question_process_approva pa on res.id=pa.question_id and res.biz_proc_inst_id=pa.proc_inst_id
select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from XM.xm_question res left join XM.xm_question_process_approva pa on res.id=pa.question_id and res.biz_proc_inst_id=pa.proc_inst_id
<where> <where>
<if test="ids != null"> and <if test="ids != null"> and
id in id in
@ -68,8 +68,8 @@
</foreach> </foreach>
</if> </if>
<if test="hisHandlerUserid !=null "> and exists (select 1 from xm.xm_question_handle h where h.question_id = res.id and h.handler_userid=#{hisHandlerUserid} and handle_status=#{hisHandleStatus})</if> <if test="hisHandlerUserid !=null "> and exists (select 1 from xm.xm_question_handle h where h.question_id = res.id and h.handler_userid=#{hisHandlerUserid} and handle_status=#{hisHandleStatus})</if>
<if test=" createTimeStart !=null "> and res.create_time &gt; #{createTimeStart} </if>
<if test=" createTimeEnd !=null "> and res.create_time &lt; #{createTimeEnd} </if>
<if test=" createTimeStart !=null "> and res.create_time between #{createTimeStart} and #{createTimeEnd} </if>
<if test=" ltimeStart !=null "> and res.ltime between #{limeStart} and #{limeEnd} </if>
<include refid="where"/> <include refid="where"/>
<if test=" productId !=null and productId!='' "> and exists( select 1 from xm.xm_menu m where m.menu_id=res.menu_id and m.product_id=#{productId}) </if> <if test=" productId !=null and productId!='' "> and exists( select 1 from xm.xm_menu m where m.menu_id=res.menu_id and m.product_id=#{productId}) </if>
<if test="myUserid != null and myUserid != ''"> and ( res.create_userid=#{myUserid} or res.handler_userid=#{myUserid}) </if> <if test="myUserid != null and myUserid != ''"> and ( res.create_userid=#{myUserid} or res.handler_userid=#{myUserid}) </if>
@ -116,19 +116,19 @@
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmQuestion" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmQuestion" useGeneratedKeys="false" keyProperty="id">
insert into XM.xm_question( insert into XM.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},#{planWorkload},#{planCostAmount},#{totalActWorkload},#{totalActCostAmount},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{taskId},#{taskName},#{iterationId},#{iterationName},#{caseExecId}
#{id},#{name},#{projectId},#{projectName},#{caseId},#{caseName},#{endTime},#{askUserid},#{askUsername},#{handlerUserid},#{handlerUsername},#{priority},#{solution},#{description},#{createUserid},#{createUsername},#{createTime},#{bugStatus},#{bizProcInstId},#{bizFlowState},#{menuId},#{menuName},#{planWorkload},#{planCostAmount},#{totalActWorkload},#{totalActCostAmount},#{expectResult},#{opStep},#{currResult},#{refRequire},#{bugSeverity},#{bugType},#{tagIds},#{tagNames},#{urls},#{ltime},#{qtype},#{taskId},#{taskName},#{iterationId},#{iterationName},#{caseExecId},#{lremark}
) )
</insert> </insert>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmQuestion"> <delete id="deleteByWhere" parameterType="com.xm.core.entity.XmQuestion">
delete from XM.xm_question res
delete from XM.xm_question
<where> <where>
<include refid="where"/>
1=2
</where> </where>
</delete> </delete>
@ -173,18 +173,21 @@
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from XM.xm_question delete from XM.xm_question
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
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,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,plan_workload,plan_cost_amount,total_act_workload,total_act_cost_amount,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,task_id,task_name,iteration_id,iteration_name,case_exec_id
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,plan_workload,plan_cost_amount,total_act_workload,total_act_cost_amount,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,task_id,task_name,iteration_id,iteration_name,case_exec_id,lremark
</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>
@ -193,7 +196,7 @@
<if test="projectName != null and projectName != ''"> and res.project_name = #{projectName} </if> <if test="projectName != null and projectName != ''"> and res.project_name = #{projectName} </if>
<if test="caseId != null and caseId != ''"> and res.case_id = #{caseId} </if> <if test="caseId != null and caseId != ''"> and res.case_id = #{caseId} </if>
<if test="caseName != null and caseName != ''"> and res.case_name = #{caseName} </if> <if test="caseName != null and caseName != ''"> and res.case_name = #{caseName} </if>
<if test="endTime != null"> and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD') </if>
<if test="endTime != null"> and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d') </if>
<if test="askUserid != null and askUserid != ''"> and res.ask_userid = #{askUserid} </if> <if test="askUserid != null and askUserid != ''"> and res.ask_userid = #{askUserid} </if>
<if test="askUsername != null and askUsername != ''"> and res.ask_username = #{askUsername} </if> <if test="askUsername != null and askUsername != ''"> and res.ask_username = #{askUsername} </if>
<if test="handlerUserid != null and handlerUserid != ''"> and res.handler_userid = #{handlerUserid} </if> <if test="handlerUserid != null and handlerUserid != ''"> and res.handler_userid = #{handlerUserid} </if>
@ -203,7 +206,7 @@
<if test="description != null and description != ''"> and res.description = #{description} </if> <if test="description != null and description != ''"> and res.description = #{description} </if>
<if test="createUserid != null and createUserid != ''"> and res.create_userid = #{createUserid} </if> <if test="createUserid != null and createUserid != ''"> and res.create_userid = #{createUserid} </if>
<if test="createUsername != null and createUsername != ''"> and res.create_username = #{createUsername} </if> <if test="createUsername != null and createUsername != ''"> and res.create_username = #{createUsername} </if>
<if test="createTime != null"> and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD') </if>
<if test="createTime != null"> and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') </if>
<if test="bugStatus != null and bugStatus != ''"> and res.bug_status = #{bugStatus} </if> <if test="bugStatus != null and bugStatus != ''"> and res.bug_status = #{bugStatus} </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if> <if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if>
<if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if> <if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </if>
@ -222,13 +225,14 @@
<if test="tagIds != null and tagIds != ''"> and res.tag_ids = #{tagIds} </if> <if test="tagIds != null and tagIds != ''"> and res.tag_ids = #{tagIds} </if>
<if test="tagNames != null and tagNames != ''"> and res.tag_names = #{tagNames} </if> <if test="tagNames != null and tagNames != ''"> and res.tag_names = #{tagNames} </if>
<if test="urls != null and urls != ''"> and res.urls = #{urls} </if> <if test="urls != null and urls != ''"> and res.urls = #{urls} </if>
<if test="ltime != null"> and TO_CHAR(res.ltime,'YYYY-MM-DD') = TO_CHAR(#{ltime},'YYYY-MM-DD') </if>
<if test="ltime != null"> and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') </if>
<if test="qtype != null and qtype != ''"> and res.qtype = #{qtype} </if> <if test="qtype != null and qtype != ''"> and res.qtype = #{qtype} </if>
<if test="taskId != null and taskId != ''"> and res.task_id = #{taskId} </if> <if test="taskId != null and taskId != ''"> and res.task_id = #{taskId} </if>
<if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if> <if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if>
<if test="iterationId != null and iterationId != ''"> and res.iteration_id = #{iterationId} </if> <if test="iterationId != null and iterationId != ''"> and res.iteration_id = #{iterationId} </if>
<if test="iterationName != null and iterationName != ''"> and res.iteration_name = #{iterationName} </if> <if test="iterationName != null and iterationName != ''"> and res.iteration_name = #{iterationName} </if>
<if test="caseExecId != null and caseExecId != ''"> and res.case_exec_id = #{caseExecId} </if> <if test="caseExecId != null and caseExecId != ''"> and res.case_exec_id = #{caseExecId} </if>
<if test="lremark != null and lremark != ''"> and res.lremark = #{lremark} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -272,7 +276,8 @@
task_name = #{taskName}, task_name = #{taskName},
iteration_id = #{iterationId}, iteration_id = #{iterationId},
iteration_name = #{iterationName}, iteration_name = #{iterationName},
case_exec_id = #{caseExecId}
case_exec_id = #{caseExecId},
lremark = #{lremark}
</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>
@ -316,6 +321,7 @@
<if test="iterationId != null and iterationId != ''"> iteration_id = #{iterationId}, </if> <if test="iterationId != null and iterationId != ''"> iteration_id = #{iterationId}, </if>
<if test="iterationName != null and iterationName != ''"> iteration_name = #{iterationName}, </if> <if test="iterationName != null and iterationName != ''"> iteration_name = #{iterationName}, </if>
<if test="caseExecId != null and caseExecId != ''"> case_exec_id = #{caseExecId}, </if> <if test="caseExecId != null and caseExecId != ''"> case_exec_id = #{caseExecId}, </if>
<if test="lremark != null and lremark != ''"> lremark = #{lremark}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -359,6 +365,7 @@
task_name = #{item.taskName}, task_name = #{item.taskName},
iteration_id = #{item.iterationId}, iteration_id = #{item.iterationId},
iteration_name = #{item.iterationName}, iteration_name = #{item.iterationName},
case_exec_id = #{item.caseExecId}
case_exec_id = #{item.caseExecId},
lremark = #{item.lremark}
</sql> </sql>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save