From 23f7bde823c7cbd32e1b23f6853e62ff367a852e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 27 Jul 2022 21:40:44 +0800 Subject: [PATCH] bug --- .../java/com/xm/core/entity/XmWorkload.java | 11 +++++---- .../mapper/xm/core/dao/XmWorkloadMapper.xml | 24 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java b/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java index 8bb091ef..6e2e8d3e 100644 --- a/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java +++ b/xm-core/src/main/java/com/xm/core/entity/XmWorkload.java @@ -9,13 +9,13 @@ import java.math.BigDecimal; /** * 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmWorkload所有属性名:
- * "userid","员工编号","username","姓名","ctime","创建日期","taskId","任务编号，任务报工必填","cuserid","创建人编号","bizDate","业务日期yyyy-MM-dd","wstatus","状态0-待确认，1-已确认，2-无效","remark","备注","ttype","任务类型-关联字典taskType","id","主键","stime","结算提交时间","sstatus","结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算","workload","工时，一个task_id可多次提交，小时","rworkload","剩余工时（同一天取最后日期更新到task表budget_workload中）","cusername","创建人姓名","projectId","归属项目","branchId","项目归属机构","ubranchId","用户归属机构","sbillId","结算单编号","detailId","结算单明细表id","menuId","需求编号，缺陷报工、测试报工、任务报工都可以填","productId","产品编号，能关联到的都填","caseId","测试用例编号(如果是测试执行报工，必填)","planId","测试计划编号(如果是测试执行报工，必填)","bugId","缺陷编号(如果是缺陷报工，必填)","bizType","报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行";
+ * "userid","员工编号","username","姓名","ctime","创建日期","taskId","任务编号，任务报工必填","cuserid","创建人编号","bizDate","业务日期yyyy-MM-dd","wstatus","状态0-待确认，1-已确认，2-无效","remark","备注","ttype","任务类型-关联字典taskType","id","主键","stime","结算提交时间","sstatus","结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算","workload","工时，一个task_id可多次提交，小时","rworkload","任务剩余工时（同一天取最后日期更新到task表budget_workload中）","cusername","创建人姓名","projectId","归属项目","branchId","项目归属机构","ubranchId","用户归属机构","sbillId","结算单编号","detailId","结算单明细表id","menuId","需求编号，缺陷报工、测试报工、任务报工都可以填","productId","产品编号，能关联到的都填","caseId","测试用例编号(如果是测试执行报工，必填)","planId","测试计划编号(如果是测试执行报工，必填)","bugId","缺陷编号(如果是缺陷报工，必填)","bizType","报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行","funcId","模块编号";
* 当前主键(包括多主键):
* id;
*/ @Data @ApiModel(description="工时登记表") -public class XmWorkload implements java.io.Serializable { +public class XmWorkload implements java.io.Serializable { private static final long serialVersionUID = 1L; @@ -59,7 +59,7 @@ public class XmWorkload implements java.io.Serializable { @ApiModelProperty(notes="工时，一个task_id可多次提交，小时",allowEmptyValue=true,example="",allowableValues="") BigDecimal workload; - @ApiModelProperty(notes="剩余工时（同一天取最后日期更新到task表budget_workload中）",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="任务剩余工时（同一天取最后日期更新到task表budget_workload中）",allowEmptyValue=true,example="",allowableValues="") BigDecimal rworkload; @ApiModelProperty(notes="创建人姓名",allowEmptyValue=true,example="",allowableValues="") @@ -97,6 +97,9 @@ public class XmWorkload implements java.io.Serializable { @ApiModelProperty(notes="报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行",allowEmptyValue=true,example="",allowableValues="") String bizType; + + @ApiModelProperty(notes="模块编号",allowEmptyValue=true,example="",allowableValues="") + String funcId; /** *主键 @@ -111,6 +114,4 @@ public class XmWorkload implements java.io.Serializable { public XmWorkload() { } - public void setFuncId(String funcId) { - } } \ No newline at end of file diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml index ed2192d8..8ddd7d8d 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml @@ -281,11 +281,11 @@ - + insert into xm_workload( ) values ( - #{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{stime},#{sstatus},#{workload},#{rworkload},#{cusername},#{projectId},#{branchId},#{ubranchId},#{sbillId},#{detailId},#{menuId},#{productId},#{caseId},#{planId},#{bugId},#{bizType} + #{userid},#{username},#{ctime},#{taskId},#{cuserid},#{bizDate},#{wstatus},#{remark},#{ttype},#{id},#{stime},#{sstatus},#{workload},#{rworkload},#{cusername},#{projectId},#{branchId},#{ubranchId},#{sbillId},#{detailId},#{menuId},#{productId},#{caseId},#{planId},#{bugId},#{bizType},#{funcId} ) @@ -299,13 +299,13 @@ - delete from xm_workload + delete from xm_workload where id = #{id} - update xm_workload + update xm_workload @@ -314,7 +314,7 @@ - update xm_workload + update xm_workload @@ -329,7 +329,7 @@ - update xm_workload + update xm_workload set where id = #{item.id} @@ -349,7 +349,7 @@ - delete from xm_workload + delete from xm_workload where (id) in @@ -360,7 +360,7 @@ - userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,branch_id,ubranch_id,sbill_id,detail_id,menu_id,product_id,case_id,plan_id,bug_id,biz_type + userid,username,ctime,task_id,cuserid,biz_date,wstatus,remark,ttype,id,stime,sstatus,workload,rworkload,cusername,project_id,branch_id,ubranch_id,sbill_id,detail_id,menu_id,product_id,case_id,plan_id,bug_id,biz_type,func_id @@ -391,6 +391,7 @@ and res.plan_id = #{planId} and res.bug_id = #{bugId} and res.biz_type = #{bizType} + and res.func_id = #{funcId} @@ -418,7 +419,8 @@ case_id = #{caseId}, plan_id = #{planId}, bug_id = #{bugId}, - biz_type = #{bizType} + biz_type = #{bizType}, + func_id = #{funcId} userid = #{userid}, @@ -446,6 +448,7 @@ plan_id = #{planId}, bug_id = #{bugId}, biz_type = #{bizType}, + func_id = #{funcId}, @@ -473,6 +476,7 @@ case_id = #{item.caseId}, plan_id = #{item.planId}, bug_id = #{item.bugId}, - biz_type = #{item.bizType} + biz_type = #{item.bizType}, + func_id = #{item.funcId} \ No newline at end of file