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

添加节点类型、标签等

master
陈裕财 4 years ago
parent
5e00c634ef
commit
9d9152a377
4 changed files with 110 additions and 15 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. 49
      xm-core/src/main/java/com/xm/core/entity/XmProduct.java
  2. 40
      xm-core/src/main/java/com/xm/core/entity/XmProject.java
  3. 20
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
  4. 16
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

49
xm-core/src/main/java/com/xm/core/entity/XmProduct.java
View File

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProduct所有属性名: <br>
* 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;<br>
* 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;<br>
* 表 xm_product 产品表的所有字段名: <br>
* 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;<br>
* 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;<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ -101,6 +101,15 @@ public class XmProduct implements java.io.Serializable {
@ApiModelProperty(notes="从需求汇总的总预算金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal pmenuBudgetAmount;
@ApiModelProperty(notes="是否进行预算控制，计划中一级计划总预算不能大于项目预算",allowEmptyValue=true,example="",allowableValues="")
String budgetCtrl;
@ApiModelProperty(notes="是否进行计划明细预算控制，计划中下级预算不能大于上级预算",allowEmptyValue=true,example="",allowableValues="")
String phaseBudgetCtrl;
@ApiModelProperty(notes="计划是否进行实际金额控制，实际金额不能大于预算金额",allowEmptyValue=true,example="",allowableValues="")
String phaseActCtrl;
/**产品编号**/
public XmProduct(String id) {
this.id = id;
@ -272,6 +281,24 @@ public class XmProduct implements java.io.Serializable {
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;
}
/**
* 产品编号
@ -435,5 +462,23 @@ public class XmProduct implements java.io.Serializable {
public BigDecimal getPmenuBudgetAmount() {
return this.pmenuBudgetAmount;
}
/**
* 是否进行预算控制，计划中一级计划总预算不能大于项目预算
**/
public String getBudgetCtrl() {
return this.budgetCtrl;
}
/**
* 是否进行计划明细预算控制，计划中下级预算不能大于上级预算
**/
public String getPhaseBudgetCtrl() {
return this.phaseBudgetCtrl;
}
/**
* 计划是否进行实际金额控制，实际金额不能大于预算金额
**/
public String getPhaseActCtrl() {
return this.phaseActCtrl;
}
}

40
xm-core/src/main/java/com/xm/core/entity/XmProject.java
View File

@ -8,9 +8,9 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProject所有属性名: <br>
* 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;<br>
* 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;<br>
* 表 xm_project xm_project的所有字段名: <br>
* 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;<br>
* 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;<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ -137,7 +137,7 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="")
String fromTplId;
@ApiModelProperty(notes="是否进行预算控制",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="是否进行预算控制，计划中一级计划总预算不能大于项目预算",allowEmptyValue=true,example="",allowableValues="")
String budgetCtrl;
@ApiModelProperty(notes="部门编号",allowEmptyValue=true,example="",allowableValues="")
@ -167,6 +167,12 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="主管领导姓名",allowEmptyValue=true,example="",allowableValues="")
String admUsername;
@ApiModelProperty(notes="是否进行计划明细预算控制，计划中下级预算不能大于上级预算",allowEmptyValue=true,example="",allowableValues="")
String phaseBudgetCtrl;
@ApiModelProperty(notes="计划是否进行实际金额控制，实际金额不能大于预算金额",allowEmptyValue=true,example="",allowableValues="")
String phaseActCtrl;
/**项目编号**/
public XmProject(String id) {
this.id = id;
@ -411,7 +417,7 @@ public class XmProject implements java.io.Serializable {
this.fromTplId = fromTplId;
}
/**
* 是否进行预算控制
* 是否进行预算控制，计划中一级计划总预算不能大于项目预算
**/
public void setBudgetCtrl(String budgetCtrl) {
this.budgetCtrl = budgetCtrl;
@ -470,6 +476,18 @@ public class XmProject implements java.io.Serializable {
public void setAdmUsername(String admUsername) {
this.admUsername = admUsername;
}
/**
* 是否进行计划明细预算控制，计划中下级预算不能大于上级预算
**/
public void setPhaseBudgetCtrl(String phaseBudgetCtrl) {
this.phaseBudgetCtrl = phaseBudgetCtrl;
}
/**
* 计划是否进行实际金额控制，实际金额不能大于预算金额
**/
public void setPhaseActCtrl(String phaseActCtrl) {
this.phaseActCtrl = phaseActCtrl;
}
/**
* 项目编号
@ -706,7 +724,7 @@ public class XmProject implements java.io.Serializable {
return this.fromTplId;
}
/**
* 是否进行预算控制
* 是否进行预算控制，计划中一级计划总预算不能大于项目预算
**/
public String getBudgetCtrl() {
return this.budgetCtrl;
@ -765,5 +783,17 @@ public class XmProject implements java.io.Serializable {
public String getAdmUsername() {
return this.admUsername;
}
/**
* 是否进行计划明细预算控制，计划中下级预算不能大于上级预算
**/
public String getPhaseBudgetCtrl() {
return this.phaseBudgetCtrl;
}
/**
* 计划是否进行实际金额控制，实际金额不能大于预算金额
**/
public String getPhaseActCtrl() {
return this.phaseActCtrl;
}
}

20
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProductMapper.xml
View File

@ -106,7 +106,7 @@
insert into xm_product(
<include refid="columns"/>
) values (
#{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}
#{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}
)
</insert>
@ -169,7 +169,7 @@
<!--sql片段 列-->
<sql id="columns">
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
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
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -201,6 +201,9 @@
<if test="pbudgetAmount != null and pbudgetAmount != ''"> and res.pbudget_amount = #{pbudgetAmount} </if>
<if test="pmenuBudgetWorkload != null and pmenuBudgetWorkload != ''"> and res.pmenu_budget_workload = #{pmenuBudgetWorkload} </if>
<if test="pmenuBudgetAmount != null and pmenuBudgetAmount != ''"> and res.pmenu_budget_amount = #{pmenuBudgetAmount} </if>
<if test="budgetCtrl != null and budgetCtrl != ''"> and res.budget_ctrl = #{budgetCtrl} </if>
<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''"> and res.phase_budget_ctrl = #{phaseBudgetCtrl} </if>
<if test="phaseActCtrl != null and phaseActCtrl != ''"> and res.phase_act_ctrl = #{phaseActCtrl} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -229,7 +232,10 @@
pbudget_workload = #{pbudgetWorkload},
pbudget_amount = #{pbudgetAmount},
pmenu_budget_workload = #{pmenuBudgetWorkload},
pmenu_budget_amount = #{pmenuBudgetAmount}
pmenu_budget_amount = #{pmenuBudgetAmount},
budget_ctrl = #{budgetCtrl},
phase_budget_ctrl = #{phaseBudgetCtrl},
phase_act_ctrl = #{phaseActCtrl}
</sql>
<sql id="someFieldSet">
<if test="productName != null and productName != ''"> product_name = #{productName}, </if>
@ -258,6 +264,9 @@
<if test="pbudgetAmount != null and pbudgetAmount != ''"> pbudget_amount = #{pbudgetAmount}, </if>
<if test="pmenuBudgetWorkload != null and pmenuBudgetWorkload != ''"> pmenu_budget_workload = #{pmenuBudgetWorkload}, </if>
<if test="pmenuBudgetAmount != null and pmenuBudgetAmount != ''"> pmenu_budget_amount = #{pmenuBudgetAmount}, </if>
<if test="budgetCtrl != null and budgetCtrl != ''"> budget_ctrl = #{budgetCtrl}, </if>
<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''"> phase_budget_ctrl = #{phaseBudgetCtrl}, </if>
<if test="phaseActCtrl != null and phaseActCtrl != ''"> phase_act_ctrl = #{phaseActCtrl}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -286,6 +295,9 @@
pbudget_workload = #{item.pbudgetWorkload},
pbudget_amount = #{item.pbudgetAmount},
pmenu_budget_workload = #{item.pmenuBudgetWorkload},
pmenu_budget_amount = #{item.pmenuBudgetAmount}
pmenu_budget_amount = #{item.pmenuBudgetAmount},
budget_ctrl = #{item.budgetCtrl},
phase_budget_ctrl = #{item.phaseBudgetCtrl},
phase_act_ctrl = #{item.phaseActCtrl}
</sql>
</mapper>

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

@ -163,7 +163,7 @@
insert into xm_project(
<include refid="columns"/>
) values (
#{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}
#{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}
)
</insert>
@ -226,7 +226,7 @@
<!--sql片段 列-->
<sql id="columns">
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
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
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -280,6 +280,8 @@
<if test="assUsername != null and assUsername != ''"> and res.ass_username = #{assUsername} </if>
<if test="admUserid != null and admUserid != ''"> and res.adm_userid = #{admUserid} </if>
<if test="admUsername != null and admUsername != ''"> and res.adm_username = #{admUsername} </if>
<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''"> and res.phase_budget_ctrl = #{phaseBudgetCtrl} </if>
<if test="phaseActCtrl != null and phaseActCtrl != ''"> and res.phase_act_ctrl = #{phaseActCtrl} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -330,7 +332,9 @@
ass_userid = #{assUserid},
ass_username = #{assUsername},
adm_userid = #{admUserid},
adm_username = #{admUsername}
adm_username = #{admUsername},
phase_budget_ctrl = #{phaseBudgetCtrl},
phase_act_ctrl = #{phaseActCtrl}
</sql>
<sql id="someFieldSet">
<if test="code != null and code != ''"> code = #{code}, </if>
@ -381,6 +385,8 @@
<if test="assUsername != null and assUsername != ''"> ass_username = #{assUsername}, </if>
<if test="admUserid != null and admUserid != ''"> adm_userid = #{admUserid}, </if>
<if test="admUsername != null and admUsername != ''"> adm_username = #{admUsername}, </if>
<if test="phaseBudgetCtrl != null and phaseBudgetCtrl != ''"> phase_budget_ctrl = #{phaseBudgetCtrl}, </if>
<if test="phaseActCtrl != null and phaseActCtrl != ''"> phase_act_ctrl = #{phaseActCtrl}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -431,6 +437,8 @@
ass_userid = #{item.assUserid},
ass_username = #{item.assUsername},
adm_userid = #{item.admUserid},
adm_username = #{item.admUsername}
adm_username = #{item.admUsername},
phase_budget_ctrl = #{item.phaseBudgetCtrl},
phase_act_ctrl = #{item.phaseActCtrl}
</sql>
</mapper>
Write Preview
Loading…
Cancel
Save