Browse Source

fix:解决线上工作票结束环节当前处理人未设为空的问题

zhongwei
haungxing 9 months ago
parent
commit
8ac5491493
  1. 3
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java
  2. 8
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

3
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/workTicket/entity/WorkTicketInfoEntity.java

@ -3,6 +3,7 @@ package com.hnac.hzims.ticket.workTicket.entity;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -408,6 +409,7 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable {
* 下一个审批人 * 下一个审批人
*/ */
@ApiModelProperty("下一个审批人") @ApiModelProperty("下一个审批人")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String nextStepOperator; private String nextStepOperator;
@ -415,6 +417,7 @@ public class WorkTicketInfoEntity extends TenantEntity implements Serializable {
* 当前审批人 * 当前审批人
*/ */
@ApiModelProperty("当前审批人") @ApiModelProperty("当前审批人")
@TableField(updateStrategy = FieldStrategy.IGNORED)
private String stepOperator; private String stepOperator;

8
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java

@ -653,9 +653,9 @@ public class TicketProcessServiceImpl implements TicketProcessService {
JSONObject variable = JSONObject.parseObject(JSON.toJSONString(variablesObj)); JSONObject variable = JSONObject.parseObject(JSON.toJSONString(variablesObj));
Boolean signFlag = Func.isNotEmpty(variable.getBoolean("signFlag")) ? variable.getBoolean("signFlag") : true; Boolean signFlag = Func.isNotEmpty(variable.getBoolean("signFlag")) ? variable.getBoolean("signFlag") : true;
Boolean receiveFlag = Func.isNotEmpty(variable.getBoolean("recieveFlag")) ? variable.getBoolean("recieveFlag") : true; Boolean receiveFlag = Func.isNotEmpty(variable.getBoolean("recieveFlag")) ? variable.getBoolean("recieveFlag") : true;
workTicket.setFlowUserId(response.getUserId());
workTicket.setNextStepOperator(response.getNextStepOperator());
if(StringUtil.isNotBlank(taskId)) { if(StringUtil.isNotBlank(taskId)) {
workTicket.setFlowUserId(response.getUserId());
workTicket.setNextStepOperator(response.getNextStepOperator());
String flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat(",待").concat(response.getNextStepOperator()).concat("审批"); String flowDescription = "审批中,当前环节是".concat(response.getTaskName()).concat(",待").concat(response.getNextStepOperator()).concat("审批");
workTicket.setFlowDescription(flowDescription); workTicket.setFlowDescription(flowDescription);
workTicket.setFlowTaskId(taskId); workTicket.setFlowTaskId(taskId);
@ -665,15 +665,11 @@ public class TicketProcessServiceImpl implements TicketProcessService {
// 作废 // 作废
workTicket.setFlowDescription("作废"); workTicket.setFlowDescription("作废");
workTicket.setFlowTaskName("作废"); workTicket.setFlowTaskName("作废");
workTicket.setNextStepOperator(null);
workTicket.setStepOperator(null);
} }
else { else {
// 结束 // 结束
workTicket.setFlowDescription("结束"); workTicket.setFlowDescription("结束");
workTicket.setFlowTaskName("结束"); workTicket.setFlowTaskName("结束");
workTicket.setNextStepOperator(null);
workTicket.setStepOperator(null);
workTicket.setFlowStatus(999); workTicket.setFlowStatus(999);
workTicket.setImplementStatus("3"); workTicket.setImplementStatus("3");
} }

Loading…
Cancel
Save