From 2c871957443a0e6019d38b94cd65b7368391de65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 5 Mar 2022 03:06:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/entity/XmProduct.java | 49 ++++++++++++++++++- .../java/com/xm/core/entity/XmProject.java | 40 +++++++++++++-- .../mapper/xm/core/dao/XmProductMapper.xml | 28 +++++++++-- .../mapper/xm/core/dao/XmProjectMapper.xml | 24 +++++++-- 4 files changed, 124 insertions(+), 17 deletions(-) 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 4d621257..539afa35 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 @@ -8,9 +8,9 @@ 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;
+ * 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;
+ * 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;
*/ @@ -109,6 +109,15 @@ public class XmProduct implements java.io.Serializable { @ApiModelProperty(notes="计划是否进行实际金额控制，实际金额不能大于预算金额",allowEmptyValue=true,example="",allowableValues="") String phaseActCtrl; + + @ApiModelProperty(notes="是否锁定不允许编号0否1是",allowEmptyValue=true,example="",allowableValues="") + String locked; + + @ApiModelProperty(notes="是否已删除0否一是",allowEmptyValue=true,example="",allowableValues="") + String del; + + @ApiModelProperty(notes="最后更新时间",allowEmptyValue=true,example="",allowableValues="") + Date ltime; /**产品编号**/ public XmProduct(String id) { @@ -299,6 +308,24 @@ public class XmProduct implements java.io.Serializable { 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; + } /** * 产品编号 @@ -480,5 +507,23 @@ public class XmProduct implements java.io.Serializable { 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 9e8d8889..a0e4aab4 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 @@ -8,9 +8,9 @@ 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,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,phaseBudgetCtrl,phaseActCtrl;
+ * id,code,name,xmType,startTime,endTime,urgent,priority,description,createUserid,createUsername,createTime,assess,assessRemarks,status,branchId,planTotalCost,bizProcInstId,bizFlowState,planNouserAt,planInnerUserAt,planOutUserAt,locked,baseTime,baseRemark,baselineId,planWorkload,totalReceivables,budgetMarginRate,contractAmt,planInnerUserPrice,planOutUserPrice,planOutUserCnt,planInnerUserCnt,planWorkingHours,taxRate,planInnerUserWorkload,planOutUserWorkload,fromTplId,budgetCtrl,deptid,showOut,isTpl,pmUserid,pmUsername,assUserid,assUsername,admUserid,admUsername,phaseBudgetCtrl,phaseActCtrl,del,ltime;
* 表 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_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl;
+ * 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_inner_user_at,plan_out_user_at,locked,base_time,base_remark,baseline_id,plan_workload,total_receivables,budget_margin_rate,contract_amt,plan_inner_user_price,plan_out_user_price,plan_out_user_cnt,plan_inner_user_cnt,plan_working_hours,tax_rate,plan_inner_user_workload,plan_out_user_workload,from_tpl_id,budget_ctrl,deptid,show_out,is_tpl,pm_userid,pm_username,ass_userid,ass_username,adm_userid,adm_username,phase_budget_ctrl,phase_act_ctrl,del,ltime;
* 当前主键(包括多主键):
* id;
*/ @@ -125,7 +125,7 @@ public class XmProject implements java.io.Serializable { @ApiModelProperty(notes="预计工作小时数目",allowEmptyValue=true,example="",allowableValues="") Integer planWorkingHours; - @ApiModelProperty(notes="税率",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="税率0-100之间",allowEmptyValue=true,example="",allowableValues="") BigDecimal taxRate; @ApiModelProperty(notes="内部人力总工作量-应该大于或等于阶段计划内部人力总成本",allowEmptyValue=true,example="",allowableValues="") @@ -172,6 +172,12 @@ public class XmProject implements java.io.Serializable { @ApiModelProperty(notes="计划是否进行实际金额控制，实际金额不能大于预算金额",allowEmptyValue=true,example="",allowableValues="") String phaseActCtrl; + + @ApiModelProperty(notes="是否已删除0否1是",allowEmptyValue=true,example="",allowableValues="") + String del; + + @ApiModelProperty(notes="最后更新时间",allowEmptyValue=true,example="",allowableValues="") + Date ltime; /**项目编号**/ public XmProject(String id) { @@ -393,7 +399,7 @@ public class XmProject implements java.io.Serializable { this.planWorkingHours = planWorkingHours; } /** - * 税率 + * 税率0-100之间 **/ public void setTaxRate(BigDecimal taxRate) { this.taxRate = taxRate; @@ -488,6 +494,18 @@ public class XmProject implements java.io.Serializable { 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; + } /** * 项目编号 @@ -700,7 +718,7 @@ public class XmProject implements java.io.Serializable { return this.planWorkingHours; } /** - * 税率 + * 税率0-100之间 **/ public BigDecimal getTaxRate() { return this.taxRate; @@ -795,5 +813,17 @@ public class XmProject implements java.io.Serializable { public String getPhaseActCtrl() { return this.phaseActCtrl; } + /** + * 是否已删除0否1是 + **/ + 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/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml index 1854bf18..44b0a79c 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 @@ -87,7 +87,13 @@ where res.id = #{id} - + - +