diff --git a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
index dfdfecd4..0f7569a6 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmMenu.java
@@ -1,20 +1,19 @@
package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
import java.util.Date;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmMenu所有属性名:
- * startTime,menuId,menuName,pmenuId,productId,remark,status,online,demandUrl,codeUrl,designUrl,docUrl,helpUrl,operDocUrl,seqNo,mmUserid,mmUsername,ctime,ntype,sinceVersion,childrenCnt,ltime,tagIds,tagNames,pidPaths,lvl,isTpl,phaseId,iterationId,source,proposerId,proposerName,dlvl,dtype,priority,dclass,iterationName,endTime;
- * 表 xm_menu 功能表的所有字段名:
- * start_time,menu_id,menu_name,pmenu_id,product_id,remark,status,online,demand_url,code_url,design_url,doc_url,help_url,oper_doc_url,seq_no,mm_userid,mm_username,ctime,ntype,since_version,children_cnt,ltime,tag_ids,tag_names,pid_paths,lvl,is_tpl,phase_id,iteration_id,source,proposer_id,proposer_name,dlvl,dtype,priority,dclass,iteration_name,end_time;
+ * "startTime","开始时间","menuId","功能编号","menuName","功能名称","pmenuId","上级功能","productId","归属产品编号","remark","备注","status","状态0初始1待评审2待设计3待开发4待sit测试5待uat测试6已测试待上线7已上线8已下线9已删除","online","是否已上线","demandUrl","需求链接","codeUrl","代码链接","designUrl","设计链接","docUrl","文档链接","helpUrl","帮助文档链接","operDocUrl","操作手册链接","seqNo","排序序号","mmUserid","故事管理员编号","mmUsername","故事管理员姓名","ctime","创建时间","ntype","节点类型0-叶子节点,1非叶子节点","sinceVersion","开始版本","childrenCnt","儿子节点个数","ltime","更新时间","tagIds","标签编号,逗号分割","tagNames","标签名称,逗号分割","pidPaths","父级id逗号分割,最后一个为本节点节点编号,以,号结尾","lvl","层级0-顶级,1-一级,2-二级,3-三级,4-四级。总共5级","isTpl","是否为模板","phaseId","计划编号","iterationId","迭代编号","source","需求来源","proposerId","提出人编号","proposerName","提出人姓名","dlvl","需求层次0-基础需求,1-增值需求,2-扩展需求","dtype","需求类型;0-新增功能;1-功能改进;2-bug修复;3-用户体验;4-UI优化;5-内部需求;6-删除需求;7-接口需求;","priority","优先级;0-紧急重要;1-紧急不重要;2-不紧急重要;3-不紧急不重要","dclass","需求分类1-史诗,2-特性,3-用户故事,4-任务,5-缺陷","iterationName","迭代名称","endTime","结束时间";
* 当前主键(包括多主键):
* menu_id;
*/
-@ApiModel(description="功能表")
+ @Data
+@ApiModel(description="用户故事(需求)表")
public class XmMenu implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -134,471 +133,17 @@ public class XmMenu implements java.io.Serializable {
@ApiModelProperty(notes="结束时间",allowEmptyValue=true,example="",allowableValues="")
Date endTime;
- /**功能编号**/
+ /**
+ *功能编号
+ **/
public XmMenu(String menuId) {
this.menuId = menuId;
}
- /**功能表**/
+ /**
+ * 用户故事(需求)表
+ **/
public XmMenu() {
}
-
- /**
- * 开始时间
- **/
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
- /**
- * 功能编号
- **/
- public void setMenuId(String menuId) {
- this.menuId = menuId;
- }
- /**
- * 功能名称
- **/
- public void setMenuName(String menuName) {
- this.menuName = menuName;
- }
- /**
- * 上级功能
- **/
- public void setPmenuId(String pmenuId) {
- this.pmenuId = pmenuId;
- }
- /**
- * 归属产品编号
- **/
- public void setProductId(String productId) {
- this.productId = productId;
- }
- /**
- * 备注
- **/
- public void setRemark(String remark) {
- this.remark = remark;
- }
- /**
- * 状态0初始1待评审2待设计3待开发4待sit测试5待uat测试6已测试待上线7已上线8已下线9已删除
- **/
- public void setStatus(String status) {
- this.status = status;
- }
- /**
- * 是否已上线
- **/
- public void setOnline(String online) {
- this.online = online;
- }
- /**
- * 需求链接
- **/
- public void setDemandUrl(String demandUrl) {
- this.demandUrl = demandUrl;
- }
- /**
- * 代码链接
- **/
- public void setCodeUrl(String codeUrl) {
- this.codeUrl = codeUrl;
- }
- /**
- * 设计链接
- **/
- public void setDesignUrl(String designUrl) {
- this.designUrl = designUrl;
- }
- /**
- * 文档链接
- **/
- public void setDocUrl(String docUrl) {
- this.docUrl = docUrl;
- }
- /**
- * 帮助文档链接
- **/
- public void setHelpUrl(String helpUrl) {
- this.helpUrl = helpUrl;
- }
- /**
- * 操作手册链接
- **/
- public void setOperDocUrl(String operDocUrl) {
- this.operDocUrl = operDocUrl;
- }
- /**
- * 排序序号
- **/
- public void setSeqNo(String seqNo) {
- this.seqNo = seqNo;
- }
- /**
- * 故事管理员编号
- **/
- public void setMmUserid(String mmUserid) {
- this.mmUserid = mmUserid;
- }
- /**
- * 故事管理员姓名
- **/
- public void setMmUsername(String mmUsername) {
- this.mmUsername = mmUsername;
- }
- /**
- * 创建时间
- **/
- public void setCtime(Date ctime) {
- this.ctime = ctime;
- }
- /**
- * 节点类型0-叶子节点,1非叶子节点
- **/
- public void setNtype(String ntype) {
- this.ntype = ntype;
- }
- /**
- * 开始版本
- **/
- public void setSinceVersion(String sinceVersion) {
- this.sinceVersion = sinceVersion;
- }
- /**
- * 儿子节点个数
- **/
- public void setChildrenCnt(Integer childrenCnt) {
- this.childrenCnt = childrenCnt;
- }
- /**
- * 更新时间
- **/
- public void setLtime(Date ltime) {
- this.ltime = ltime;
- }
- /**
- * 标签编号,逗号分割
- **/
- public void setTagIds(String tagIds) {
- this.tagIds = tagIds;
- }
- /**
- * 标签名称,逗号分割
- **/
- public void setTagNames(String tagNames) {
- this.tagNames = tagNames;
- }
- /**
- * 父级id逗号分割,最后一个为本节点节点编号,以,号结尾
- **/
- public void setPidPaths(String pidPaths) {
- this.pidPaths = pidPaths;
- }
- /**
- * 层级0-顶级,1-一级,2-二级,3-三级,4-四级。总共5级
- **/
- public void setLvl(Integer lvl) {
- this.lvl = lvl;
- }
- /**
- * 是否为模板
- **/
- public void setIsTpl(String isTpl) {
- this.isTpl = isTpl;
- }
- /**
- * 计划编号
- **/
- public void setPhaseId(String phaseId) {
- this.phaseId = phaseId;
- }
- /**
- * 迭代编号
- **/
- public void setIterationId(String iterationId) {
- this.iterationId = iterationId;
- }
- /**
- * 需求来源
- **/
- public void setSource(String source) {
- this.source = source;
- }
- /**
- * 提出人编号
- **/
- public void setProposerId(String proposerId) {
- this.proposerId = proposerId;
- }
- /**
- * 提出人姓名
- **/
- public void setProposerName(String proposerName) {
- this.proposerName = proposerName;
- }
- /**
- * 需求层次0-基础需求,1-增值需求,2-扩展需求
- **/
- public void setDlvl(String dlvl) {
- this.dlvl = dlvl;
- }
- /**
- * 需求类型;0-新增功能;1-功能改进;2-bug修复;3-用户体验;4-UI优化;5-内部需求;6-删除需求;7-接口需求;
- **/
- public void setDtype(String dtype) {
- this.dtype = dtype;
- }
- /**
- * 优先级;0-紧急重要;1-紧急不重要;2-不紧急重要;3-不紧急不重要
- **/
- public void setPriority(String priority) {
- this.priority = priority;
- }
- /**
- * 需求分类1-史诗,2-特性,3-用户故事,4-任务,5-缺陷
- **/
- public void setDclass(String dclass) {
- this.dclass = dclass;
- }
- /**
- * 迭代名称
- **/
- public void setIterationName(String iterationName) {
- this.iterationName = iterationName;
- }
- /**
- * 结束时间
- **/
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- /**
- * 开始时间
- **/
- public Date getStartTime() {
- return this.startTime;
- }
- /**
- * 功能编号
- **/
- public String getMenuId() {
- return this.menuId;
- }
- /**
- * 功能名称
- **/
- public String getMenuName() {
- return this.menuName;
- }
- /**
- * 上级功能
- **/
- public String getPmenuId() {
- return this.pmenuId;
- }
- /**
- * 归属产品编号
- **/
- public String getProductId() {
- return this.productId;
- }
- /**
- * 备注
- **/
- public String getRemark() {
- return this.remark;
- }
- /**
- * 状态0初始1待评审2待设计3待开发4待sit测试5待uat测试6已测试待上线7已上线8已下线9已删除
- **/
- public String getStatus() {
- return this.status;
- }
- /**
- * 是否已上线
- **/
- public String getOnline() {
- return this.online;
- }
- /**
- * 需求链接
- **/
- public String getDemandUrl() {
- return this.demandUrl;
- }
- /**
- * 代码链接
- **/
- public String getCodeUrl() {
- return this.codeUrl;
- }
- /**
- * 设计链接
- **/
- public String getDesignUrl() {
- return this.designUrl;
- }
- /**
- * 文档链接
- **/
- public String getDocUrl() {
- return this.docUrl;
- }
- /**
- * 帮助文档链接
- **/
- public String getHelpUrl() {
- return this.helpUrl;
- }
- /**
- * 操作手册链接
- **/
- public String getOperDocUrl() {
- return this.operDocUrl;
- }
- /**
- * 排序序号
- **/
- public String getSeqNo() {
- return this.seqNo;
- }
- /**
- * 故事管理员编号
- **/
- public String getMmUserid() {
- return this.mmUserid;
- }
- /**
- * 故事管理员姓名
- **/
- public String getMmUsername() {
- return this.mmUsername;
- }
- /**
- * 创建时间
- **/
- public Date getCtime() {
- return this.ctime;
- }
- /**
- * 节点类型0-叶子节点,1非叶子节点
- **/
- public String getNtype() {
- return this.ntype;
- }
- /**
- * 开始版本
- **/
- public String getSinceVersion() {
- return this.sinceVersion;
- }
- /**
- * 儿子节点个数
- **/
- public Integer getChildrenCnt() {
- return this.childrenCnt;
- }
- /**
- * 更新时间
- **/
- public Date getLtime() {
- return this.ltime;
- }
- /**
- * 标签编号,逗号分割
- **/
- public String getTagIds() {
- return this.tagIds;
- }
- /**
- * 标签名称,逗号分割
- **/
- public String getTagNames() {
- return this.tagNames;
- }
- /**
- * 父级id逗号分割,最后一个为本节点节点编号,以,号结尾
- **/
- public String getPidPaths() {
- return this.pidPaths;
- }
- /**
- * 层级0-顶级,1-一级,2-二级,3-三级,4-四级。总共5级
- **/
- public Integer getLvl() {
- return this.lvl;
- }
- /**
- * 是否为模板
- **/
- public String getIsTpl() {
- return this.isTpl;
- }
- /**
- * 计划编号
- **/
- public String getPhaseId() {
- return this.phaseId;
- }
- /**
- * 迭代编号
- **/
- public String getIterationId() {
- return this.iterationId;
- }
- /**
- * 需求来源
- **/
- public String getSource() {
- return this.source;
- }
- /**
- * 提出人编号
- **/
- public String getProposerId() {
- return this.proposerId;
- }
- /**
- * 提出人姓名
- **/
- public String getProposerName() {
- return this.proposerName;
- }
- /**
- * 需求层次0-基础需求,1-增值需求,2-扩展需求
- **/
- public String getDlvl() {
- return this.dlvl;
- }
- /**
- * 需求类型;0-新增功能;1-功能改进;2-bug修复;3-用户体验;4-UI优化;5-内部需求;6-删除需求;7-接口需求;
- **/
- public String getDtype() {
- return this.dtype;
- }
- /**
- * 优先级;0-紧急重要;1-紧急不重要;2-不紧急重要;3-不紧急不重要
- **/
- public String getPriority() {
- return this.priority;
- }
- /**
- * 需求分类1-史诗,2-特性,3-用户故事,4-任务,5-缺陷
- **/
- public String getDclass() {
- return this.dclass;
- }
- /**
- * 迭代名称
- **/
- public String getIterationName() {
- return this.iterationName;
- }
- /**
- * 结束时间
- **/
- public Date getEndTime() {
- return this.endTime;
- }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
index 65613d9e..fcef7956 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProduct.java
@@ -1,20 +1,19 @@
package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
import java.util.Date;
+import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProduct所有属性名:
- * id,productName,branchId,remark,version,pmUserid,pmUsername,ctime,deptid,pstatus,startTime,endTime,deptName,admUserid,admUsername,assUserid,assUsername,bizProcInstId,bizFlowState,isTpl,baselineId,baseTime,code,pbudgetWorkload,pbudgetAmount,pmenuBudgetWorkload,pmenuBudgetAmount,budgetCtrl,phaseBudgetCtrl,phaseActCtrl,locked,del,ltime;
- * 表 xm_product 产品表的所有字段名:
- * id,product_name,branch_id,remark,version,pm_userid,pm_username,ctime,deptid,pstatus,start_time,end_time,dept_name,adm_userid,adm_username,ass_userid,ass_username,biz_proc_inst_id,biz_flow_state,is_tpl,baseline_id,base_time,code,pbudget_workload,pbudget_amount,pmenu_budget_workload,pmenu_budget_amount,budget_ctrl,phase_budget_ctrl,phase_act_ctrl,locked,del,ltime;
+ * "id","产品编号","productName","产品名称","branchId","机构号","remark","备注","version","版本号","pmUserid","产品经理编号","pmUsername","产品经理名称","ctime","创建日期","deptid","归属部门","pstatus","产品阶段:0未开始,1研发中,2已完成,3已关闭","startTime","开始日期","endTime","结束日期","deptName","主管部门名称","admUserid","主管领导编号","admUsername","主管领导名称","assUserid","副经理编号","assUsername","副经理名称","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","isTpl","是否为模板","baselineId","基线编号","baseTime","基线时间","code","产品编码","pbudgetWorkload","产品预计总工作量,应该大于一级需求总预算工作量","pbudgetAmount","产品预计总金额,应该大于一级需求总预算金额","pmenuBudgetWorkload","从需求汇总来的总预算工作量","pmenuBudgetAmount","从需求汇总的总预算金额","budgetCtrl","是否进行预算控制,计划中一级计划总预算不能大于项目预算","phaseBudgetCtrl","是否进行计划明细预算控制,计划中下级预算不能大于上级预算","phaseActCtrl","计划是否进行实际金额控制,实际金额不能大于预算金额","locked","是否锁定不允许编号0否1是","del","是否已删除0否一是","ltime","最后更新时间";
* 当前主键(包括多主键):
* id;
*/
+ @Data
@ApiModel(description="产品表")
public class XmProduct implements java.io.Serializable {
@@ -120,411 +119,17 @@ public class XmProduct implements java.io.Serializable {
@ApiModelProperty(notes="最后更新时间",allowEmptyValue=true,example="",allowableValues="")
Date ltime;
- /**产品编号**/
+ /**
+ *产品编号
+ **/
public XmProduct(String id) {
this.id = id;
}
- /**产品表**/
+ /**
+ * 产品表
+ **/
public XmProduct() {
}
-
- /**
- * 产品编号
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 产品名称
- **/
- public void setProductName(String productName) {
- this.productName = productName;
- }
- /**
- * 机构号
- **/
- public void setBranchId(String branchId) {
- this.branchId = branchId;
- }
- /**
- * 备注
- **/
- public void setRemark(String remark) {
- this.remark = remark;
- }
- /**
- * 版本号
- **/
- public void setVersion(String version) {
- this.version = version;
- }
- /**
- * 产品经理编号
- **/
- public void setPmUserid(String pmUserid) {
- this.pmUserid = pmUserid;
- }
- /**
- * 产品经理名称
- **/
- public void setPmUsername(String pmUsername) {
- this.pmUsername = pmUsername;
- }
- /**
- * 创建日期
- **/
- public void setCtime(Date ctime) {
- this.ctime = ctime;
- }
- /**
- * 归属部门
- **/
- public void setDeptid(String deptid) {
- this.deptid = deptid;
- }
- /**
- * 产品阶段:0未开始,1研发中,2已完成,3已关闭
- **/
- public void setPstatus(String pstatus) {
- this.pstatus = pstatus;
- }
- /**
- * 开始日期
- **/
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
- /**
- * 结束日期
- **/
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
- /**
- * 主管部门名称
- **/
- public void setDeptName(String deptName) {
- this.deptName = deptName;
- }
- /**
- * 主管领导编号
- **/
- public void setAdmUserid(String admUserid) {
- this.admUserid = admUserid;
- }
- /**
- * 主管领导名称
- **/
- public void setAdmUsername(String admUsername) {
- this.admUsername = admUsername;
- }
- /**
- * 副经理编号
- **/
- public void setAssUserid(String assUserid) {
- this.assUserid = assUserid;
- }
- /**
- * 副经理名称
- **/
- public void setAssUsername(String assUsername) {
- this.assUsername = assUsername;
- }
- /**
- * 当前流程实例编号
- **/
- public void setBizProcInstId(String bizProcInstId) {
- this.bizProcInstId = bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public void setBizFlowState(String bizFlowState) {
- this.bizFlowState = bizFlowState;
- }
- /**
- * 是否为模板
- **/
- public void setIsTpl(String isTpl) {
- this.isTpl = isTpl;
- }
- /**
- * 基线编号
- **/
- public void setBaselineId(String baselineId) {
- this.baselineId = baselineId;
- }
- /**
- * 基线时间
- **/
- public void setBaseTime(Date baseTime) {
- this.baseTime = baseTime;
- }
- /**
- * 产品编码
- **/
- public void setCode(String code) {
- this.code = code;
- }
- /**
- * 产品预计总工作量,应该大于一级需求总预算工作量
- **/
- public void setPbudgetWorkload(BigDecimal pbudgetWorkload) {
- this.pbudgetWorkload = pbudgetWorkload;
- }
- /**
- * 产品预计总金额,应该大于一级需求总预算金额
- **/
- public void setPbudgetAmount(BigDecimal pbudgetAmount) {
- this.pbudgetAmount = pbudgetAmount;
- }
- /**
- * 从需求汇总来的总预算工作量
- **/
- public void setPmenuBudgetWorkload(BigDecimal pmenuBudgetWorkload) {
- this.pmenuBudgetWorkload = pmenuBudgetWorkload;
- }
- /**
- * 从需求汇总的总预算金额
- **/
- public void setPmenuBudgetAmount(BigDecimal pmenuBudgetAmount) {
- this.pmenuBudgetAmount = pmenuBudgetAmount;
- }
- /**
- * 是否进行预算控制,计划中一级计划总预算不能大于项目预算
- **/
- public void setBudgetCtrl(String budgetCtrl) {
- this.budgetCtrl = budgetCtrl;
- }
- /**
- * 是否进行计划明细预算控制,计划中下级预算不能大于上级预算
- **/
- public void setPhaseBudgetCtrl(String phaseBudgetCtrl) {
- this.phaseBudgetCtrl = phaseBudgetCtrl;
- }
- /**
- * 计划是否进行实际金额控制,实际金额不能大于预算金额
- **/
- public void setPhaseActCtrl(String phaseActCtrl) {
- this.phaseActCtrl = phaseActCtrl;
- }
- /**
- * 是否锁定不允许编号0否1是
- **/
- public void setLocked(String locked) {
- this.locked = locked;
- }
- /**
- * 是否已删除0否一是
- **/
- public void setDel(String del) {
- this.del = del;
- }
- /**
- * 最后更新时间
- **/
- public void setLtime(Date ltime) {
- this.ltime = ltime;
- }
-
- /**
- * 产品编号
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 产品名称
- **/
- public String getProductName() {
- return this.productName;
- }
- /**
- * 机构号
- **/
- public String getBranchId() {
- return this.branchId;
- }
- /**
- * 备注
- **/
- public String getRemark() {
- return this.remark;
- }
- /**
- * 版本号
- **/
- public String getVersion() {
- return this.version;
- }
- /**
- * 产品经理编号
- **/
- public String getPmUserid() {
- return this.pmUserid;
- }
- /**
- * 产品经理名称
- **/
- public String getPmUsername() {
- return this.pmUsername;
- }
- /**
- * 创建日期
- **/
- public Date getCtime() {
- return this.ctime;
- }
- /**
- * 归属部门
- **/
- public String getDeptid() {
- return this.deptid;
- }
- /**
- * 产品阶段:0未开始,1研发中,2已完成,3已关闭
- **/
- public String getPstatus() {
- return this.pstatus;
- }
- /**
- * 开始日期
- **/
- public Date getStartTime() {
- return this.startTime;
- }
- /**
- * 结束日期
- **/
- public Date getEndTime() {
- return this.endTime;
- }
- /**
- * 主管部门名称
- **/
- public String getDeptName() {
- return this.deptName;
- }
- /**
- * 主管领导编号
- **/
- public String getAdmUserid() {
- return this.admUserid;
- }
- /**
- * 主管领导名称
- **/
- public String getAdmUsername() {
- return this.admUsername;
- }
- /**
- * 副经理编号
- **/
- public String getAssUserid() {
- return this.assUserid;
- }
- /**
- * 副经理名称
- **/
- public String getAssUsername() {
- return this.assUsername;
- }
- /**
- * 当前流程实例编号
- **/
- public String getBizProcInstId() {
- return this.bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public String getBizFlowState() {
- return this.bizFlowState;
- }
- /**
- * 是否为模板
- **/
- public String getIsTpl() {
- return this.isTpl;
- }
- /**
- * 基线编号
- **/
- public String getBaselineId() {
- return this.baselineId;
- }
- /**
- * 基线时间
- **/
- public Date getBaseTime() {
- return this.baseTime;
- }
- /**
- * 产品编码
- **/
- public String getCode() {
- return this.code;
- }
- /**
- * 产品预计总工作量,应该大于一级需求总预算工作量
- **/
- public BigDecimal getPbudgetWorkload() {
- return this.pbudgetWorkload;
- }
- /**
- * 产品预计总金额,应该大于一级需求总预算金额
- **/
- public BigDecimal getPbudgetAmount() {
- return this.pbudgetAmount;
- }
- /**
- * 从需求汇总来的总预算工作量
- **/
- public BigDecimal getPmenuBudgetWorkload() {
- return this.pmenuBudgetWorkload;
- }
- /**
- * 从需求汇总的总预算金额
- **/
- public BigDecimal getPmenuBudgetAmount() {
- return this.pmenuBudgetAmount;
- }
- /**
- * 是否进行预算控制,计划中一级计划总预算不能大于项目预算
- **/
- public String getBudgetCtrl() {
- return this.budgetCtrl;
- }
- /**
- * 是否进行计划明细预算控制,计划中下级预算不能大于上级预算
- **/
- public String getPhaseBudgetCtrl() {
- return this.phaseBudgetCtrl;
- }
- /**
- * 计划是否进行实际金额控制,实际金额不能大于预算金额
- **/
- public String getPhaseActCtrl() {
- return this.phaseActCtrl;
- }
- /**
- * 是否锁定不允许编号0否1是
- **/
- public String getLocked() {
- return this.locked;
- }
- /**
- * 是否已删除0否一是
- **/
- public String getDel() {
- return this.del;
- }
- /**
- * 最后更新时间
- **/
- public Date getLtime() {
- return this.ltime;
- }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmProject.java b/xm-core/src/main/java/com/xm/core/entity/XmProject.java
index 4350b962..22c29cd0 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmProject.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmProject.java
@@ -1,21 +1,20 @@
package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
import java.util.Date;
+import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmProject所有属性名:
- * id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planIuserAt,planOuserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planIuserPrice,planOuserPrice,planOuserCnt,planIuserCnt,planWorkingHours,taxRate,planIuserWorkload,planOuserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,budgetEarly,phaseActCtrl,del,ltime,ostatus,workType,wtype,earlyAmt;
- * 表 xm_project xm_project的所有字段名:
- * id,code,name,xm_type,start_time,end_time,urgent,priority,description,create_userid,create_username,create_time,assess,assess_remarks,status,branch_id,plan_total_cost,biz_proc_inst_id,biz_flow_state,plan_nouser_at,plan_iuser_at,plan_ouser_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_iuser_price,plan_ouser_price,plan_ouser_cnt,plan_iuser_cnt,plan_working_hours,tax_rate,plan_iuser_workload,plan_ouser_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,budget_early,phase_act_ctrl,del,ltime,ostatus,work_type,wtype,early_amt;
+ * "id","项目编号","code","项目代号","name","项目名称","xmType","项目类型","startTime","项目开始时间","endTime","项目结束时间","urgent","紧急程度","priority","优先程度","description","项目描述","createUserid","项目创建人编号","createUsername","项目创建人","createTime","创建时间","assess","项目考核","assessRemarks","考核备注","status","0|初始1|售前2|立项中3|实施中4|暂停中5|结项中6|已结项7|售后8|已完成9|已关闭","branchId","机构编号","planTotalCost","总预算","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","planNouserAt","非人力成本总预算-应该大于或等于阶段计划非人力总成本","planIuserAt","内部人力成本总预算-应该大于或等于阶段计划内部人力总成本","planOuserAt","外购人力成本总预算-应该大于或等于阶段计划外购人力总成本","locked","是否锁定整个项目不允许变化0否1是","baseTime","基线时间","baseRemark","基线备注","baselineId","基线主键","planWorkload","总预算工作量-应该大于或等于阶段计划总工作量","totalReceivables","总预计收款金额","budgetMarginRate","预估毛利率","contractAmt","合同总金额","planIuserPrice","内部人力成本单价元/人时","planOuserPrice","外购人力成本单价元/人时","planOuserCnt","外购人数","planIuserCnt","内部人数","planWorkingHours","预计工作小时数目","taxRate","税率0-100之间","planIuserWorkload","内部人力总工作量-应该大于或等于阶段计划内部人力总成本","planOuserWorkload","外购人力总工作量-应该大于或等于阶段计划外购人力总成本","fromTplId","关联模板编号","budgetCtrl","是否进行预算控制,计划中一级计划总预算大于项目预算则拒绝添加计划,一般用于瀑布型项目","deptid","部门编号","showOut","是否对外公开0-完全不可见,1-仅本司人员可见,2-关联人员可见(众包-外包-招投标)","isTpl","是否为模板","pmUserid","项目经理编号","pmUsername","项目经理名称","assUserid","助理、副经理编号","assUsername","助理、副经理姓名","admUserid","主管领导编号","admUsername","主管领导姓名","budgetEarly","是否进行计划预算预警,计划预算超出项目预算既定额度进行预警","phaseActCtrl","计划是否进行实际金额控制,实际金额不能大于预算金额(大于预算金额不得结算)","del","是否已删除0否1是","ltime","最后更新时间","ostatus","原状态,暂停时记录原状态,暂停恢复后把原状态恢复","workType","工作方式1-scrum、2-kanban","wtype","报工方式0-无须报工,1-每日报工,2-工期内报工","earlyAmt","超出预算金额多少金额进行预警,正数代表超出的额度,负数代表距离预算的额度";
* 当前主键(包括多主键):
* id;
*/
-@ApiModel(description="xm_project")
+ @Data
+@ApiModel(description="项目表")
public class XmProject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -183,7 +182,7 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="原状态,暂停时记录原状态,暂停恢复后把原状态恢复",allowEmptyValue=true,example="",allowableValues="")
String ostatus;
- @ApiModelProperty(notes="工作方式scrum、kanban",allowEmptyValue=true,example="",allowableValues="")
+ @ApiModelProperty(notes="工作方式1-scrum、2-kanban",allowEmptyValue=true,example="",allowableValues="")
String workType;
@ApiModelProperty(notes="报工方式0-无须报工,1-每日报工,2-工期内报工",allowEmptyValue=true,example="",allowableValues="")
@@ -192,699 +191,17 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="超出预算金额多少金额进行预警,正数代表超出的额度,负数代表距离预算的额度",allowEmptyValue=true,example="",allowableValues="")
BigDecimal earlyAmt;
- /**项目编号**/
+ /**
+ *项目编号
+ **/
public XmProject(String id) {
this.id = id;
}
- /**xm_project**/
+ /**
+ * 项目表
+ **/
public XmProject() {
}
-
- /**
- * 项目编号
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 项目代号
- **/
- public void setCode(String code) {
- this.code = code;
- }
- /**
- * 项目名称
- **/
- public void setName(String name) {
- this.name = name;
- }
- /**
- * 项目类型
- **/
- public void setXmType(String xmType) {
- this.xmType = xmType;
- }
- /**
- * 项目开始时间
- **/
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
- /**
- * 项目结束时间
- **/
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
- /**
- * 紧急程度
- **/
- public void setUrgent(String urgent) {
- this.urgent = urgent;
- }
- /**
- * 优先程度
- **/
- public void setPriority(String priority) {
- this.priority = priority;
- }
- /**
- * 项目描述
- **/
- public void setDescription(String description) {
- this.description = description;
- }
- /**
- * 项目创建人编号
- **/
- public void setCreateUserid(String createUserid) {
- this.createUserid = createUserid;
- }
- /**
- * 项目创建人
- **/
- public void setCreateUsername(String createUsername) {
- this.createUsername = createUsername;
- }
- /**
- * 创建时间
- **/
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
- /**
- * 项目考核
- **/
- public void setAssess(String assess) {
- this.assess = assess;
- }
- /**
- * 考核备注
- **/
- public void setAssessRemarks(String assessRemarks) {
- this.assessRemarks = assessRemarks;
- }
- /**
- * 0|初始1|售前2|立项中3|实施中4|暂停中5|结项中6|已结项7|售后8|已完成9|已关闭
- **/
- public void setStatus(String status) {
- this.status = status;
- }
- /**
- * 机构编号
- **/
- public void setBranchId(String branchId) {
- this.branchId = branchId;
- }
- /**
- * 总预算
- **/
- public void setPlanTotalCost(BigDecimal planTotalCost) {
- this.planTotalCost = planTotalCost;
- }
- /**
- * 当前流程实例编号
- **/
- public void setBizProcInstId(String bizProcInstId) {
- this.bizProcInstId = bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public void setBizFlowState(String bizFlowState) {
- this.bizFlowState = bizFlowState;
- }
- /**
- * 非人力成本总预算-应该大于或等于阶段计划非人力总成本
- **/
- public void setPlanNouserAt(BigDecimal planNouserAt) {
- this.planNouserAt = planNouserAt;
- }
- /**
- * 内部人力成本总预算-应该大于或等于阶段计划内部人力总成本
- **/
- public void setPlanIuserAt(BigDecimal planIuserAt) {
- this.planIuserAt = planIuserAt;
- }
- /**
- * 外购人力成本总预算-应该大于或等于阶段计划外购人力总成本
- **/
- public void setPlanOuserAt(BigDecimal planOuserAt) {
- this.planOuserAt = planOuserAt;
- }
- /**
- * 是否锁定整个项目不允许变化0否1是
- **/
- public void setLocked(String locked) {
- this.locked = locked;
- }
- /**
- * 基线时间
- **/
- public void setBaseTime(Date baseTime) {
- this.baseTime = baseTime;
- }
- /**
- * 基线备注
- **/
- public void setBaseRemark(String baseRemark) {
- this.baseRemark = baseRemark;
- }
- /**
- * 基线主键
- **/
- public void setBaselineId(String baselineId) {
- this.baselineId = baselineId;
- }
- /**
- * 总预算工作量-应该大于或等于阶段计划总工作量
- **/
- public void setPlanWorkload(BigDecimal planWorkload) {
- this.planWorkload = planWorkload;
- }
- /**
- * 总预计收款金额
- **/
- public void setTotalReceivables(BigDecimal totalReceivables) {
- this.totalReceivables = totalReceivables;
- }
- /**
- * 预估毛利率
- **/
- public void setBudgetMarginRate(BigDecimal budgetMarginRate) {
- this.budgetMarginRate = budgetMarginRate;
- }
- /**
- * 合同总金额
- **/
- public void setContractAmt(BigDecimal contractAmt) {
- this.contractAmt = contractAmt;
- }
- /**
- * 内部人力成本单价元/人时
- **/
- public void setPlanIuserPrice(BigDecimal planIuserPrice) {
- this.planIuserPrice = planIuserPrice;
- }
- /**
- * 外购人力成本单价元/人时
- **/
- public void setPlanOuserPrice(BigDecimal planOuserPrice) {
- this.planOuserPrice = planOuserPrice;
- }
- /**
- * 外购人数
- **/
- public void setPlanOuserCnt(Integer planOuserCnt) {
- this.planOuserCnt = planOuserCnt;
- }
- /**
- * 内部人数
- **/
- public void setPlanIuserCnt(Integer planIuserCnt) {
- this.planIuserCnt = planIuserCnt;
- }
- /**
- * 预计工作小时数目
- **/
- public void setPlanWorkingHours(Integer planWorkingHours) {
- this.planWorkingHours = planWorkingHours;
- }
- /**
- * 税率0-100之间
- **/
- public void setTaxRate(BigDecimal taxRate) {
- this.taxRate = taxRate;
- }
- /**
- * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
- **/
- public void setPlanIuserWorkload(BigDecimal planIuserWorkload) {
- this.planIuserWorkload = planIuserWorkload;
- }
- /**
- * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
- **/
- public void setPlanOuserWorkload(BigDecimal planOuserWorkload) {
- this.planOuserWorkload = planOuserWorkload;
- }
- /**
- * 关联模板编号
- **/
- public void setFromTplId(String fromTplId) {
- this.fromTplId = fromTplId;
- }
- /**
- * 是否进行预算控制,计划中一级计划总预算大于项目预算则拒绝添加计划,一般用于瀑布型项目
- **/
- public void setBudgetCtrl(String budgetCtrl) {
- this.budgetCtrl = budgetCtrl;
- }
- /**
- * 部门编号
- **/
- public void setDeptid(String deptid) {
- this.deptid = deptid;
- }
- /**
- * 是否对外公开0-完全不可见,1-仅本司人员可见,2-关联人员可见(众包-外包-招投标)
- **/
- public void setShowOut(String showOut) {
- this.showOut = showOut;
- }
- /**
- * 是否为模板
- **/
- public void setIsTpl(String isTpl) {
- this.isTpl = isTpl;
- }
- /**
- * 项目经理编号
- **/
- public void setPmUserid(String pmUserid) {
- this.pmUserid = pmUserid;
- }
- /**
- * 项目经理名称
- **/
- public void setPmUsername(String pmUsername) {
- this.pmUsername = pmUsername;
- }
- /**
- * 助理、副经理编号
- **/
- public void setAssUserid(String assUserid) {
- this.assUserid = assUserid;
- }
- /**
- * 助理、副经理姓名
- **/
- public void setAssUsername(String assUsername) {
- this.assUsername = assUsername;
- }
- /**
- * 主管领导编号
- **/
- public void setAdmUserid(String admUserid) {
- this.admUserid = admUserid;
- }
- /**
- * 主管领导姓名
- **/
- public void setAdmUsername(String admUsername) {
- this.admUsername = admUsername;
- }
- /**
- * 是否进行计划预算预警,计划预算超出项目预算既定额度进行预警
- **/
- public void setBudgetEarly(String budgetEarly) {
- this.budgetEarly = budgetEarly;
- }
- /**
- * 计划是否进行实际金额控制,实际金额不能大于预算金额(大于预算金额不得结算)
- **/
- public void setPhaseActCtrl(String phaseActCtrl) {
- this.phaseActCtrl = phaseActCtrl;
- }
- /**
- * 是否已删除0否1是
- **/
- public void setDel(String del) {
- this.del = del;
- }
- /**
- * 最后更新时间
- **/
- public void setLtime(Date ltime) {
- this.ltime = ltime;
- }
- /**
- * 原状态,暂停时记录原状态,暂停恢复后把原状态恢复
- **/
- public void setOstatus(String ostatus) {
- this.ostatus = ostatus;
- }
- /**
- * 工作方式scrum、kanban
- **/
- public void setWorkType(String workType) {
- this.workType = workType;
- }
- /**
- * 报工方式0-无须报工,1-每日报工,2-工期内报工
- **/
- public void setWtype(String wtype) {
- this.wtype = wtype;
- }
- /**
- * 超出预算金额多少金额进行预警,正数代表超出的额度,负数代表距离预算的额度
- **/
- public void setEarlyAmt(BigDecimal earlyAmt) {
- this.earlyAmt = earlyAmt;
- }
-
- /**
- * 项目编号
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 项目代号
- **/
- public String getCode() {
- return this.code;
- }
- /**
- * 项目名称
- **/
- public String getName() {
- return this.name;
- }
- /**
- * 项目类型
- **/
- public String getXmType() {
- return this.xmType;
- }
- /**
- * 项目开始时间
- **/
- public Date getStartTime() {
- return this.startTime;
- }
- /**
- * 项目结束时间
- **/
- public Date getEndTime() {
- return this.endTime;
- }
- /**
- * 紧急程度
- **/
- public String getUrgent() {
- return this.urgent;
- }
- /**
- * 优先程度
- **/
- public String getPriority() {
- return this.priority;
- }
- /**
- * 项目描述
- **/
- public String getDescription() {
- return this.description;
- }
- /**
- * 项目创建人编号
- **/
- public String getCreateUserid() {
- return this.createUserid;
- }
- /**
- * 项目创建人
- **/
- public String getCreateUsername() {
- return this.createUsername;
- }
- /**
- * 创建时间
- **/
- public Date getCreateTime() {
- return this.createTime;
- }
- /**
- * 项目考核
- **/
- public String getAssess() {
- return this.assess;
- }
- /**
- * 考核备注
- **/
- public String getAssessRemarks() {
- return this.assessRemarks;
- }
- /**
- * 0|初始1|售前2|立项中3|实施中4|暂停中5|结项中6|已结项7|售后8|已完成9|已关闭
- **/
- public String getStatus() {
- return this.status;
- }
- /**
- * 机构编号
- **/
- public String getBranchId() {
- return this.branchId;
- }
- /**
- * 总预算
- **/
- public BigDecimal getPlanTotalCost() {
- return this.planTotalCost;
- }
- /**
- * 当前流程实例编号
- **/
- public String getBizProcInstId() {
- return this.bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public String getBizFlowState() {
- return this.bizFlowState;
- }
- /**
- * 非人力成本总预算-应该大于或等于阶段计划非人力总成本
- **/
- public BigDecimal getPlanNouserAt() {
- return this.planNouserAt;
- }
- /**
- * 内部人力成本总预算-应该大于或等于阶段计划内部人力总成本
- **/
- public BigDecimal getPlanIuserAt() {
- return this.planIuserAt;
- }
- /**
- * 外购人力成本总预算-应该大于或等于阶段计划外购人力总成本
- **/
- public BigDecimal getPlanOuserAt() {
- return this.planOuserAt;
- }
- /**
- * 是否锁定整个项目不允许变化0否1是
- **/
- public String getLocked() {
- return this.locked;
- }
- /**
- * 基线时间
- **/
- public Date getBaseTime() {
- return this.baseTime;
- }
- /**
- * 基线备注
- **/
- public String getBaseRemark() {
- return this.baseRemark;
- }
- /**
- * 基线主键
- **/
- public String getBaselineId() {
- return this.baselineId;
- }
- /**
- * 总预算工作量-应该大于或等于阶段计划总工作量
- **/
- public BigDecimal getPlanWorkload() {
- return this.planWorkload;
- }
- /**
- * 总预计收款金额
- **/
- public BigDecimal getTotalReceivables() {
- return this.totalReceivables;
- }
- /**
- * 预估毛利率
- **/
- public BigDecimal getBudgetMarginRate() {
- return this.budgetMarginRate;
- }
- /**
- * 合同总金额
- **/
- public BigDecimal getContractAmt() {
- return this.contractAmt;
- }
- /**
- * 内部人力成本单价元/人时
- **/
- public BigDecimal getPlanIuserPrice() {
- return this.planIuserPrice;
- }
- /**
- * 外购人力成本单价元/人时
- **/
- public BigDecimal getPlanOuserPrice() {
- return this.planOuserPrice;
- }
- /**
- * 外购人数
- **/
- public Integer getPlanOuserCnt() {
- return this.planOuserCnt;
- }
- /**
- * 内部人数
- **/
- public Integer getPlanIuserCnt() {
- return this.planIuserCnt;
- }
- /**
- * 预计工作小时数目
- **/
- public Integer getPlanWorkingHours() {
- return this.planWorkingHours;
- }
- /**
- * 税率0-100之间
- **/
- public BigDecimal getTaxRate() {
- return this.taxRate;
- }
- /**
- * 内部人力总工作量-应该大于或等于阶段计划内部人力总成本
- **/
- public BigDecimal getPlanIuserWorkload() {
- return this.planIuserWorkload;
- }
- /**
- * 外购人力总工作量-应该大于或等于阶段计划外购人力总成本
- **/
- public BigDecimal getPlanOuserWorkload() {
- return this.planOuserWorkload;
- }
- /**
- * 关联模板编号
- **/
- public String getFromTplId() {
- return this.fromTplId;
- }
- /**
- * 是否进行预算控制,计划中一级计划总预算大于项目预算则拒绝添加计划,一般用于瀑布型项目
- **/
- public String getBudgetCtrl() {
- return this.budgetCtrl;
- }
- /**
- * 部门编号
- **/
- public String getDeptid() {
- return this.deptid;
- }
- /**
- * 是否对外公开0-完全不可见,1-仅本司人员可见,2-关联人员可见(众包-外包-招投标)
- **/
- public String getShowOut() {
- return this.showOut;
- }
- /**
- * 是否为模板
- **/
- public String getIsTpl() {
- return this.isTpl;
- }
- /**
- * 项目经理编号
- **/
- public String getPmUserid() {
- return this.pmUserid;
- }
- /**
- * 项目经理名称
- **/
- public String getPmUsername() {
- return this.pmUsername;
- }
- /**
- * 助理、副经理编号
- **/
- public String getAssUserid() {
- return this.assUserid;
- }
- /**
- * 助理、副经理姓名
- **/
- public String getAssUsername() {
- return this.assUsername;
- }
- /**
- * 主管领导编号
- **/
- public String getAdmUserid() {
- return this.admUserid;
- }
- /**
- * 主管领导姓名
- **/
- public String getAdmUsername() {
- return this.admUsername;
- }
- /**
- * 是否进行计划预算预警,计划预算超出项目预算既定额度进行预警
- **/
- public String getBudgetEarly() {
- return this.budgetEarly;
- }
- /**
- * 计划是否进行实际金额控制,实际金额不能大于预算金额(大于预算金额不得结算)
- **/
- public String getPhaseActCtrl() {
- return this.phaseActCtrl;
- }
- /**
- * 是否已删除0否1是
- **/
- public String getDel() {
- return this.del;
- }
- /**
- * 最后更新时间
- **/
- public Date getLtime() {
- return this.ltime;
- }
- /**
- * 原状态,暂停时记录原状态,暂停恢复后把原状态恢复
- **/
- public String getOstatus() {
- return this.ostatus;
- }
- /**
- * 工作方式scrum、kanban
- **/
- public String getWorkType() {
- return this.workType;
- }
- /**
- * 报工方式0-无须报工,1-每日报工,2-工期内报工
- **/
- public String getWtype() {
- return this.wtype;
- }
- /**
- * 超出预算金额多少金额进行预警,正数代表超出的额度,负数代表距离预算的额度
- **/
- public BigDecimal getEarlyAmt() {
- return this.earlyAmt;
- }
}
\ No newline at end of file
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 0fa5e213..aab30f2c 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,21 +1,20 @@
package com.xm.core.entity;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
import java.util.Date;
+import java.math.BigDecimal;
/**
* 组织 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,budgetWorkload,budgetAt,actWorkload,actAt,expectResult,opStep,currResult,refRequire,bugSeverity,bugType,tagIds,tagNames,urls,ltime,qtype,caseExecId,remarks,productId,repRate,verNum,vpath,pverNum,bugReason,rate,initWorkload,taskOut,taskId;
- * 表 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,budget_workload,budget_at,act_workload,act_at,expect_result,op_step,curr_result,ref_require,bug_severity,bug_type,tag_ids,tag_names,urls,ltime,qtype,case_exec_id,remarks,product_id,rep_rate,ver_num,vpath,pver_num,bug_reason,rate,init_workload,task_out,task_id;
+ * "id","问题编号","name","问题标题","projectId","项目编号","projectName","项目名称","caseId","测试案例编号","caseName","测试案例名称","endTime","到期时间","askUserid","提出人编号","askUsername","提出人","handlerUserid","处理人编号","handlerUsername","处理人","priority","优先级别1-非常紧急,2-紧急,3-一般紧急,4-低","solution","解决方案:","description","问题描述","createUserid","问题创建人编号","createUsername","问题创建人","createTime","创建时间","bugStatus","bug状态1|新提交2|处理中3|已修复4|重新打开5|已发布6|已拒绝7|挂起","bizProcInstId","当前流程实例编号","bizFlowState","当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除","menuId","故事编号","menuName","故事名称","budgetWorkload","预估工时单位人时","budgetAt","预估成本金额","actWorkload","实际工时(取报工实际工时汇总)","actAt","实际总金额","expectResult","期望结果","opStep","操作步骤","currResult","当前结果","refRequire","相关需求","bugSeverity","严重程度1、2、3、4,分别对应:致命缺陷、严重缺陷、普通缺陷、轻微缺陷","bugType","BUG类型1、2、3、4,分别对应:代码错误、低级缺陷、设计缺陷、配置相关、安全相关、性能问题、其他","tagIds","标签id列表逗号分隔","tagNames","标签名称列表逗号分隔","urls","链接地址列表逗号分隔","ltime","最后更新时间","qtype","问题类型2-风险、1-功能问题、3-普通咨询、(暂时不用这个字段了)","caseExecId","关联的案例执行编号","remarks","最后更新说明","productId","产品编号","repRate","复现频率1-必现,2-大概率复现,3-小概率复现,4-仅出现一次","verNum","版本号","vpath","访问路径/斜杠分割","pverNum","发布版本","bugReason","原因分析","rate","进度0-100","initWorkload","原始预估工作量,budget_workload发生变化后,进行备份","taskOut","是否众包0否1是","taskId","任务编号-可以在任务下直接创建bug";
* 当前主键(包括多主键):
* id;
*/
-@ApiModel(description="xm_question")
+ @Data
+@ApiModel(description="缺陷列表")
public class XmQuestion implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -168,603 +167,17 @@ public class XmQuestion implements java.io.Serializable {
@ApiModelProperty(notes="任务编号-可以在任务下直接创建bug",allowEmptyValue=true,example="",allowableValues="")
String taskId;
- /**问题编号**/
+ /**
+ *问题编号
+ **/
public XmQuestion(String id) {
this.id = id;
}
- /**xm_question**/
+ /**
+ * 缺陷列表
+ **/
public XmQuestion() {
}
-
- /**
- * 问题编号
- **/
- public void setId(String id) {
- this.id = id;
- }
- /**
- * 问题标题
- **/
- public void setName(String name) {
- this.name = name;
- }
- /**
- * 项目编号
- **/
- public void setProjectId(String projectId) {
- this.projectId = projectId;
- }
- /**
- * 项目名称
- **/
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
- /**
- * 测试案例编号
- **/
- public void setCaseId(String caseId) {
- this.caseId = caseId;
- }
- /**
- * 测试案例名称
- **/
- public void setCaseName(String caseName) {
- this.caseName = caseName;
- }
- /**
- * 到期时间
- **/
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
- /**
- * 提出人编号
- **/
- public void setAskUserid(String askUserid) {
- this.askUserid = askUserid;
- }
- /**
- * 提出人
- **/
- public void setAskUsername(String askUsername) {
- this.askUsername = askUsername;
- }
- /**
- * 处理人编号
- **/
- public void setHandlerUserid(String handlerUserid) {
- this.handlerUserid = handlerUserid;
- }
- /**
- * 处理人
- **/
- public void setHandlerUsername(String handlerUsername) {
- this.handlerUsername = handlerUsername;
- }
- /**
- * 优先级别1-非常紧急,2-紧急,3-一般紧急,4-低
- **/
- public void setPriority(String priority) {
- this.priority = priority;
- }
- /**
- * 解决方案:
- **/
- public void setSolution(String solution) {
- this.solution = solution;
- }
- /**
- * 问题描述
- **/
- public void setDescription(String description) {
- this.description = description;
- }
- /**
- * 问题创建人编号
- **/
- public void setCreateUserid(String createUserid) {
- this.createUserid = createUserid;
- }
- /**
- * 问题创建人
- **/
- public void setCreateUsername(String createUsername) {
- this.createUsername = createUsername;
- }
- /**
- * 创建时间
- **/
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
- /**
- * bug状态1|新提交2|处理中3|已修复4|重新打开5|已发布6|已拒绝7|挂起
- **/
- public void setBugStatus(String bugStatus) {
- this.bugStatus = bugStatus;
- }
- /**
- * 当前流程实例编号
- **/
- public void setBizProcInstId(String bizProcInstId) {
- this.bizProcInstId = bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public void setBizFlowState(String bizFlowState) {
- this.bizFlowState = bizFlowState;
- }
- /**
- * 故事编号
- **/
- public void setMenuId(String menuId) {
- this.menuId = menuId;
- }
- /**
- * 故事名称
- **/
- public void setMenuName(String menuName) {
- this.menuName = menuName;
- }
- /**
- * 预估工时单位人时
- **/
- public void setBudgetWorkload(BigDecimal budgetWorkload) {
- this.budgetWorkload = budgetWorkload;
- }
- /**
- * 预估成本金额
- **/
- public void setBudgetAt(BigDecimal budgetAt) {
- this.budgetAt = budgetAt;
- }
- /**
- * 实际工时(取报工实际工时汇总)
- **/
- public void setActWorkload(BigDecimal actWorkload) {
- this.actWorkload = actWorkload;
- }
- /**
- * 实际总金额
- **/
- public void setActAt(BigDecimal actAt) {
- this.actAt = actAt;
- }
- /**
- * 期望结果
- **/
- public void setExpectResult(String expectResult) {
- this.expectResult = expectResult;
- }
- /**
- * 操作步骤
- **/
- public void setOpStep(String opStep) {
- this.opStep = opStep;
- }
- /**
- * 当前结果
- **/
- public void setCurrResult(String currResult) {
- this.currResult = currResult;
- }
- /**
- * 相关需求
- **/
- public void setRefRequire(String refRequire) {
- this.refRequire = refRequire;
- }
- /**
- * 严重程度1、2、3、4,分别对应:致命缺陷、严重缺陷、普通缺陷、轻微缺陷
- **/
- public void setBugSeverity(String bugSeverity) {
- this.bugSeverity = bugSeverity;
- }
- /**
- * BUG类型1、2、3、4,分别对应:代码错误、低级缺陷、设计缺陷、配置相关、安全相关、性能问题、其他
- **/
- public void setBugType(String bugType) {
- this.bugType = bugType;
- }
- /**
- * 标签id列表逗号分隔
- **/
- public void setTagIds(String tagIds) {
- this.tagIds = tagIds;
- }
- /**
- * 标签名称列表逗号分隔
- **/
- public void setTagNames(String tagNames) {
- this.tagNames = tagNames;
- }
- /**
- * 链接地址列表逗号分隔
- **/
- public void setUrls(String urls) {
- this.urls = urls;
- }
- /**
- * 最后更新时间
- **/
- public void setLtime(Date ltime) {
- this.ltime = ltime;
- }
- /**
- * 问题类型2-风险、1-功能问题、3-普通咨询、(暂时不用这个字段了)
- **/
- public void setQtype(String qtype) {
- this.qtype = qtype;
- }
- /**
- * 关联的案例执行编号
- **/
- public void setCaseExecId(String caseExecId) {
- this.caseExecId = caseExecId;
- }
- /**
- * 最后更新说明
- **/
- public void setRemarks(String remarks) {
- this.remarks = remarks;
- }
- /**
- * 产品编号
- **/
- public void setProductId(String productId) {
- this.productId = productId;
- }
- /**
- * 复现频率1-必现,2-大概率复现,3-小概率复现,4-仅出现一次
- **/
- public void setRepRate(String repRate) {
- this.repRate = repRate;
- }
- /**
- * 版本号
- **/
- public void setVerNum(String verNum) {
- this.verNum = verNum;
- }
- /**
- * 访问路径/斜杠分割
- **/
- public void setVpath(String vpath) {
- this.vpath = vpath;
- }
- /**
- * 发布版本
- **/
- public void setPverNum(String pverNum) {
- this.pverNum = pverNum;
- }
- /**
- * 原因分析
- **/
- public void setBugReason(String bugReason) {
- this.bugReason = bugReason;
- }
- /**
- * 进度0-100
- **/
- public void setRate(Integer rate) {
- this.rate = rate;
- }
- /**
- * 原始预估工作量,budget_workload发生变化后,进行备份
- **/
- public void setInitWorkload(BigDecimal initWorkload) {
- this.initWorkload = initWorkload;
- }
- /**
- * 是否众包0否1是
- **/
- public void setTaskOut(String taskOut) {
- this.taskOut = taskOut;
- }
- /**
- * 任务编号-可以在任务下直接创建bug
- **/
- public void setTaskId(String taskId) {
- this.taskId = taskId;
- }
-
- /**
- * 问题编号
- **/
- public String getId() {
- return this.id;
- }
- /**
- * 问题标题
- **/
- public String getName() {
- return this.name;
- }
- /**
- * 项目编号
- **/
- public String getProjectId() {
- return this.projectId;
- }
- /**
- * 项目名称
- **/
- public String getProjectName() {
- return this.projectName;
- }
- /**
- * 测试案例编号
- **/
- public String getCaseId() {
- return this.caseId;
- }
- /**
- * 测试案例名称
- **/
- public String getCaseName() {
- return this.caseName;
- }
- /**
- * 到期时间
- **/
- public Date getEndTime() {
- return this.endTime;
- }
- /**
- * 提出人编号
- **/
- public String getAskUserid() {
- return this.askUserid;
- }
- /**
- * 提出人
- **/
- public String getAskUsername() {
- return this.askUsername;
- }
- /**
- * 处理人编号
- **/
- public String getHandlerUserid() {
- return this.handlerUserid;
- }
- /**
- * 处理人
- **/
- public String getHandlerUsername() {
- return this.handlerUsername;
- }
- /**
- * 优先级别1-非常紧急,2-紧急,3-一般紧急,4-低
- **/
- public String getPriority() {
- return this.priority;
- }
- /**
- * 解决方案:
- **/
- public String getSolution() {
- return this.solution;
- }
- /**
- * 问题描述
- **/
- public String getDescription() {
- return this.description;
- }
- /**
- * 问题创建人编号
- **/
- public String getCreateUserid() {
- return this.createUserid;
- }
- /**
- * 问题创建人
- **/
- public String getCreateUsername() {
- return this.createUsername;
- }
- /**
- * 创建时间
- **/
- public Date getCreateTime() {
- return this.createTime;
- }
- /**
- * bug状态1|新提交2|处理中3|已修复4|重新打开5|已发布6|已拒绝7|挂起
- **/
- public String getBugStatus() {
- return this.bugStatus;
- }
- /**
- * 当前流程实例编号
- **/
- public String getBizProcInstId() {
- return this.bizProcInstId;
- }
- /**
- * 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
- **/
- public String getBizFlowState() {
- return this.bizFlowState;
- }
- /**
- * 故事编号
- **/
- public String getMenuId() {
- return this.menuId;
- }
- /**
- * 故事名称
- **/
- public String getMenuName() {
- return this.menuName;
- }
- /**
- * 预估工时单位人时
- **/
- public BigDecimal getBudgetWorkload() {
- return this.budgetWorkload;
- }
- /**
- * 预估成本金额
- **/
- public BigDecimal getBudgetAt() {
- return this.budgetAt;
- }
- /**
- * 实际工时(取报工实际工时汇总)
- **/
- public BigDecimal getActWorkload() {
- return this.actWorkload;
- }
- /**
- * 实际总金额
- **/
- public BigDecimal getActAt() {
- return this.actAt;
- }
- /**
- * 期望结果
- **/
- public String getExpectResult() {
- return this.expectResult;
- }
- /**
- * 操作步骤
- **/
- public String getOpStep() {
- return this.opStep;
- }
- /**
- * 当前结果
- **/
- public String getCurrResult() {
- return this.currResult;
- }
- /**
- * 相关需求
- **/
- public String getRefRequire() {
- return this.refRequire;
- }
- /**
- * 严重程度1、2、3、4,分别对应:致命缺陷、严重缺陷、普通缺陷、轻微缺陷
- **/
- public String getBugSeverity() {
- return this.bugSeverity;
- }
- /**
- * BUG类型1、2、3、4,分别对应:代码错误、低级缺陷、设计缺陷、配置相关、安全相关、性能问题、其他
- **/
- public String getBugType() {
- return this.bugType;
- }
- /**
- * 标签id列表逗号分隔
- **/
- public String getTagIds() {
- return this.tagIds;
- }
- /**
- * 标签名称列表逗号分隔
- **/
- public String getTagNames() {
- return this.tagNames;
- }
- /**
- * 链接地址列表逗号分隔
- **/
- public String getUrls() {
- return this.urls;
- }
- /**
- * 最后更新时间
- **/
- public Date getLtime() {
- return this.ltime;
- }
- /**
- * 问题类型2-风险、1-功能问题、3-普通咨询、(暂时不用这个字段了)
- **/
- public String getQtype() {
- return this.qtype;
- }
- /**
- * 关联的案例执行编号
- **/
- public String getCaseExecId() {
- return this.caseExecId;
- }
- /**
- * 最后更新说明
- **/
- public String getRemarks() {
- return this.remarks;
- }
- /**
- * 产品编号
- **/
- public String getProductId() {
- return this.productId;
- }
- /**
- * 复现频率1-必现,2-大概率复现,3-小概率复现,4-仅出现一次
- **/
- public String getRepRate() {
- return this.repRate;
- }
- /**
- * 版本号
- **/
- public String getVerNum() {
- return this.verNum;
- }
- /**
- * 访问路径/斜杠分割
- **/
- public String getVpath() {
- return this.vpath;
- }
- /**
- * 发布版本
- **/
- public String getPverNum() {
- return this.pverNum;
- }
- /**
- * 原因分析
- **/
- public String getBugReason() {
- return this.bugReason;
- }
- /**
- * 进度0-100
- **/
- public Integer getRate() {
- return this.rate;
- }
- /**
- * 原始预估工作量,budget_workload发生变化后,进行备份
- **/
- public BigDecimal getInitWorkload() {
- return this.initWorkload;
- }
- /**
- * 是否众包0否1是
- **/
- public String getTaskOut() {
- return this.taskOut;
- }
- /**
- * 任务编号-可以在任务下直接创建bug
- **/
- public String getTaskId() {
- return this.taskId;
- }
}
\ No newline at end of file
diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTask.java b/xm-core/src/main/java/com/xm/core/entity/XmTask.java
index edecf614..5de6c5f1 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTask.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTask.java
@@ -14,7 +14,7 @@ import java.math.BigDecimal;
* id;
*/
@Data
-@ApiModel(description="xm_task")
+@ApiModel(description="项目任务表")
public class XmTask implements java.io.Serializable {
private static final long serialVersionUID = 1L;
@@ -226,7 +226,7 @@ public class XmTask implements java.io.Serializable {
}
/**
- * xm_task
+ * 项目任务表
**/
public XmTask() {
}
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
index 110b064b..9ac5b5e1 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
@@ -100,7 +100,7 @@