Browse Source

团队重构

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

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

@ -9,7 +9,7 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProduct所有属性名: <br>
* "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","最后更新时间";<br>
* "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","最后更新时间","qxCode","";<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ -118,6 +118,9 @@ public class XmProduct implements java.io.Serializable {
@ApiModelProperty(notes="最后更新时间",allowEmptyValue=true,example="",allowableValues="")
Date ltime;
@ApiModelProperty(notes="",allowEmptyValue=true,example="",allowableValues="")
String qxCode;
/**
*产品编号

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

@ -9,7 +9,7 @@ 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","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","单个任务最大金额","menuLink","任务是否必须严格关联用户故事,0不限制,1必须关联,2-完全不关联","phaseLink","任务是否必须关联计划,0-不限制,1必须关联,2完全不关联","tplType","模板类型1-全域公开,2-本机构公开";<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","单个任务最大金额","menuLink","任务是否必须严格关联用户故事,0不限制,1必须关联,2-完全不关联","phaseLink","任务是否必须关联计划,0-不限制,1必须关联,2完全不关联","tplType","模板类型1-全域公开,2-本机构公开","qxCode","";<br>
* 当前主键(包括多主键):<br>
* id;<br>
*/
@ -202,6 +202,9 @@ public class XmProject implements java.io.Serializable {
@ApiModelProperty(notes="模板类型1-全域公开,2-本机构公开",allowEmptyValue=true,example="",allowableValues="")
String tplType;
@ApiModelProperty(notes="",allowEmptyValue=true,example="",allowableValues="")
String qxCode;
/**
*项目编号

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

@ -110,7 +110,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},#{budgetCtrl},#{phaseBudgetCtrl},#{phaseActCtrl},#{locked},#{del},#{ltime}
#{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},#{qxCode}
)
</insert>
@ -185,7 +185,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,budget_ctrl,phase_budget_ctrl,phase_act_ctrl,locked,del,ltime
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,qx_code
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -223,6 +223,7 @@
<if test="locked != null and locked != ''"> and res.locked = #{locked} </if>
<if test="del != null and del != ''"> and res.del = #{del} </if>
<if test="ltime != null"> and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d') </if>
<if test="qxCode != null and qxCode != ''"> and res.qx_code = #{qxCode} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -257,7 +258,8 @@
phase_act_ctrl = #{phaseActCtrl},
locked = #{locked},
del = #{del},
ltime = #{ltime}
ltime = #{ltime},
qx_code = #{qxCode}
</sql>
<sql id="someFieldSet">
<if test="productName != null and productName != ''"> product_name = #{productName}, </if>
@ -292,6 +294,7 @@
<if test="locked != null and locked != ''"> locked = #{locked}, </if>
<if test="del != null and del != ''"> del = #{del}, </if>
<if test="ltime != null"> ltime = #{ltime}, </if>
<if test="qxCode != null and qxCode != ''"> qx_code = #{qxCode}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -326,6 +329,7 @@
phase_act_ctrl = #{item.phaseActCtrl},
locked = #{item.locked},
del = #{item.del},
ltime = #{item.ltime}
ltime = #{item.ltime},
qx_code = #{item.qxCode}
</sql>
</mapper>

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

@ -130,7 +130,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},#{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},#{menuLink},#{phaseLink},#{tplType}
#{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},#{menuLink},#{phaseLink},#{tplType},#{qxCode}
)
</insert>
@ -205,7 +205,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_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,menu_link,phase_link,tpl_type
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,menu_link,phase_link,tpl_type,qx_code
</sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -271,6 +271,7 @@
<if test="menuLink != null and menuLink != ''"> and res.menu_link = #{menuLink} </if>
<if test="phaseLink != null and phaseLink != ''"> and res.phase_link = #{phaseLink} </if>
<if test="tplType != null and tplType != ''"> and res.tpl_type = #{tplType} </if>
<if test="qxCode != null and qxCode != ''"> and res.qx_code = #{qxCode} </if>
</sql>
<!--sql片段 更新字段 -->
<sql id="set">
@ -333,7 +334,8 @@
max_task_amt = #{maxTaskAmt},
menu_link = #{menuLink},
phase_link = #{phaseLink},
tpl_type = #{tplType}
tpl_type = #{tplType},
qx_code = #{qxCode}
</sql>
<sql id="someFieldSet">
<if test="code != null and code != ''"> code = #{code}, </if>
@ -396,6 +398,7 @@
<if test="menuLink != null and menuLink != ''"> menu_link = #{menuLink}, </if>
<if test="phaseLink != null and phaseLink != ''"> phase_link = #{phaseLink}, </if>
<if test="tplType != null and tplType != ''"> tpl_type = #{tplType}, </if>
<if test="qxCode != null and qxCode != ''"> qx_code = #{qxCode}, </if>
</sql>
<!--sql片段 批量更新 -->
<sql id="batchSet">
@ -458,6 +461,7 @@
max_task_amt = #{item.maxTaskAmt},
menu_link = #{item.menuLink},
phase_link = #{item.phaseLink},
tpl_type = #{item.tplType}
tpl_type = #{item.tplType},
qx_code = #{item.qxCode}
</sql>
</mapper>
Loading…
Cancel
Save