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

优化审批流程

master
qqkj 5 years ago
parent
da480b1828
commit
262d2cc678
2 changed files with 88 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 85
      xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java
  2. 49
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml

85
xm-core/src/main/java/com/xm/core/entity/XmProjectBaseline.java
View File

@ -1,17 +1,16 @@
package com.xm.core.entity;
package com.xm.core.entity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal;
/** /**
* 组织 com.qqkj 顶级模块 oa 大模块 xm 小模块 <br>
* 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmProjectBaseline所有属性名: <br> * 实体 XmProjectBaseline所有属性名: <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,projectId,ctime;<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,projectId;<br>
* 表 XM.xm_project_baseline xm_project_baseline的所有字段名: <br> * 表 XM.xm_project_baseline xm_project_baseline的所有字段名: <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,project_id,ctime;<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,project_id;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br> * id;<br>
*/ */
@ -20,7 +19,7 @@ public class XmProjectBaseline implements java.io.Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(notes="基线表主键,主键",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="项目基线编号,主键",allowEmptyValue=true,example="",allowableValues="")
String id; String id;
@ -63,7 +62,7 @@ public class XmProjectBaseline implements java.io.Serializable {
@ApiModelProperty(notes="考核备注",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="考核备注",allowEmptyValue=true,example="",allowableValues="")
String assessRemarks; String assessRemarks;
@ApiModelProperty(notes="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停，5-售前，6-售后",allowEmptyValue=true,example="",allowableValues="")
String status; String status;
@ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="机构编号",allowEmptyValue=true,example="",allowableValues="")
@ -135,13 +134,19 @@ public class XmProjectBaseline implements java.io.Serializable {
@ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="外购人力总工作量-应该大于或等于阶段计划外购人力总成本",allowEmptyValue=true,example="",allowableValues="")
BigDecimal planOutUserWorkload; BigDecimal planOutUserWorkload;
@ApiModelProperty(notes="关联模板编号",allowEmptyValue=true,example="",allowableValues="")
String fromTplId;
@ApiModelProperty(notes="是否进行预算控制",allowEmptyValue=true,example="",allowableValues="")
String budgetCtrl;
@ApiModelProperty(notes="部门编号",allowEmptyValue=true,example="",allowableValues="")
String deptid;
@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
String projectId; String projectId;
@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
Date ctime;
/**基线表主键**/
/**项目基线编号**/
public XmProjectBaseline(String id) { public XmProjectBaseline(String id) {
this.id = id; this.id = id;
} }
@ -151,7 +156,7 @@ public class XmProjectBaseline implements java.io.Serializable {
} }
/** /**
* 基线表主键
* 项目基线编号
**/ **/
public void setId(String id) { public void setId(String id) {
this.id = id; this.id = id;
@ -235,7 +240,7 @@ public class XmProjectBaseline implements java.io.Serializable {
this.assessRemarks = assessRemarks; this.assessRemarks = assessRemarks;
} }
/** /**
* 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停
* 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停，5-售前，6-售后
**/ **/
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
@ -379,20 +384,32 @@ public class XmProjectBaseline implements java.io.Serializable {
this.planOutUserWorkload = planOutUserWorkload; this.planOutUserWorkload = planOutUserWorkload;
} }
/** /**
* 项目编号
* 关联模板编号
**/ **/
public void setProjectId(String projectId) {
this.projectId = projectId;
public void setFromTplId(String fromTplId) {
this.fromTplId = fromTplId;
} }
/** /**
* 创建时间
* 是否进行预算控制
**/
public void setBudgetCtrl(String budgetCtrl) {
this.budgetCtrl = budgetCtrl;
}
/**
* 部门编号
**/
public void setDeptid(String deptid) {
this.deptid = deptid;
}
/**
* 项目编号
**/ **/
public void setCtime(Date ctime) {
this.ctime = ctime;
public void setProjectId(String projectId) {
this.projectId = projectId;
} }
/** /**
* 基线表主键
* 项目基线编号
**/ **/
public String getId() { public String getId() {
return this.id; return this.id;
@ -476,7 +493,7 @@ public class XmProjectBaseline implements java.io.Serializable {
return this.assessRemarks; return this.assessRemarks;
} }
/** /**
* 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停
* 项目状态，0-初始，1-立项中，2-执行中，3-已结项，4-暂停，5-售前，6-售后
**/ **/
public String getStatus() { public String getStatus() {
return this.status; return this.status;
@ -620,16 +637,28 @@ public class XmProjectBaseline implements java.io.Serializable {
return this.planOutUserWorkload; return this.planOutUserWorkload;
} }
/** /**
* 项目编号
* 关联模板编号
**/ **/
public String getProjectId() {
return this.projectId;
public String getFromTplId() {
return this.fromTplId;
} }
/** /**
* 创建时间
* 是否进行预算控制
**/ **/
public Date getCtime() {
return this.ctime;
public String getBudgetCtrl() {
return this.budgetCtrl;
}
/**
* 部门编号
**/
public String getDeptid() {
return this.deptid;
}
/**
* 项目编号
**/
public String getProjectId() {
return this.projectId;
} }
} }

49
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectBaselineMapper.xml
View File

@ -56,19 +56,19 @@
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,--> <!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmProjectBaseline" useGeneratedKeys="false" keyProperty="id">
<insert id="insert" parameterType="com.xm.core.entity.XmProjectBaseline" useGeneratedKeys="false" keyProperty="id">
insert into XM.xm_project_baseline( insert into XM.xm_project_baseline(
<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},#{planInnerUserAt},#{planOutUserAt},#{locked},#{baseTime},#{baseRemark},#{baselineId},#{planWorkload},#{totalReceivables},#{budgetMarginRate},#{contractAmt},#{planInnerUserPrice},#{planOutUserPrice},#{planOutUserCnt},#{planInnerUserCnt},#{planWorkingHours},#{taxRate},#{planInnerUserWorkload},#{planOutUserWorkload},#{projectId},#{ctime}
#{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},#{projectId}
) )
</insert> </insert>
<!-- 按条件删除若干条记录--> <!-- 按条件删除若干条记录-->
<delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectBaseline"> <delete id="deleteByWhere" parameterType="com.xm.core.entity.XmProjectBaseline">
delete from XM.xm_project_baseline res
delete from XM.xm_project_baseline
<where> <where>
<include refid="where"/>
1=2
</where> </where>
</delete> </delete>
@ -113,16 +113,19 @@
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from XM.xm_project_baseline delete from XM.xm_project_baseline
where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
#{item.id }
</foreach>
where
(id)
in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id}
)
</foreach>
</delete> </delete>
<!--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_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,project_id,ctime
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,project_id
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@ -131,14 +134,14 @@
<if test="code != null and code != ''"> and res.code = #{code} </if> <if test="code != null and code != ''"> and res.code = #{code} </if>
<if test="name != null and name != ''"> and res.name = #{name} </if> <if test="name != null and name != ''"> and res.name = #{name} </if>
<if test="xmType != null and xmType != ''"> and res.xm_type = #{xmType} </if> <if test="xmType != null and xmType != ''"> and res.xm_type = #{xmType} </if>
<if test="startTime != null"> and TO_CHAR(res.start_time,'YYYY-MM-DD') = TO_CHAR(#{startTime},'YYYY-MM-DD') </if>
<if test="endTime != null"> and TO_CHAR(res.end_time,'YYYY-MM-DD') = TO_CHAR(#{endTime},'YYYY-MM-DD') </if>
<if test="startTime != null"> and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d') </if>
<if test="endTime != null"> and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d') </if>
<if test="urgent != null and urgent != ''"> and res.urgent = #{urgent} </if> <if test="urgent != null and urgent != ''"> and res.urgent = #{urgent} </if>
<if test="priority != null and priority != ''"> and res.priority = #{priority} </if> <if test="priority != null and priority != ''"> and res.priority = #{priority} </if>
<if test="description != null and description != ''"> and res.description = #{description} </if> <if test="description != null and description != ''"> and res.description = #{description} </if>
<if test="createUserid != null and createUserid != ''"> and res.create_userid = #{createUserid} </if> <if test="createUserid != null and createUserid != ''"> and res.create_userid = #{createUserid} </if>
<if test="createUsername != null and createUsername != ''"> and res.create_username = #{createUsername} </if> <if test="createUsername != null and createUsername != ''"> and res.create_username = #{createUsername} </if>
<if test="createTime != null"> and TO_CHAR(res.create_time,'YYYY-MM-DD') = TO_CHAR(#{createTime},'YYYY-MM-DD') </if>
<if test="createTime != null"> and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') </if>
<if test="assess != null and assess != ''"> and res.assess = #{assess} </if> <if test="assess != null and assess != ''"> and res.assess = #{assess} </if>
<if test="assessRemarks != null and assessRemarks != ''"> and res.assess_remarks = #{assessRemarks} </if> <if test="assessRemarks != null and assessRemarks != ''"> and res.assess_remarks = #{assessRemarks} </if>
<if test="status != null and status != ''"> and res.status = #{status} </if> <if test="status != null and status != ''"> and res.status = #{status} </if>
@ -150,7 +153,7 @@
<if test="planInnerUserAt != null and planInnerUserAt != ''"> and res.plan_inner_user_at = #{planInnerUserAt} </if> <if test="planInnerUserAt != null and planInnerUserAt != ''"> and res.plan_inner_user_at = #{planInnerUserAt} </if>
<if test="planOutUserAt != null and planOutUserAt != ''"> and res.plan_out_user_at = #{planOutUserAt} </if> <if test="planOutUserAt != null and planOutUserAt != ''"> and res.plan_out_user_at = #{planOutUserAt} </if>
<if test="locked != null and locked != ''"> and res.locked = #{locked} </if> <if test="locked != null and locked != ''"> and res.locked = #{locked} </if>
<if test="baseTime != null"> and TO_CHAR(res.base_time,'YYYY-MM-DD') = TO_CHAR(#{baseTime},'YYYY-MM-DD') </if>
<if test="baseTime != null"> and date_format(res.base_time,'%Y-%m-%d') = date_format(#{baseTime},'%Y-%m-%d') </if>
<if test="baseRemark != null and baseRemark != ''"> and res.base_remark = #{baseRemark} </if> <if test="baseRemark != null and baseRemark != ''"> and res.base_remark = #{baseRemark} </if>
<if test="baselineId != null and baselineId != ''"> and res.baseline_id = #{baselineId} </if> <if test="baselineId != null and baselineId != ''"> and res.baseline_id = #{baselineId} </if>
<if test="planWorkload != null and planWorkload != ''"> and res.plan_workload = #{planWorkload} </if> <if test="planWorkload != null and planWorkload != ''"> and res.plan_workload = #{planWorkload} </if>
@ -165,8 +168,10 @@
<if test="taxRate != null and taxRate != ''"> and res.tax_rate = #{taxRate} </if> <if test="taxRate != null and taxRate != ''"> and res.tax_rate = #{taxRate} </if>
<if test="planInnerUserWorkload != null and planInnerUserWorkload != ''"> and res.plan_inner_user_workload = #{planInnerUserWorkload} </if> <if test="planInnerUserWorkload != null and planInnerUserWorkload != ''"> and res.plan_inner_user_workload = #{planInnerUserWorkload} </if>
<if test="planOutUserWorkload != null and planOutUserWorkload != ''"> and res.plan_out_user_workload = #{planOutUserWorkload} </if> <if test="planOutUserWorkload != null and planOutUserWorkload != ''"> and res.plan_out_user_workload = #{planOutUserWorkload} </if>
<if test="fromTplId != null and fromTplId != ''"> and res.from_tpl_id = #{fromTplId} </if>
<if test="budgetCtrl != null and budgetCtrl != ''"> and res.budget_ctrl = #{budgetCtrl} </if>
<if test="deptid != null and deptid != ''"> and res.deptid = #{deptid} </if>
<if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if> <if test="projectId != null and projectId != ''"> and res.project_id = #{projectId} </if>
<if test="ctime != null"> and TO_CHAR(res.ctime,'YYYY-MM-DD') = TO_CHAR(#{ctime},'YYYY-MM-DD') </if>
</sql> </sql>
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
@ -207,8 +212,10 @@
tax_rate = #{taxRate}, tax_rate = #{taxRate},
plan_inner_user_workload = #{planInnerUserWorkload}, plan_inner_user_workload = #{planInnerUserWorkload},
plan_out_user_workload = #{planOutUserWorkload}, plan_out_user_workload = #{planOutUserWorkload},
project_id = #{projectId},
ctime = #{ctime}
from_tpl_id = #{fromTplId},
budget_ctrl = #{budgetCtrl},
deptid = #{deptid},
project_id = #{projectId}
</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>
@ -248,8 +255,10 @@
<if test="taxRate != null and taxRate != ''"> tax_rate = #{taxRate}, </if> <if test="taxRate != null and taxRate != ''"> tax_rate = #{taxRate}, </if>
<if test="planInnerUserWorkload != null and planInnerUserWorkload != ''"> plan_inner_user_workload = #{planInnerUserWorkload}, </if> <if test="planInnerUserWorkload != null and planInnerUserWorkload != ''"> plan_inner_user_workload = #{planInnerUserWorkload}, </if>
<if test="planOutUserWorkload != null and planOutUserWorkload != ''"> plan_out_user_workload = #{planOutUserWorkload}, </if> <if test="planOutUserWorkload != null and planOutUserWorkload != ''"> plan_out_user_workload = #{planOutUserWorkload}, </if>
<if test="fromTplId != null and fromTplId != ''"> from_tpl_id = #{fromTplId}, </if>
<if test="budgetCtrl != null and budgetCtrl != ''"> budget_ctrl = #{budgetCtrl}, </if>
<if test="deptid != null and deptid != ''"> deptid = #{deptid}, </if>
<if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if> <if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if>
<if test="ctime != null"> ctime = #{ctime}, </if>
</sql> </sql>
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
@ -290,7 +299,9 @@
tax_rate = #{item.taxRate}, tax_rate = #{item.taxRate},
plan_inner_user_workload = #{item.planInnerUserWorkload}, plan_inner_user_workload = #{item.planInnerUserWorkload},
plan_out_user_workload = #{item.planOutUserWorkload}, plan_out_user_workload = #{item.planOutUserWorkload},
project_id = #{item.projectId},
ctime = #{item.ctime}
from_tpl_id = #{item.fromTplId},
budget_ctrl = #{item.budgetCtrl},
deptid = #{item.deptid},
project_id = #{item.projectId}
</sql> </sql>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save