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 2b14d02a..1278b041 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 @@ -39,7 +39,7 @@ public class XmTaskExecuser implements java.io.Serializable { @ApiModelProperty(notes="离开时间",allowEmptyValue=true,example="",allowableValues="") Date endTime; - @ApiModelProperty(notes="执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5付款中6付款成功7放弃任务",allowEmptyValue=true,example="",allowableValues="") + @ApiModelProperty(notes="执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5结算中6结算成功7放弃任务8黑名单",allowEmptyValue=true,example="",allowableValues="") String status; @ApiModelProperty(notes="备注",allowEmptyValue=true,example="",allowableValues="") @@ -160,7 +160,7 @@ public class XmTaskExecuser implements java.io.Serializable { this.endTime = endTime; } /** - * 执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5付款中6付款成功7放弃任务 + * 执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5结算中6结算成功7放弃任务8黑名单 **/ public void setStatus(String status) { this.status = status; @@ -347,7 +347,7 @@ public class XmTaskExecuser implements java.io.Serializable { return this.endTime; } /** - * 执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5付款中6付款成功7放弃任务 + * 执行人状态0候选排队中1执行任务中2提交任务3验收成功4验收不通过5结算中6结算成功7放弃任务8黑名单 **/ public String getStatus() { return this.status; diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index dc2e5051..7604cab2 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -454,23 +454,27 @@ public class XmTaskExecuserService extends BaseService { flowVars.put("id", this.createKey("id")); this.insert("insertProcessApprova", flowVars); flowVars.put("settleStatus", "4"); + flowVars.put("status","5"); this.updateFlowStateByProcInst("1", flowVars); }else if("PROCESS_COMPLETED".equals(eventName)) { if("1".equals(agree)) { //结算通过,需要调用财务系统进行记账结算到用户的结算账户中。//用户可以通过该账户提现取现金 // todo 需要调用财务系统进行记账结算到用户的结算账户中。用户可以通过该账户提现取现金 - //flowVars.put("settleStatus", "4"); + flowVars.put("settleStatus","6"); + flowVars.put("status","6"); this.updateFlowStateByProcInst("2", flowVars); //结算通过,更新费用表状态未1,申请通过 this.xmProjectMCostUserService.updateExecuserStatusByExecuserProcInstId(procInstId,"1"); }else { //结算申请不通过,需要删除成本表中相关数据,还原执行表中相关数据 - flowVars.put("settleStatus", "0"); + flowVars.put("settleStatus", "5"); + flowVars.put("status","3"); this.updateFlowStateByProcInst("3", flowVars); this.xmProjectMCostUserService.deleteByExecuserProcInstId(procInstId); } }else if("PROCESS_CANCELLED".equals(eventName)) { flowVars.put("settleStatus", "0"); + flowVars.put("status", "3"); this.updateFlowStateByProcInst("4", flowVars); this.xmProjectMCostUserService.deleteByExecuserProcInstId(procInstId); //结算申请不通过,需要删除成本表中相关数据,还原执行表中相关数据 diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml index f73a1037..2d5ab22c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectMCostUserMapper.xml @@ -102,7 +102,7 @@ and res.subject_id =#{subjectId} and res.cost_type =#{costType} - group by res.project_id,res.userid,res.username,subject_id,subject_name,biz_month + group by res.project_id,res.userid,subject_id,biz_month