陈裕财 4 years ago
parent
commit
a2024132a1
  1. 5
      xm-core/src/main/java/com/xm/core/entity/XmProject.java
  2. 12
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

5
xm-core/src/main/java/com/xm/core/entity/XmProject.java

@ -9,7 +9,7 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProject所有属性名: <br> * 实体 XmProject所有属性名: <br>
* "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","超出预算金额多少金额进行预警,正数代表超出的额度,负数代表距离预算的额度";<br>
* "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","超出预算金额多少金额进行预警,正数代表超出的额度,负数代表距离预算的额度","maxTaskAmt","单个任务最大金额";<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -191,6 +191,9 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="超出预算金额多少金额进行预警,正数代表超出的额度,负数代表距离预算的额度",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="超出预算金额多少金额进行预警,正数代表超出的额度,负数代表距离预算的额度",allowEmptyValue=true,example="",allowableValues="")
BigDecimal earlyAmt; BigDecimal earlyAmt;
@ApiModelProperty(notes="单个任务最大金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal maxTaskAmt;
/** /**
*项目编号 *项目编号
**/ **/

12
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMapper.xml

@ -129,7 +129,7 @@
insert into xm_project( insert into xm_project(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{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}
#{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},#{maxTaskAmt}
) )
</insert> </insert>
@ -204,7 +204,7 @@
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <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_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,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,max_task_amt
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -266,6 +266,7 @@
<if test="workType != null and workType != ''"> and res.work_type = #{workType} </if> <if test="workType != null and workType != ''"> and res.work_type = #{workType} </if>
<if test="wtype != null and wtype != ''"> and res.wtype = #{wtype} </if> <if test="wtype != null and wtype != ''"> and res.wtype = #{wtype} </if>
<if test="earlyAmt != null and earlyAmt != ''"> and res.early_amt = #{earlyAmt} </if> <if test="earlyAmt != null and earlyAmt != ''"> and res.early_amt = #{earlyAmt} </if>
<if test="maxTaskAmt != null and maxTaskAmt != ''"> and res.max_task_amt = #{maxTaskAmt} </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -324,7 +325,8 @@
ostatus = #{ostatus}, ostatus = #{ostatus},
work_type = #{workType}, work_type = #{workType},
wtype = #{wtype}, wtype = #{wtype},
early_amt = #{earlyAmt}
early_amt = #{earlyAmt},
max_task_amt = #{maxTaskAmt}
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="code != null and code != ''"> code = #{code}, </if> <if test="code != null and code != ''"> code = #{code}, </if>
@ -383,6 +385,7 @@
<if test="workType != null and workType != ''"> work_type = #{workType}, </if> <if test="workType != null and workType != ''"> work_type = #{workType}, </if>
<if test="wtype != null and wtype != ''"> wtype = #{wtype}, </if> <if test="wtype != null and wtype != ''"> wtype = #{wtype}, </if>
<if test="earlyAmt != null and earlyAmt != ''"> early_amt = #{earlyAmt}, </if> <if test="earlyAmt != null and earlyAmt != ''"> early_amt = #{earlyAmt}, </if>
<if test="maxTaskAmt != null and maxTaskAmt != ''"> max_task_amt = #{maxTaskAmt}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -441,6 +444,7 @@
ostatus = #{item.ostatus}, ostatus = #{item.ostatus},
work_type = #{item.workType}, work_type = #{item.workType},
wtype = #{item.wtype}, wtype = #{item.wtype},
early_amt = #{item.earlyAmt}
early_amt = #{item.earlyAmt},
max_task_amt = #{item.maxTaskAmt}
</sql> </sql>
</mapper> </mapper>
Loading…
Cancel
Save