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

添加节点类型、标签等

master
陈裕财 4 years ago
parent
a32f7dfc86
commit
69f4bef166
4 changed files with 90 additions and 87 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/XmMenuPlan.java
  2. 31
      xm-core/src/main/java/com/xm/core/entity/XmMenuState.java
  3. 41
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml
  4. 40
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml

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

@ -2,15 +2,14 @@ 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 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmMenuPlan所有属性名: <br>
* projectId,id,projectName,menuId,planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,onlineStatus,onlineTime,planStatus,chargeUserid,chargeUsername,menuStatus,ctime,ltime,cuserid,cusername,calcTime,menuName,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,testCases,execCases,designCases,finishCases,iterationCnt,taskCnt,finishTaskCnt,productId,productName,bugCnt;<br>
* 表 XM.xm_menu_plan 功能计划表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
* 表 xm_menu_plan 功能计划表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
* project_id,id,project_name,menu_id,plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,online_status,online_time,plan_status,charge_userid,charge_username,menu_status,ctime,ltime,cuserid,cusername,calc_time,menu_name,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,test_cases,exec_cases,design_cases,finish_cases,iteration_cnt,task_cnt,finish_task_cnt,product_id,product_name,bug_cnt;<br>
* 当前主键(包括多主键):<br>
* id;<br>

31
xm-core/src/main/java/com/xm/core/entity/XmMenuState.java
View File

@ -2,15 +2,14 @@ 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 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmMenuState所有属性名: <br>
* id,menuId,planStartTime,planEndTime,actStartTime,actEndTime,planWorkload,actWorkload,planCostAmount,actCostAmount,finishRate,demandRate,designRate,devRate,uatRate,sitRate,onlineStatus,onlineTime,planStatus,chargeUserid,chargeUsername,menuStatus,ctime,ltime,cuserid,cusername,calcTime,menuName,planWorkhours,planWorkerCnt,closedBugs,activeBugs,confirmedBugs,resolvedBugs,productId,productName,testCases,execCases,designCases,finishCases,projectCnt,iterationCnt,taskCnt,finishTaskCnt,bizDate,bugCnt;<br>
* 表 XM.xm_menu_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
* 表 xm_menu_state 功能状态表,无需前端维护，所有数据由汇总统计得出的所有字段名: <br>
* id,menu_id,plan_start_time,plan_end_time,act_start_time,act_end_time,plan_workload,act_workload,plan_cost_amount,act_cost_amount,finish_rate,demand_rate,design_rate,dev_rate,uat_rate,sit_rate,online_status,online_time,plan_status,charge_userid,charge_username,menu_status,ctime,ltime,cuserid,cusername,calc_time,menu_name,plan_workhours,plan_worker_cnt,closed_bugs,active_bugs,confirmed_bugs,resolved_bugs,product_id,product_name,test_cases,exec_cases,design_cases,finish_cases,project_cnt,iteration_cnt,task_cnt,finish_task_cnt,biz_date,bug_cnt;<br>
* 当前主键(包括多主键):<br>
* id;<br>
@ -112,16 +111,16 @@ public class XmMenuState implements java.io.Serializable {
BigDecimal planWorkerCnt;
@ApiModelProperty(notes="总关闭bugs",allowEmptyValue=true,example="",allowableValues="")
Integer closedBugs;
BigDecimal closedBugs;
@ApiModelProperty(notes="激活bugs",allowEmptyValue=true,example="",allowableValues="")
Integer activeBugs;
BigDecimal activeBugs;
@ApiModelProperty(notes="已确认bugs总数",allowEmptyValue=true,example="",allowableValues="")
Integer confirmedBugs;
BigDecimal confirmedBugs;
@ApiModelProperty(notes="已解决bugs总数",allowEmptyValue=true,example="",allowableValues="")
Integer resolvedBugs;
BigDecimal resolvedBugs;
@ApiModelProperty(notes="产品编号",allowEmptyValue=true,example="",allowableValues="")
String productId;
@ -351,25 +350,25 @@ public class XmMenuState implements java.io.Serializable {
/**
* 总关闭bugs
**/
public void setClosedBugs(Integer closedBugs) {
public void setClosedBugs(BigDecimal closedBugs) {
this.closedBugs = closedBugs;
}
/**
* 激活bugs
**/
public void setActiveBugs(Integer activeBugs) {
public void setActiveBugs(BigDecimal activeBugs) {
this.activeBugs = activeBugs;
}
/**
* 已确认bugs总数
**/
public void setConfirmedBugs(Integer confirmedBugs) {
public void setConfirmedBugs(BigDecimal confirmedBugs) {
this.confirmedBugs = confirmedBugs;
}
/**
* 已解决bugs总数
**/
public void setResolvedBugs(Integer resolvedBugs) {
public void setResolvedBugs(BigDecimal resolvedBugs) {
this.resolvedBugs = resolvedBugs;
}
/**
@ -628,25 +627,25 @@ public class XmMenuState implements java.io.Serializable {
/**
* 总关闭bugs
**/
public Integer getClosedBugs() {
public BigDecimal getClosedBugs() {
return this.closedBugs;
}
/**
* 激活bugs
**/
public Integer getActiveBugs() {
public BigDecimal getActiveBugs() {
return this.activeBugs;
}
/**
* 已确认bugs总数
**/
public Integer getConfirmedBugs() {
public BigDecimal getConfirmedBugs() {
return this.confirmedBugs;
}
/**
* 已解决bugs总数
**/
public Integer getResolvedBugs() {
public BigDecimal getResolvedBugs() {
return this.resolvedBugs;
}
/**

41
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuPlanMapper.xml
View File

@ -3,13 +3,21 @@
<mapper namespace="com.xm.core.entity.XmMenuPlan">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<update id="loadTasksToXmMenuPlan" parameterType="String" statementType="CALLABLE">
{call load_tasks_to_xm_menu_plan(#{projectId,mode=IN})}
</update>
<!--结束 自定义sql函数区域-->
@ -18,14 +26,8 @@
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select * from xm_menu_plan res
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<include refid="whereForMap"/>
<include refid="where"/>
<if test="key != null and key !='' "> </if>
</where>
</select>
@ -115,9 +117,10 @@
<!-- 批量删除 -->
<delete id="batchDelete" parameterType="List">
delete from xm_menu_plan
where id in
where
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
( #{item.id} )
</foreach>
</delete>
@ -133,10 +136,10 @@
<if test="id != null and id != ''"> and res.id = #{id} </if>
<if test="projectName != null and projectName != ''"> and res.project_name = #{projectName} </if>
<if test="menuId != null and menuId != ''"> and res.menu_id = #{menuId} </if>
<if test="planStartTime != null"> and TO_CHAR(res.plan_start_time,'YYYY-MM-DD') = TO_CHAR(#{planStartTime},'YYYY-MM-DD') </if>
<if test="planEndTime != null"> and TO_CHAR(res.plan_end_time,'YYYY-MM-DD') = TO_CHAR(#{planEndTime},'YYYY-MM-DD') </if>
<if test="actStartTime != null"> and TO_CHAR(res.act_start_time,'YYYY-MM-DD') = TO_CHAR(#{actStartTime},'YYYY-MM-DD') </if>
<if test="actEndTime != null"> and TO_CHAR(res.act_end_time,'YYYY-MM-DD') = TO_CHAR(#{actEndTime},'YYYY-MM-DD') </if>
<if test="planStartTime != null"> and date_format(res.plan_start_time,'%Y-%m-%d') = date_format(#{planStartTime},'%Y-%m-%d') </if>
<if test="planEndTime != null"> and date_format(res.plan_end_time,'%Y-%m-%d') = date_format(#{planEndTime},'%Y-%m-%d') </if>
<if test="actStartTime != null"> and date_format(res.act_start_time,'%Y-%m-%d') = date_format(#{actStartTime},'%Y-%m-%d') </if>
<if test="actEndTime != null"> and date_format(res.act_end_time,'%Y-%m-%d') = date_format(#{actEndTime},'%Y-%m-%d') </if>
<if test="planWorkload != null and planWorkload != ''"> and res.plan_workload = #{planWorkload} </if>
<if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if>
<if test="planCostAmount != null and planCostAmount != ''"> and res.plan_cost_amount = #{planCostAmount} </if>
@ -148,16 +151,16 @@
<if test="uatRate != null and uatRate != ''"> and res.uat_rate = #{uatRate} </if>
<if test="sitRate != null and sitRate != ''"> and res.sit_rate = #{sitRate} </if>
<if test="onlineStatus != null and onlineStatus != ''"> and res.online_status = #{onlineStatus} </if>
<if test="onlineTime != null"> and TO_CHAR(res.online_time,'YYYY-MM-DD') = TO_CHAR(#{onlineTime},'YYYY-MM-DD') </if>
<if test="onlineTime != null"> and date_format(res.online_time,'%Y-%m-%d') = date_format(#{onlineTime},'%Y-%m-%d') </if>
<if test="planStatus != null and planStatus != ''"> and res.plan_status = #{planStatus} </if>
<if test="chargeUserid != null and chargeUserid != ''"> and res.charge_userid = #{chargeUserid} </if>
<if test="chargeUsername != null and chargeUsername != ''"> and res.charge_username = #{chargeUsername} </if>
<if test="menuStatus != null and menuStatus != ''"> and res.menu_status = #{menuStatus} </if>
<if test="ctime != null"> and TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD') </if>
<if test="ltime != null"> and TO_CHAR(res.ltime,'YYYY-MM-DD') = TO_CHAR(#{ltime},'YYYY-MM-DD') </if>
<if test="ctime != null"> and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') </if>
<if test="ltime != null"> and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') </if>
<if test="cuserid != null and cuserid != ''"> and res.cuserid = #{cuserid} </if>
<if test="cusername != null and cusername != ''"> and res.cusername = #{cusername} </if>
<if test="calcTime != null"> and TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD') </if>
<if test="calcTime != null"> and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d') </if>
<if test="menuName != null and menuName != ''"> and res.menu_name = #{menuName} </if>
<if test="planWorkhours != null and planWorkhours != ''"> and res.plan_workhours = #{planWorkhours} </if>
<if test="planWorkerCnt != null and planWorkerCnt != ''"> and res.plan_worker_cnt = #{planWorkerCnt} </if>

40
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuStateMapper.xml
View File

@ -3,9 +3,16 @@
<mapper namespace="com.xm.core.entity.XmMenuState">
<!--开始 自定sql函数区域 -->
<!--请在此区域添加自定义函数-->
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动，因为代码随时重新生成 -->
<sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
</foreach>
</if>
<if test="key != null and key !='' "> </if>
</sql>
<update id="loadTasksToXmMenuState" parameterType="String" statementType="CALLABLE">
{call load_tasks_to_xm_menu_state(#{productId,mode=IN})}
@ -19,14 +26,8 @@
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select * from xm_menu_state res
<where>
<if test="ids != null"> and
id in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
#{item}
</foreach>
</if>
<include refid="whereForMap"/>
<include refid="where"/>
<if test="key != null and key !='' "> </if>
</where>
</select>
@ -116,9 +117,10 @@
<!-- 批量删除 -->
<delete id="batchDelete" parameterType="List">
delete from xm_menu_state
where id in
where
(id) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
( #{item.id} )
</foreach>
</delete>
@ -132,10 +134,10 @@
<sql id="where">
<if test="id != null and id != ''"> and res.id = #{id} </if>
<if test="menuId != null and menuId != ''"> and res.menu_id = #{menuId} </if>
<if test="planStartTime != null"> and TO_CHAR(res.plan_start_time,'YYYY-MM-DD') = TO_CHAR(#{planStartTime},'YYYY-MM-DD') </if>
<if test="planEndTime != null"> and TO_CHAR(res.plan_end_time,'YYYY-MM-DD') = TO_CHAR(#{planEndTime},'YYYY-MM-DD') </if>
<if test="actStartTime != null"> and TO_CHAR(res.act_start_time,'YYYY-MM-DD') = TO_CHAR(#{actStartTime},'YYYY-MM-DD') </if>
<if test="actEndTime != null"> and TO_CHAR(res.act_end_time,'YYYY-MM-DD') = TO_CHAR(#{actEndTime},'YYYY-MM-DD') </if>
<if test="planStartTime != null"> and date_format(res.plan_start_time,'%Y-%m-%d') = date_format(#{planStartTime},'%Y-%m-%d') </if>
<if test="planEndTime != null"> and date_format(res.plan_end_time,'%Y-%m-%d') = date_format(#{planEndTime},'%Y-%m-%d') </if>
<if test="actStartTime != null"> and date_format(res.act_start_time,'%Y-%m-%d') = date_format(#{actStartTime},'%Y-%m-%d') </if>
<if test="actEndTime != null"> and date_format(res.act_end_time,'%Y-%m-%d') = date_format(#{actEndTime},'%Y-%m-%d') </if>
<if test="planWorkload != null and planWorkload != ''"> and res.plan_workload = #{planWorkload} </if>
<if test="actWorkload != null and actWorkload != ''"> and res.act_workload = #{actWorkload} </if>
<if test="planCostAmount != null and planCostAmount != ''"> and res.plan_cost_amount = #{planCostAmount} </if>
@ -147,16 +149,16 @@
<if test="uatRate != null and uatRate != ''"> and res.uat_rate = #{uatRate} </if>
<if test="sitRate != null and sitRate != ''"> and res.sit_rate = #{sitRate} </if>
<if test="onlineStatus != null and onlineStatus != ''"> and res.online_status = #{onlineStatus} </if>
<if test="onlineTime != null"> and TO_CHAR(res.online_time,'YYYY-MM-DD') = TO_CHAR(#{onlineTime},'YYYY-MM-DD') </if>
<if test="onlineTime != null"> and date_format(res.online_time,'%Y-%m-%d') = date_format(#{onlineTime},'%Y-%m-%d') </if>
<if test="planStatus != null and planStatus != ''"> and res.plan_status = #{planStatus} </if>
<if test="chargeUserid != null and chargeUserid != ''"> and res.charge_userid = #{chargeUserid} </if>
<if test="chargeUsername != null and chargeUsername != ''"> and res.charge_username = #{chargeUsername} </if>
<if test="menuStatus != null and menuStatus != ''"> and res.menu_status = #{menuStatus} </if>
<if test="ctime != null"> and TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD') </if>
<if test="ltime != null"> and TO_CHAR(res.ltime,'YYYY-MM-DD') = TO_CHAR(#{ltime},'YYYY-MM-DD') </if>
<if test="ctime != null"> and date_format(res.ctime,'%Y-%m-%d') = date_format(#{ctime},'%Y-%m-%d') </if>
<if test="ltime != null"> and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') </if>
<if test="cuserid != null and cuserid != ''"> and res.cuserid = #{cuserid} </if>
<if test="cusername != null and cusername != ''"> and res.cusername = #{cusername} </if>
<if test="calcTime != null"> and TO_CHAR(res.calc_time,'YYYY-MM-DD') = TO_CHAR(#{calcTime},'YYYY-MM-DD') </if>
<if test="calcTime != null"> and date_format(res.calc_time,'%Y-%m-%d') = date_format(#{calcTime},'%Y-%m-%d') </if>
<if test="menuName != null and menuName != ''"> and res.menu_name = #{menuName} </if>
<if test="planWorkhours != null and planWorkhours != ''"> and res.plan_workhours = #{planWorkhours} </if>
<if test="planWorkerCnt != null and planWorkerCnt != ''"> and res.plan_worker_cnt = #{planWorkerCnt} </if>

Write Preview
Loading…
Cancel
Save