From d6b2c6b5cd0532f106be52577c7cbaac53edc37b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 4 Jul 2021 21:29:36 +0800 Subject: [PATCH] =?UTF-8?q?bug=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/entity/XmQuestion.java | 26 +++++-- .../xm/core/service/XmQuestionService.java | 3 + .../mapper/xm/core/dao/XmQuestionMapper.xml | 67 ++++++++++--------- 3 files changed, 60 insertions(+), 36 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java index d79bb976..d9f1c4c8 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmQuestion.java @@ -1,17 +1,16 @@ -package com.xm.core.entity; +package com.xm.core.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.math.BigDecimal; import java.util.Date; +import java.math.BigDecimal; /** - * 组织 com.qqkj 顶级模块 xm 大模块 core 小模块
+ * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmQuestion所有属性名:
- * 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;
* 表 XM.xm_question xm_question的所有字段名:
- * 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;
* 当前主键(包括多主键):
* id;
*/ @@ -146,6 +145,9 @@ public class XmQuestion implements java.io.Serializable { @ApiModelProperty(notes="关联的案例执行编号",allowEmptyValue=true,example="",allowableValues="") String caseExecId; + + @ApiModelProperty(notes="最后更新说明",allowEmptyValue=true,example="",allowableValues="") + String lremark; /**问题编号**/ public XmQuestion(String id) { @@ -408,6 +410,12 @@ public class XmQuestion implements java.io.Serializable { public void setCaseExecId(String 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() { return this.caseExecId; } + /** + * 最后更新说明 + **/ + public String getLremark() { + return this.lremark; + } } \ No newline at end of file diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java index 6b16c3e8..14641dfd 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java @@ -73,6 +73,9 @@ public class XmQuestionService extends BaseService { xmQuestion.setHandlerUsername(xmQuestionVo.getHandlerUsername()); xmQuestion.setBugStatus(xmQuestionVo.getTardgetBugStatus()); xmQuestion.setLtime(new Date()); + + xmQuestion.setLremark(xmQuestionVo.getReceiptMessage()); + this.updateSomeFieldByPk(xmQuestion); XmQuestionHandle handle=new XmQuestionHandle(); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml index 38278c82..53bf0d85 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml @@ -18,16 +18,16 @@ #{id},#{questionId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId} ) - + - update XM.xm_question b ,XM.xm_question_process_approva pa + update XM.xm_question b ,XM.xm_question_process_approva pa pa.agree = #{agree}, pa.act_id = #{actId}, - pa.assignee = #{assignee}, - pa.assignee_name = #{assigneeName}, + pa.assignee = #{assignee}, + pa.assignee_name = #{assigneeName}, pa.task_name = #{taskName}, pa.comment_msg = #{commentMsg}, pa.flow_last_time = now(), @@ -37,29 +37,29 @@ b.biz_proc_inst_id=#{bizProcInstId}, where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - and b.id=pa.question_id - - + and b.id=pa.question_id + + update XM.xm_question_process_approva pa set pa.flow_state='2' where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId} - - + + - delete from XM.xm_question + delete from XM.xm_question where biz_proc_inst_id=#{procInstId} - + - + insert into XM.xm_question( ) 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} ) - delete from XM.xm_question res + delete from XM.xm_question - + 1=2 @@ -173,18 +173,21 @@ delete from XM.xm_question - where id in - - #{item.id } - + where + (id) + in + + ( #{item.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 + 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 - + and res.id = #{id} @@ -193,7 +196,7 @@ and res.project_name = #{projectName} and res.case_id = #{caseId} and res.case_name = #{caseName} - and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD') + and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d') and res.ask_userid = #{askUserid} and res.ask_username = #{askUsername} and res.handler_userid = #{handlerUserid} @@ -203,7 +206,7 @@ and res.description = #{description} and res.create_userid = #{createUserid} and res.create_username = #{createUsername} - and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD') + and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') and res.bug_status = #{bugStatus} and res.biz_proc_inst_id = #{bizProcInstId} and res.biz_flow_state = #{bizFlowState} @@ -222,13 +225,14 @@ and res.tag_ids = #{tagIds} and res.tag_names = #{tagNames} and res.urls = #{urls} - and TO_CHAR(res.ltime,'YYYY-MM-DD') = TO_CHAR(#{ltime},'YYYY-MM-DD') + and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') and res.qtype = #{qtype} and res.task_id = #{taskId} and res.task_name = #{taskName} and res.iteration_id = #{iterationId} and res.iteration_name = #{iterationName} and res.case_exec_id = #{caseExecId} + and res.lremark = #{lremark} @@ -272,7 +276,8 @@ task_name = #{taskName}, iteration_id = #{iterationId}, iteration_name = #{iterationName}, - case_exec_id = #{caseExecId} + case_exec_id = #{caseExecId}, + lremark = #{lremark} name = #{name}, @@ -316,6 +321,7 @@ iteration_id = #{iterationId}, iteration_name = #{iterationName}, case_exec_id = #{caseExecId}, + lremark = #{lremark}, @@ -359,6 +365,7 @@ task_name = #{item.taskName}, iteration_id = #{item.iterationId}, iteration_name = #{item.iterationName}, - case_exec_id = #{item.caseExecId} + case_exec_id = #{item.caseExecId}, + lremark = #{item.lremark} \ No newline at end of file