Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
e23792afaa
  1. 149
      xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
  2. 117
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml

149
xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java

@ -8,54 +8,39 @@ import java.math.BigDecimal;
/** /**
* 组织 com 顶级模块 xm 大模块 core 小模块 <br> * 组织 com 顶级模块 xm 大模块 core 小模块 <br>
* 实体 XmTaskExecuser所有属性名: <br> * 实体 XmTaskExecuser所有属性名: <br>
* createTime,id,taskId,userid,startTime,endTime,status,remarks,settleAmount,settleWorkload,settleStatus,settleTime,createUserid,createUsername,username,matchScore,quoteWeekday,quoteAmount,quoteTime,bizProcInstId,bizFlowState,projectId,phaseId,skillRemark,quoteWorkload,quoteStartTime,quoteEndTime,branchId,phaseName,taskName,isLeader,distUserid,distUsername,execUserBranchid,shareKey;<br>
* createTime,taskId,userid,startTime,endTime,status,remarks,createUserid,createUsername,username,matchScore,quoteWeekday,quoteAmount,quoteTime,projectId,phaseId,skillRemark,quoteWorkload,quoteStartTime,quoteEndTime,branchId,phaseName,taskName,distUserid,distUsername,execUserBranchid,shareKey;<br>
* xm_task_execuser xm_task_execuser的所有字段名: <br> * xm_task_execuser xm_task_execuser的所有字段名: <br>
* create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,is_leader,dist_userid,dist_username,exec_user_branchid,share_key;<br>
* create_time,task_id,userid,start_time,end_time,status,remarks,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,dist_userid,dist_username,exec_user_branchid,share_key;<br>
* 当前主键(包括多主键):<br> * 当前主键(包括多主键):<br>
* id;<br>
* task_id,userid;<br>
*/ */
@ApiModel(description="xm_task_execuser") @ApiModel(description="xm_task_execuser")
public class XmTaskExecuser implements java.io.Serializable { public class XmTaskExecuser implements java.io.Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty(notes="编号,主键",allowEmptyValue=true,example="",allowableValues="")
String id;
@ApiModelProperty(notes="任务id,主键",allowEmptyValue=true,example="",allowableValues="")
String taskId;
@ApiModelProperty(notes="执行人id,主键",allowEmptyValue=true,example="",allowableValues="")
String userid;
@ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="创建时间",allowEmptyValue=true,example="",allowableValues="")
Date createTime; Date createTime;
@ApiModelProperty(notes="任务id",allowEmptyValue=true,example="",allowableValues="")
String taskId;
@ApiModelProperty(notes="执行人id",allowEmptyValue=true,example="",allowableValues="")
String userid;
@ApiModelProperty(notes="加入时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="加入时间",allowEmptyValue=true,example="",allowableValues="")
Date startTime; Date startTime;
@ApiModelProperty(notes="离开时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="离开时间",allowEmptyValue=true,example="",allowableValues="")
Date endTime; Date endTime;
@ApiModelProperty(notes="执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5结算中6结算成功7放弃任务8黑名单",allowEmptyValue=true,example="",allowableValues="")
@ApiModelProperty(notes="执行人状态0候选排队中1执行任务中7放弃任务8黑名单",allowEmptyValue=true,example="",allowableValues="")
String status; String status;
@ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="")
String remarks; String remarks;
@ApiModelProperty(notes="已结算金额",allowEmptyValue=true,example="",allowableValues="")
BigDecimal settleAmount;
@ApiModelProperty(notes="已结算工作量",allowEmptyValue=true,example="",allowableValues="")
BigDecimal settleWorkload;
@ApiModelProperty(notes="结算状态0未结算4已申请结算5结算失败6已全部结算",allowEmptyValue=true,example="",allowableValues="")
String settleStatus;
@ApiModelProperty(notes="上次结算时间",allowEmptyValue=true,example="",allowableValues="")
Date settleTime;
@ApiModelProperty(notes="创建人",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="创建人",allowEmptyValue=true,example="",allowableValues="")
String createUserid; String createUserid;
@ -77,12 +62,6 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="报价时间",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="报价时间",allowEmptyValue=true,example="",allowableValues="")
Date quoteTime; Date quoteTime;
@ApiModelProperty(notes="当前流程实例编号",allowEmptyValue=true,example="",allowableValues="")
String bizProcInstId;
@ApiModelProperty(notes="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除",allowEmptyValue=true,example="",allowableValues="")
String bizFlowState;
@ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="项目编号",allowEmptyValue=true,example="",allowableValues="")
String projectId; String projectId;
@ -110,9 +89,6 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="任务名称",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="任务名称",allowEmptyValue=true,example="",allowableValues="")
String taskName; String taskName;
@ApiModelProperty(notes="是否主负责人0否1是",allowEmptyValue=true,example="",allowableValues="")
String isLeader;
@ApiModelProperty(notes="推荐人编号",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="推荐人编号",allowEmptyValue=true,example="",allowableValues="")
String distUserid; String distUserid;
@ -125,9 +101,10 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="") @ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="")
String shareKey; String shareKey;
/**编号**/
public XmTaskExecuser(String id) {
this.id = id;
/**任务id,执行人id**/
public XmTaskExecuser(String taskId,String userid) {
this.taskId = taskId;
this.userid = userid;
} }
/**xm_task_execuser**/ /**xm_task_execuser**/
@ -140,12 +117,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setCreateTime(Date createTime) { public void setCreateTime(Date createTime) {
this.createTime = createTime; this.createTime = createTime;
} }
/**
* 编号
**/
public void setId(String id) {
this.id = id;
}
/** /**
* 任务id * 任务id
**/ **/
@ -171,7 +142,7 @@ public class XmTaskExecuser implements java.io.Serializable {
this.endTime = endTime; this.endTime = endTime;
} }
/** /**
* 执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5结算中6结算成功7放弃任务8黑名单
* 执行人状态0候选排队中1执行任务中7放弃任务8黑名单
**/ **/
public void setStatus(String status) { public void setStatus(String status) {
this.status = status; this.status = status;
@ -182,30 +153,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setRemarks(String remarks) { public void setRemarks(String remarks) {
this.remarks = remarks; this.remarks = remarks;
} }
/**
* 已结算金额
**/
public void setSettleAmount(BigDecimal settleAmount) {
this.settleAmount = settleAmount;
}
/**
* 已结算工作量
**/
public void setSettleWorkload(BigDecimal settleWorkload) {
this.settleWorkload = settleWorkload;
}
/**
* 结算状态0未结算4已申请结算5结算失败6已全部结算
**/
public void setSettleStatus(String settleStatus) {
this.settleStatus = settleStatus;
}
/**
* 上次结算时间
**/
public void setSettleTime(Date settleTime) {
this.settleTime = settleTime;
}
/** /**
* 创建人 * 创建人
**/ **/
@ -248,18 +195,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setQuoteTime(Date quoteTime) { public void setQuoteTime(Date quoteTime) {
this.quoteTime = quoteTime; this.quoteTime = quoteTime;
} }
/**
* 当前流程实例编号
**/
public void setBizProcInstId(String bizProcInstId) {
this.bizProcInstId = bizProcInstId;
}
/**
* 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
**/
public void setBizFlowState(String bizFlowState) {
this.bizFlowState = bizFlowState;
}
/** /**
* 项目编号 * 项目编号
**/ **/
@ -314,12 +249,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setTaskName(String taskName) { public void setTaskName(String taskName) {
this.taskName = taskName; this.taskName = taskName;
} }
/**
* 是否主负责人0否1是
**/
public void setIsLeader(String isLeader) {
this.isLeader = isLeader;
}
/** /**
* 推荐人编号 * 推荐人编号
**/ **/
@ -351,12 +280,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public Date getCreateTime() { public Date getCreateTime() {
return this.createTime; return this.createTime;
} }
/**
* 编号
**/
public String getId() {
return this.id;
}
/** /**
* 任务id * 任务id
**/ **/
@ -382,7 +305,7 @@ public class XmTaskExecuser implements java.io.Serializable {
return this.endTime; return this.endTime;
} }
/** /**
* 执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5结算中6结算成功7放弃任务8黑名单
* 执行人状态0候选排队中1执行任务中7放弃任务8黑名单
**/ **/
public String getStatus() { public String getStatus() {
return this.status; return this.status;
@ -393,30 +316,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public String getRemarks() { public String getRemarks() {
return this.remarks; return this.remarks;
} }
/**
* 已结算金额
**/
public BigDecimal getSettleAmount() {
return this.settleAmount;
}
/**
* 已结算工作量
**/
public BigDecimal getSettleWorkload() {
return this.settleWorkload;
}
/**
* 结算状态0未结算4已申请结算5结算失败6已全部结算
**/
public String getSettleStatus() {
return this.settleStatus;
}
/**
* 上次结算时间
**/
public Date getSettleTime() {
return this.settleTime;
}
/** /**
* 创建人 * 创建人
**/ **/
@ -459,18 +358,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public Date getQuoteTime() { public Date getQuoteTime() {
return this.quoteTime; return this.quoteTime;
} }
/**
* 当前流程实例编号
**/
public String getBizProcInstId() {
return this.bizProcInstId;
}
/**
* 当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除
**/
public String getBizFlowState() {
return this.bizFlowState;
}
/** /**
* 项目编号 * 项目编号
**/ **/
@ -525,12 +412,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public String getTaskName() { public String getTaskName() {
return this.taskName; return this.taskName;
} }
/**
* 是否主负责人0否1是
**/
public String getIsLeader() {
return this.isLeader;
}
/** /**
* 推荐人编号 * 推荐人编号
**/ **/

117
xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml

@ -6,56 +6,13 @@
<!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动,因为代码随时重新生成 --> <!--开始 自定sql函数区域 请在此区域添加自定义函数,其它区域尽量不要动,因为代码随时重新生成 -->
<sql id="whereForMap"> <sql id="whereForMap">
<if test=" ids != null"> and (res.id) in
<foreach collection="ids" item="item" index="index" open="(" separator="," close=")" >
( #{item})
<if test=" pkList != null"> and (res.task_id, res.userid) in
<foreach collection="pkList" item="item" index="index" open="(" separator="," close=")" >
( #{item.taskId}, #{item.userid})
</foreach> </foreach>
</if> </if>
<if test="key != null and key !='' "> </if> <if test="key != null and key !='' "> </if>
</sql> </sql>
<insert id="insertProcessApprova"
parameterType="HashMap"
useGeneratedKeys="false" keyProperty="id">
insert into xm_task_execuser_process_approva (
id,execuser_id,project_id,flow_branch_id,agree,act_id,task_name,proc_inst_id,main_title,comment_msg,flow_last_time,event_name,biz_key,model_key,assignee,start_userid,proc_def_id
) values (
#{id},#{execuserId},#{projectId},#{flowBranchId},#{agree},#{actId},#{taskName},#{procInstId},#{mainTitle},#{commentMsg},#{flowLastTime},#{eventName},#{bizKey},#{modelKey},#{assignee},#{startUserid},#{procDefId}
)
</insert>
<!-- 同时修改业务表及流程审批表数据状态 -->
<update id="updateProcessApprova" parameterType="HashMap">
update xm_task_execuser b left join xm_task_execuser_process_approva pa on b.id=pa.execuser_id
<set>
<if test=' agree != null and agree !="" '> pa.agree = #{agree},</if>
<if test=' actId != null and actId !="" '> pa.act_id = #{actId},</if>
<if test=' assignee != null and assignee !="" '> pa.assignee = #{assignee},</if>
<if test=' assigneeName != null and assigneeName !="" '> pa.assignee_name = #{assigneeName},</if>
<if test=' taskName != null and taskName !="" '> pa.task_name = #{taskName},</if>
<if test=' commentMsg != null and commentMsg !="" '> pa.comment_msg = #{commentMsg},</if>
pa.flow_last_time = now(),
<if test=' eventName != null and eventName !="" '> pa.event_name = #{eventName},</if>
<if test=' flowState != null and flowState !="" '> pa.flow_state=#{flowState},</if>
<if test=' bizFlowState != null and bizFlowState !="" '> b.biz_flow_state=#{bizFlowState},</if>
<if test=' bizProcInstId != null and bizProcInstId !="" '> b.biz_proc_inst_id=#{bizProcInstId},</if>
<if test=' settleStatus != null and settleStatus !="" '> b.settle_status=#{settleStatus},</if>
</set>
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
and b.id=pa.execuser_id
</update>
<update id="updateFlowStateByProcInstForDeleteSuccess"
parameterType="HashMap">
update xm_task_execuser_process_approva pa set pa.flow_state='2'
where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
</update>
<!-- 按条件删除若干条记录-->
<delete id="deleteByProcInstId" parameterType="HashMap">
delete from xm_task_execuser
where biz_proc_inst_id=#{procInstId}
</delete>
<update id="updateXmTaskExeUseridsAndUsernamesByTaskId" <update id="updateXmTaskExeUseridsAndUsernamesByTaskId"
parameterType="String"> parameterType="String">
UPDATE xm_task t UPDATE xm_task t
@ -125,8 +82,7 @@
<!-- 通过条件查询获取数据列表 返回list<map> --> <!-- 通过条件查询获取数据列表 返回list<map> -->
<select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap"> <select id="selectListMapByWhere" parameterType="HashMap" resultType="HashMap">
select res.*,pa.proc_inst_id,pa.assignee,pa.assignee_name,pa.main_title,pa.flow_branch_id,pa.task_name,pa.agree,pa.flow_last_time,pa.comment_msg,pa.proc_def_id,pa.flow_state from xm_task_execuser res left join xm_task_execuser_process_approva pa on res.id=pa.execuser_id and res.biz_proc_inst_id=pa.proc_inst_id
select * from xm_task_execuser res
<where> <where>
<include refid="whereForMap"/> <include refid="whereForMap"/>
<include refid="where"/> <include refid="where"/>
@ -145,20 +101,22 @@
<select id="selectOneObject" parameterType="com.xm.core.entity.XmTaskExecuser" resultType="com.xm.core.entity.XmTaskExecuser"> <select id="selectOneObject" parameterType="com.xm.core.entity.XmTaskExecuser" resultType="com.xm.core.entity.XmTaskExecuser">
select * from xm_task_execuser res select * from xm_task_execuser res
where where
res.id = #{id}
res.task_id = #{taskId}
and res.userid = #{userid}
</select> </select>
<select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmTaskExecuser"> <select id="selectListByIds" parameterType="List" resultType="com.xm.core.entity.XmTaskExecuser">
select * from xm_task_execuser res select * from xm_task_execuser res
where (res.id) in
where (res.task_id, res.userid) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" > <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item})
( #{item.taskId}, #{item.userid})
</foreach> </foreach>
</select> </select>
<!-- 通过主键查询获取数据对象 返回map--> <!-- 通过主键查询获取数据对象 返回map-->
<select id="selectOneMap" parameterType="HashMap" resultType="HashMap"> <select id="selectOneMap" parameterType="HashMap" resultType="HashMap">
select * from xm_task_execuser res select * from xm_task_execuser res
where where
res.id = #{id}
res.task_id = #{taskId}
and res.userid = #{userid}
</select> </select>
<!-- 获取数据条目 返回long --> <!-- 获取数据条目 返回long -->
<select id="countByWhere" parameterType="com.xm.core.entity.XmTaskExecuser" resultType="long"> <select id="countByWhere" parameterType="com.xm.core.entity.XmTaskExecuser" resultType="long">
@ -167,12 +125,12 @@
<include refid="where"/> <include refid="where"/>
</where> </where>
</select> </select>
<!-- 新增一条记录 主键id,-->
<insert id="insert" parameterType="com.xm.core.entity.XmTaskExecuser" useGeneratedKeys="false" keyProperty="id">
<!-- 新增一条记录 主键task_id,userid,-->
<insert id="insert" parameterType="com.xm.core.entity.XmTaskExecuser" useGeneratedKeys="false" >
insert into xm_task_execuser( insert into xm_task_execuser(
<include refid="columns"/> <include refid="columns"/>
) values ( ) values (
#{createTime},#{id},#{taskId},#{userid},#{startTime},#{endTime},#{status},#{remarks},#{settleAmount},#{settleWorkload},#{settleStatus},#{settleTime},#{createUserid},#{createUsername},#{username},#{matchScore},#{quoteWeekday},#{quoteAmount},#{quoteTime},#{bizProcInstId},#{bizFlowState},#{projectId},#{phaseId},#{skillRemark},#{quoteWorkload},#{quoteStartTime},#{quoteEndTime},#{branchId},#{phaseName},#{taskName},#{isLeader},#{distUserid},#{distUsername},#{execUserBranchid},#{shareKey}
#{createTime},#{taskId},#{userid},#{startTime},#{endTime},#{status},#{remarks},#{createUserid},#{createUsername},#{username},#{matchScore},#{quoteWeekday},#{quoteAmount},#{quoteTime},#{projectId},#{phaseId},#{skillRemark},#{quoteWorkload},#{quoteStartTime},#{quoteEndTime},#{branchId},#{phaseName},#{taskName},#{distUserid},#{distUsername},#{execUserBranchid},#{shareKey}
) )
</insert> </insert>
@ -187,7 +145,7 @@
<!-- 按主键删除一条记录--> <!-- 按主键删除一条记录-->
<delete id="deleteByPk" parameterType="com.xm.core.entity.XmTaskExecuser"> <delete id="deleteByPk" parameterType="com.xm.core.entity.XmTaskExecuser">
delete from xm_task_execuser delete from xm_task_execuser
where id = #{id}
where task_id = #{taskId} and userid = #{userid}
</delete> </delete>
<!-- 根据条件修改若干条记录 --> <!-- 根据条件修改若干条记录 -->
@ -196,7 +154,7 @@
<set> <set>
<include refid="someFieldSet"/> <include refid="someFieldSet"/>
</set> </set>
where id = #{id}
where task_id = #{taskId} and userid = #{userid}
</update> </update>
<!-- 根据主键修改一条记录 --> <!-- 根据主键修改一条记录 -->
@ -205,7 +163,7 @@
<set> <set>
<include refid="set"/> <include refid="set"/>
</set> </set>
where id = #{id}
where task_id = #{taskId} and userid = #{userid}
</update> </update>
<!-- 批量新增 批量插入 借用insert 循环插入实现 <!-- 批量新增 批量插入 借用insert 循环插入实现
@ -219,39 +177,34 @@
update xm_task_execuser update xm_task_execuser
set set
<include refid="batchSet"/> <include refid="batchSet"/>
where id = #{item.id}
where task_id = #{item.taskId} and userid = #{item.userid}
</foreach> </foreach>
</update> </update>
<!-- 批量删除 --> <!-- 批量删除 -->
<delete id="batchDelete" parameterType="List"> <delete id="batchDelete" parameterType="List">
delete from xm_task_execuser delete from xm_task_execuser
where where
(id) in
(task_id, userid) in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")" > <foreach collection="list" item="item" index="index" open="(" separator="," close=")" >
( #{item.id} )
( #{item.taskId}, #{item.userid} )
</foreach> </foreach>
</delete> </delete>
<!--sql片段 列--> <!--sql片段 列-->
<sql id="columns"> <sql id="columns">
create_time,id,task_id,userid,start_time,end_time,status,remarks,settle_amount,settle_workload,settle_status,settle_time,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,biz_proc_inst_id,biz_flow_state,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,is_leader,dist_userid,dist_username,exec_user_branchid,share_key
create_time,task_id,userid,start_time,end_time,status,remarks,create_userid,create_username,username,match_score,quote_weekday,quote_amount,quote_time,project_id,phase_id,skill_remark,quote_workload,quote_start_time,quote_end_time,branch_id,phase_name,task_name,dist_userid,dist_username,exec_user_branchid,share_key
</sql> </sql>
<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS--> <!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
<sql id="where"> <sql id="where">
<if test="createTime != null"> and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') </if> <if test="createTime != null"> and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d') </if>
<if test="id != null and id != ''"> and res.id = #{id} </if>
<if test="taskId != null and taskId != ''"> and res.task_id = #{taskId} </if> <if test="taskId != null and taskId != ''"> and res.task_id = #{taskId} </if>
<if test="userid != null and userid != ''"> and res.userid = #{userid} </if> <if test="userid != null and userid != ''"> and res.userid = #{userid} </if>
<if test="startTime != null"> and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d') </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="endTime != null"> and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d') </if>
<if test="status != null and status != ''"> and res.status = #{status} </if> <if test="status != null and status != ''"> and res.status = #{status} </if>
<if test="remarks != null and remarks != ''"> and res.remarks = #{remarks} </if> <if test="remarks != null and remarks != ''"> and res.remarks = #{remarks} </if>
<if test="settleAmount != null and settleAmount != ''"> and res.settle_amount = #{settleAmount} </if>
<if test="settleWorkload != null and settleWorkload != ''"> and res.settle_workload = #{settleWorkload} </if>
<if test="settleStatus != null and settleStatus != ''"> and res.settle_status = #{settleStatus} </if>
<if test="settleTime != null"> and date_format(res.settle_time,'%Y-%m-%d') = date_format(#{settleTime},'%Y-%m-%d') </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="username != null and username != ''"> and res.username = #{username} </if> <if test="username != null and username != ''"> and res.username = #{username} </if>
@ -259,8 +212,6 @@
<if test="quoteWeekday != null and quoteWeekday != ''"> and res.quote_weekday = #{quoteWeekday} </if> <if test="quoteWeekday != null and quoteWeekday != ''"> and res.quote_weekday = #{quoteWeekday} </if>
<if test="quoteAmount != null and quoteAmount != ''"> and res.quote_amount = #{quoteAmount} </if> <if test="quoteAmount != null and quoteAmount != ''"> and res.quote_amount = #{quoteAmount} </if>
<if test="quoteTime != null"> and date_format(res.quote_time,'%Y-%m-%d') = date_format(#{quoteTime},'%Y-%m-%d') </if> <if test="quoteTime != null"> and date_format(res.quote_time,'%Y-%m-%d') = date_format(#{quoteTime},'%Y-%m-%d') </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> and res.biz_proc_inst_id = #{bizProcInstId} </if>
<if test="bizFlowState != null and bizFlowState != ''"> and res.biz_flow_state = #{bizFlowState} </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="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if> <if test="phaseId != null and phaseId != ''"> and res.phase_id = #{phaseId} </if>
<if test="skillRemark != null and skillRemark != ''"> and res.skill_remark = #{skillRemark} </if> <if test="skillRemark != null and skillRemark != ''"> and res.skill_remark = #{skillRemark} </if>
@ -270,7 +221,6 @@
<if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if> <if test="branchId != null and branchId != ''"> and res.branch_id = #{branchId} </if>
<if test="phaseName != null and phaseName != ''"> and res.phase_name = #{phaseName} </if> <if test="phaseName != null and phaseName != ''"> and res.phase_name = #{phaseName} </if>
<if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if> <if test="taskName != null and taskName != ''"> and res.task_name = #{taskName} </if>
<if test="isLeader != null and isLeader != ''"> and res.is_leader = #{isLeader} </if>
<if test="distUserid != null and distUserid != ''"> and res.dist_userid = #{distUserid} </if> <if test="distUserid != null and distUserid != ''"> and res.dist_userid = #{distUserid} </if>
<if test="distUsername != null and distUsername != ''"> and res.dist_username = #{distUsername} </if> <if test="distUsername != null and distUsername != ''"> and res.dist_username = #{distUsername} </if>
<if test="execUserBranchid != null and execUserBranchid != ''"> and res.exec_user_branchid = #{execUserBranchid} </if> <if test="execUserBranchid != null and execUserBranchid != ''"> and res.exec_user_branchid = #{execUserBranchid} </if>
@ -279,16 +229,10 @@
<!--sql片段 更新字段 --> <!--sql片段 更新字段 -->
<sql id="set"> <sql id="set">
create_time = #{createTime}, create_time = #{createTime},
task_id = #{taskId},
userid = #{userid},
start_time = #{startTime}, start_time = #{startTime},
end_time = #{endTime}, end_time = #{endTime},
status = #{status}, status = #{status},
remarks = #{remarks}, remarks = #{remarks},
settle_amount = #{settleAmount},
settle_workload = #{settleWorkload},
settle_status = #{settleStatus},
settle_time = #{settleTime},
create_userid = #{createUserid}, create_userid = #{createUserid},
create_username = #{createUsername}, create_username = #{createUsername},
username = #{username}, username = #{username},
@ -296,8 +240,6 @@
quote_weekday = #{quoteWeekday}, quote_weekday = #{quoteWeekday},
quote_amount = #{quoteAmount}, quote_amount = #{quoteAmount},
quote_time = #{quoteTime}, quote_time = #{quoteTime},
biz_proc_inst_id = #{bizProcInstId},
biz_flow_state = #{bizFlowState},
project_id = #{projectId}, project_id = #{projectId},
phase_id = #{phaseId}, phase_id = #{phaseId},
skill_remark = #{skillRemark}, skill_remark = #{skillRemark},
@ -307,7 +249,6 @@
branch_id = #{branchId}, branch_id = #{branchId},
phase_name = #{phaseName}, phase_name = #{phaseName},
task_name = #{taskName}, task_name = #{taskName},
is_leader = #{isLeader},
dist_userid = #{distUserid}, dist_userid = #{distUserid},
dist_username = #{distUsername}, dist_username = #{distUsername},
exec_user_branchid = #{execUserBranchid}, exec_user_branchid = #{execUserBranchid},
@ -315,16 +256,10 @@
</sql> </sql>
<sql id="someFieldSet"> <sql id="someFieldSet">
<if test="createTime != null"> create_time = #{createTime}, </if> <if test="createTime != null"> create_time = #{createTime}, </if>
<if test="taskId != null and taskId != ''"> task_id = #{taskId}, </if>
<if test="userid != null and userid != ''"> userid = #{userid}, </if>
<if test="startTime != null"> start_time = #{startTime}, </if> <if test="startTime != null"> start_time = #{startTime}, </if>
<if test="endTime != null"> end_time = #{endTime}, </if> <if test="endTime != null"> end_time = #{endTime}, </if>
<if test="status != null and status != ''"> status = #{status}, </if> <if test="status != null and status != ''"> status = #{status}, </if>
<if test="remarks != null and remarks != ''"> remarks = #{remarks}, </if> <if test="remarks != null and remarks != ''"> remarks = #{remarks}, </if>
<if test="settleAmount != null and settleAmount != ''"> settle_amount = #{settleAmount}, </if>
<if test="settleWorkload != null and settleWorkload != ''"> settle_workload = #{settleWorkload}, </if>
<if test="settleStatus != null and settleStatus != ''"> settle_status = #{settleStatus}, </if>
<if test="settleTime != null"> settle_time = #{settleTime}, </if>
<if test="createUserid != null and createUserid != ''"> create_userid = #{createUserid}, </if> <if test="createUserid != null and createUserid != ''"> create_userid = #{createUserid}, </if>
<if test="createUsername != null and createUsername != ''"> create_username = #{createUsername}, </if> <if test="createUsername != null and createUsername != ''"> create_username = #{createUsername}, </if>
<if test="username != null and username != ''"> username = #{username}, </if> <if test="username != null and username != ''"> username = #{username}, </if>
@ -332,8 +267,6 @@
<if test="quoteWeekday != null and quoteWeekday != ''"> quote_weekday = #{quoteWeekday}, </if> <if test="quoteWeekday != null and quoteWeekday != ''"> quote_weekday = #{quoteWeekday}, </if>
<if test="quoteAmount != null and quoteAmount != ''"> quote_amount = #{quoteAmount}, </if> <if test="quoteAmount != null and quoteAmount != ''"> quote_amount = #{quoteAmount}, </if>
<if test="quoteTime != null"> quote_time = #{quoteTime}, </if> <if test="quoteTime != null"> quote_time = #{quoteTime}, </if>
<if test="bizProcInstId != null and bizProcInstId != ''"> biz_proc_inst_id = #{bizProcInstId}, </if>
<if test="bizFlowState != null and bizFlowState != ''"> biz_flow_state = #{bizFlowState}, </if>
<if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if> <if test="projectId != null and projectId != ''"> project_id = #{projectId}, </if>
<if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if> <if test="phaseId != null and phaseId != ''"> phase_id = #{phaseId}, </if>
<if test="skillRemark != null and skillRemark != ''"> skill_remark = #{skillRemark}, </if> <if test="skillRemark != null and skillRemark != ''"> skill_remark = #{skillRemark}, </if>
@ -343,7 +276,6 @@
<if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if> <if test="branchId != null and branchId != ''"> branch_id = #{branchId}, </if>
<if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName}, </if> <if test="phaseName != null and phaseName != ''"> phase_name = #{phaseName}, </if>
<if test="taskName != null and taskName != ''"> task_name = #{taskName}, </if> <if test="taskName != null and taskName != ''"> task_name = #{taskName}, </if>
<if test="isLeader != null and isLeader != ''"> is_leader = #{isLeader}, </if>
<if test="distUserid != null and distUserid != ''"> dist_userid = #{distUserid}, </if> <if test="distUserid != null and distUserid != ''"> dist_userid = #{distUserid}, </if>
<if test="distUsername != null and distUsername != ''"> dist_username = #{distUsername}, </if> <if test="distUsername != null and distUsername != ''"> dist_username = #{distUsername}, </if>
<if test="execUserBranchid != null and execUserBranchid != ''"> exec_user_branchid = #{execUserBranchid}, </if> <if test="execUserBranchid != null and execUserBranchid != ''"> exec_user_branchid = #{execUserBranchid}, </if>
@ -352,16 +284,10 @@
<!--sql片段 批量更新 --> <!--sql片段 批量更新 -->
<sql id="batchSet"> <sql id="batchSet">
create_time = #{item.createTime}, create_time = #{item.createTime},
task_id = #{item.taskId},
userid = #{item.userid},
start_time = #{item.startTime}, start_time = #{item.startTime},
end_time = #{item.endTime}, end_time = #{item.endTime},
status = #{item.status}, status = #{item.status},
remarks = #{item.remarks}, remarks = #{item.remarks},
settle_amount = #{item.settleAmount},
settle_workload = #{item.settleWorkload},
settle_status = #{item.settleStatus},
settle_time = #{item.settleTime},
create_userid = #{item.createUserid}, create_userid = #{item.createUserid},
create_username = #{item.createUsername}, create_username = #{item.createUsername},
username = #{item.username}, username = #{item.username},
@ -369,8 +295,6 @@
quote_weekday = #{item.quoteWeekday}, quote_weekday = #{item.quoteWeekday},
quote_amount = #{item.quoteAmount}, quote_amount = #{item.quoteAmount},
quote_time = #{item.quoteTime}, quote_time = #{item.quoteTime},
biz_proc_inst_id = #{item.bizProcInstId},
biz_flow_state = #{item.bizFlowState},
project_id = #{item.projectId}, project_id = #{item.projectId},
phase_id = #{item.phaseId}, phase_id = #{item.phaseId},
skill_remark = #{item.skillRemark}, skill_remark = #{item.skillRemark},
@ -380,7 +304,6 @@
branch_id = #{item.branchId}, branch_id = #{item.branchId},
phase_name = #{item.phaseName}, phase_name = #{item.phaseName},
task_name = #{item.taskName}, task_name = #{item.taskName},
is_leader = #{item.isLeader},
dist_userid = #{item.distUserid}, dist_userid = #{item.distUserid},
dist_username = #{item.distUsername}, dist_username = #{item.distUsername},
exec_user_branchid = #{item.execUserBranchid}, exec_user_branchid = #{item.execUserBranchid},

Loading…
Cancel
Save