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

bug

master
陈裕财 3 years ago
parent
23f7bde823
commit
4dae07c819
2 changed files with 14 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      xm-core/src/main/java/com/xm/core/entity/XmWorkload.java
  2. 16
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml

7
xm-core/src/main/java/com/xm/core/entity/XmWorkload.java
View File

@ -9,7 +9,7 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmWorkload所有属性名: <br>
* "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","模块编号";<br>
* "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-测试执行,5-需求，6-迭代，7-产品，8-项目，","funcId","模块编号","bizName","业务名称，比如任务名称、需求名称、缺陷名称、测试用例名称，";<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ -95,11 +95,14 @@ public class XmWorkload implements java.io.Serializable {
@ApiModelProperty(notes="缺陷编号(如果是缺陷报工，必填)",allowEmptyValue=true,example="",allowableValues="")
String bugId;
@ApiModelProperty(notes="报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行,5-需求，6-迭代，7-产品，8-项目，",allowEmptyValue=true,example="",allowableValues="")
String bizType;
@ApiModelProperty(notes="模块编号",allowEmptyValue=true,example="",allowableValues="")
String funcId;
@ApiModelProperty(notes="业务名称，比如任务名称、需求名称、缺陷名称、测试用例名称，",allowEmptyValue=true,example="",allowableValues="")
String bizName;
/**
*主键

16
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmWorkloadMapper.xml
View File

@ -237,9 +237,7 @@
<!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select res.* ,task.project_name,task.name as task_name,task.budget_workload,task.act_workload,task.task_state from xm_workload res
inner join xm_task task
on res.task_id = task.id
select * from xm_workload res
<where>
<include refid="whereForMap"/>
<include refid="where"/>
@ -285,7 +283,7 @@
insert into xm_workload(
<include refid="columns"/>
) 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},#{funcId}
#{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},#{bizName}
)
</insert>
@ -360,7 +358,7 @@
<!--sql片段 列-->
<sql id="columns">
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
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,biz_name
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -392,6 +390,7 @@
<if test="bugId != null and bugId != ''"> and res.bug_id = #{bugId} </if>
<if test="bizType != null and bizType != ''"> and res.biz_type = #{bizType} </if>
<if test="funcId != null and funcId != ''"> and res.func_id = #{funcId} </if>
<if test="bizName != null and bizName != ''"> and res.biz_name = #{bizName} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -420,7 +419,8 @@
plan_id = #{planId},
bug_id = #{bugId},
biz_type = #{bizType},
func_id = #{funcId}
func_id = #{funcId},
biz_name = #{bizName}
</sql>
<sql id="someFieldSet">
<if test="userid != null and userid != ''"> userid = #{userid}, </if>
@ -449,6 +449,7 @@
<if test="bugId != null and bugId != ''"> bug_id = #{bugId}, </if>
<if test="bizType != null and bizType != ''"> biz_type = #{bizType}, </if>
<if test="funcId != null and funcId != ''"> func_id = #{funcId}, </if>
<if test="bizName != null and bizName != ''"> biz_name = #{bizName}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -477,6 +478,7 @@
plan_id = #{item.planId},
bug_id = #{item.bugId},
biz_type = #{item.bizType},
func_id = #{item.funcId}
func_id = #{item.funcId},
biz_name = #{item.bizName}
</sql>
</mapper>
Write Preview
Loading…
Cancel
Save