diff --git a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
index aa5a886b..83984170 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmTaskExecuser.java
@@ -8,54 +8,39 @@ import java.math.BigDecimal;
/**
* 组织 com 顶级模块 xm 大模块 core 小模块
* 实体 XmTaskExecuser所有属性名:
- * 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;
* 表 xm_task_execuser xm_task_execuser的所有字段名:
- * 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;
* 当前主键(包括多主键):
- * id;
+ * task_id,userid;
*/
@ApiModel(description="xm_task_execuser")
public class XmTaskExecuser implements java.io.Serializable {
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="")
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="")
Date startTime;
@ApiModelProperty(notes="离开时间",allowEmptyValue=true,example="",allowableValues="")
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;
@ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="")
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="")
String createUserid;
@@ -77,12 +62,6 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="报价时间",allowEmptyValue=true,example="",allowableValues="")
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="")
String projectId;
@@ -110,9 +89,6 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="任务名称",allowEmptyValue=true,example="",allowableValues="")
String taskName;
- @ApiModelProperty(notes="是否主负责人0否1是",allowEmptyValue=true,example="",allowableValues="")
- String isLeader;
-
@ApiModelProperty(notes="推荐人编号",allowEmptyValue=true,example="",allowableValues="")
String distUserid;
@@ -125,9 +101,10 @@ public class XmTaskExecuser implements java.io.Serializable {
@ApiModelProperty(notes="分享码",allowEmptyValue=true,example="",allowableValues="")
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**/
@@ -140,12 +117,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
- /**
- * 编号
- **/
- public void setId(String id) {
- this.id = id;
- }
/**
* 任务id
**/
@@ -171,7 +142,7 @@ public class XmTaskExecuser implements java.io.Serializable {
this.endTime = endTime;
}
/**
- * 执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5结算中6结算成功7放弃任务8黑名单
+ * 执行人状态0候选排队中1执行任务中7放弃任务8黑名单
**/
public void setStatus(String status) {
this.status = status;
@@ -182,30 +153,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public void setRemarks(String 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) {
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) {
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() {
return this.createTime;
}
- /**
- * 编号
- **/
- public String getId() {
- return this.id;
- }
/**
* 任务id
**/
@@ -382,7 +305,7 @@ public class XmTaskExecuser implements java.io.Serializable {
return this.endTime;
}
/**
- * 执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5结算中6结算成功7放弃任务8黑名单
+ * 执行人状态0候选排队中1执行任务中7放弃任务8黑名单
**/
public String getStatus() {
return this.status;
@@ -393,30 +316,6 @@ public class XmTaskExecuser implements java.io.Serializable {
public String getRemarks() {
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() {
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() {
return this.taskName;
}
- /**
- * 是否主负责人0否1是
- **/
- public String getIsLeader() {
- return this.isLeader;
- }
/**
* 推荐人编号
**/
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
index a778cb70..e5839470 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml
@@ -6,56 +6,13 @@
- and (res.id) in
-
- ( #{item})
+ and (res.task_id, res.userid) in
+
+ ( #{item.taskId}, #{item.userid})
-
- 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}
- )
-
-
-
-
- update xm_task_execuser b left join xm_task_execuser_process_approva pa on b.id=pa.execuser_id
-
- pa.agree = #{agree},
- pa.act_id = #{actId},
- pa.assignee = #{assignee},
- pa.assignee_name = #{assigneeName},
- pa.task_name = #{taskName},
- pa.comment_msg = #{commentMsg},
- pa.flow_last_time = now(),
- pa.event_name = #{eventName},
- pa.flow_state=#{flowState},
- b.biz_flow_state=#{bizFlowState},
- b.biz_proc_inst_id=#{bizProcInstId},
- b.settle_status=#{settleStatus},
-
-
- where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
- and b.id=pa.execuser_id
-
-
-
- update xm_task_execuser_process_approva pa set pa.flow_state='2'
- where pa.proc_inst_id = #{procInstId} and pa.flow_branch_id=#{flowBranchId}
-
-
-
-
- delete from xm_task_execuser
- where biz_proc_inst_id=#{procInstId}
-
UPDATE xm_task t
@@ -125,8 +82,7 @@
-
-
+
+
insert into xm_task_execuser(
) 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}
)
@@ -187,7 +145,7 @@
delete from xm_task_execuser
- where id = #{id}
+ where task_id = #{taskId} and userid = #{userid}
@@ -196,7 +154,7 @@
- where id = #{id}
+ where task_id = #{taskId} and userid = #{userid}
@@ -205,7 +163,7 @@
- where id = #{id}
+ where task_id = #{taskId} and userid = #{userid}
delete from xm_task_execuser
where
- (id) in
+ (task_id, userid) in
- ( #{item.id} )
+ ( #{item.taskId}, #{item.userid} )
- 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
and date_format(res.create_time,'%Y-%m-%d') = date_format(#{createTime},'%Y-%m-%d')
- and res.id = #{id}
and res.task_id = #{taskId}
and res.userid = #{userid}
and date_format(res.start_time,'%Y-%m-%d') = date_format(#{startTime},'%Y-%m-%d')
and date_format(res.end_time,'%Y-%m-%d') = date_format(#{endTime},'%Y-%m-%d')
and res.status = #{status}
and res.remarks = #{remarks}
- and res.settle_amount = #{settleAmount}
- and res.settle_workload = #{settleWorkload}
- and res.settle_status = #{settleStatus}
- and date_format(res.settle_time,'%Y-%m-%d') = date_format(#{settleTime},'%Y-%m-%d')
and res.create_userid = #{createUserid}
and res.create_username = #{createUsername}
and res.username = #{username}
@@ -259,8 +212,6 @@
and res.quote_weekday = #{quoteWeekday}
and res.quote_amount = #{quoteAmount}
and date_format(res.quote_time,'%Y-%m-%d') = date_format(#{quoteTime},'%Y-%m-%d')
- and res.biz_proc_inst_id = #{bizProcInstId}
- and res.biz_flow_state = #{bizFlowState}
and res.project_id = #{projectId}
and res.phase_id = #{phaseId}
and res.skill_remark = #{skillRemark}
@@ -270,7 +221,6 @@
and res.branch_id = #{branchId}
and res.phase_name = #{phaseName}
and res.task_name = #{taskName}
- and res.is_leader = #{isLeader}
and res.dist_userid = #{distUserid}
and res.dist_username = #{distUsername}
and res.exec_user_branchid = #{execUserBranchid}
@@ -279,16 +229,10 @@
create_time = #{createTime},
- task_id = #{taskId},
- userid = #{userid},
start_time = #{startTime},
end_time = #{endTime},
status = #{status},
remarks = #{remarks},
- settle_amount = #{settleAmount},
- settle_workload = #{settleWorkload},
- settle_status = #{settleStatus},
- settle_time = #{settleTime},
create_userid = #{createUserid},
create_username = #{createUsername},
username = #{username},
@@ -296,8 +240,6 @@
quote_weekday = #{quoteWeekday},
quote_amount = #{quoteAmount},
quote_time = #{quoteTime},
- biz_proc_inst_id = #{bizProcInstId},
- biz_flow_state = #{bizFlowState},
project_id = #{projectId},
phase_id = #{phaseId},
skill_remark = #{skillRemark},
@@ -307,7 +249,6 @@
branch_id = #{branchId},
phase_name = #{phaseName},
task_name = #{taskName},
- is_leader = #{isLeader},
dist_userid = #{distUserid},
dist_username = #{distUsername},
exec_user_branchid = #{execUserBranchid},
@@ -315,16 +256,10 @@
create_time = #{createTime},
- task_id = #{taskId},
- userid = #{userid},
start_time = #{startTime},
end_time = #{endTime},
status = #{status},
remarks = #{remarks},
- settle_amount = #{settleAmount},
- settle_workload = #{settleWorkload},
- settle_status = #{settleStatus},
- settle_time = #{settleTime},
create_userid = #{createUserid},
create_username = #{createUsername},
username = #{username},
@@ -332,8 +267,6 @@
quote_weekday = #{quoteWeekday},
quote_amount = #{quoteAmount},
quote_time = #{quoteTime},
- biz_proc_inst_id = #{bizProcInstId},
- biz_flow_state = #{bizFlowState},
project_id = #{projectId},
phase_id = #{phaseId},
skill_remark = #{skillRemark},
@@ -343,7 +276,6 @@
branch_id = #{branchId},
phase_name = #{phaseName},
task_name = #{taskName},
- is_leader = #{isLeader},
dist_userid = #{distUserid},
dist_username = #{distUsername},
exec_user_branchid = #{execUserBranchid},
@@ -352,16 +284,10 @@
create_time = #{item.createTime},
- task_id = #{item.taskId},
- userid = #{item.userid},
start_time = #{item.startTime},
end_time = #{item.endTime},
status = #{item.status},
remarks = #{item.remarks},
- settle_amount = #{item.settleAmount},
- settle_workload = #{item.settleWorkload},
- settle_status = #{item.settleStatus},
- settle_time = #{item.settleTime},
create_userid = #{item.createUserid},
create_username = #{item.createUsername},
username = #{item.username},
@@ -369,8 +295,6 @@
quote_weekday = #{item.quoteWeekday},
quote_amount = #{item.quoteAmount},
quote_time = #{item.quoteTime},
- biz_proc_inst_id = #{item.bizProcInstId},
- biz_flow_state = #{item.bizFlowState},
project_id = #{item.projectId},
phase_id = #{item.phaseId},
skill_remark = #{item.skillRemark},
@@ -380,7 +304,6 @@
branch_id = #{item.branchId},
phase_name = #{item.phaseName},
task_name = #{item.taskName},
- is_leader = #{item.isLeader},
dist_userid = #{item.distUserid},
dist_username = #{item.distUsername},
exec_user_branchid = #{item.execUserBranchid},