fix: 专业技术企业标准报批流程基类
This commit is contained in:
+1
-45
@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springframework.format.annotation.DateTimeFormat;
|
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@@ -16,7 +14,7 @@ import java.util.Date;
|
|||||||
*
|
*
|
||||||
* @TableName process_es_revision
|
* @TableName process_es_revision
|
||||||
*/
|
*/
|
||||||
@TableName(value ="process_es_revision")
|
@TableName(value ="process_special_es_approval")
|
||||||
@Data
|
@Data
|
||||||
public class ProcessSpecialEsApproval implements Serializable {
|
public class ProcessSpecialEsApproval implements Serializable {
|
||||||
/**
|
/**
|
||||||
@@ -62,33 +60,12 @@ public class ProcessSpecialEsApproval implements Serializable {
|
|||||||
@ApiModelProperty(value = "0表示未删除,1表示删除")
|
@ApiModelProperty(value = "0表示未删除,1表示删除")
|
||||||
private Integer delFlag;
|
private Integer delFlag;
|
||||||
|
|
||||||
/**
|
|
||||||
* 企标计划Id
|
|
||||||
*/
|
|
||||||
@ApiModelProperty(value = "企标计划Id")
|
|
||||||
private String espId;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 流程实例Id
|
* 流程实例Id
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "流程实例Id")
|
@ApiModelProperty(value = "流程实例Id")
|
||||||
private String processInstanceId;
|
private String processInstanceId;
|
||||||
|
|
||||||
/**
|
|
||||||
* 是否开启征求意见 0不征求 1征求
|
|
||||||
*/
|
|
||||||
@TableField(exist = false)
|
|
||||||
@ApiModelProperty(value = "是否开启征求意见 0不征求 1征求")
|
|
||||||
private String adviceFlag;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 征求意见截止日期
|
|
||||||
*/
|
|
||||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
||||||
@ApiModelProperty(value = "征求意见截止日期")
|
|
||||||
private Date adviceDeadline;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 在线编辑文件id
|
* 在线编辑文件id
|
||||||
*/
|
*/
|
||||||
@@ -101,27 +78,6 @@ public class ProcessSpecialEsApproval implements Serializable {
|
|||||||
@ApiModelProperty(value = "业务JSON数据")
|
@ApiModelProperty(value = "业务JSON数据")
|
||||||
private String businessJson;
|
private String businessJson;
|
||||||
|
|
||||||
/**
|
|
||||||
* 主起草人
|
|
||||||
*/
|
|
||||||
@TableField(exist = false)
|
|
||||||
@ApiModelProperty(value = "主起草人")
|
|
||||||
private String mainDraftUser;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 法规工程师
|
|
||||||
*/
|
|
||||||
@TableField(exist = false)
|
|
||||||
@ApiModelProperty(value = "法规工程师")
|
|
||||||
private String standardEngineer;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 设计工程师
|
|
||||||
*/
|
|
||||||
@TableField(exist = false)
|
|
||||||
@ApiModelProperty(value = "设计工程师")
|
|
||||||
private String adviceUsers;
|
|
||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
}
|
}
|
||||||
-2
@@ -136,8 +136,6 @@ public class SpecialEsApprovalServiceImpl extends ServiceImpl<ProcessSpecialEsAp
|
|||||||
// 使用流程引擎根据taskId找到流程实例Id
|
// 使用流程引擎根据taskId找到流程实例Id
|
||||||
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
|
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
|
||||||
result.setBasicProcessInfoDTO(actFlowCommonService.getProcessInfo(processInstanceId));
|
result.setBasicProcessInfoDTO(actFlowCommonService.getProcessInfo(processInstanceId));
|
||||||
// 获取流程通用数据
|
|
||||||
ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
|
|
||||||
// 获取当前流程数据
|
// 获取当前流程数据
|
||||||
LambdaQueryWrapper<ProcessSpecialEsApproval> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ProcessSpecialEsApproval> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(ProcessSpecialEsApproval::getProcessInstanceId, processInstanceId);
|
queryWrapper.eq(ProcessSpecialEsApproval::getProcessInstanceId, processInstanceId);
|
||||||
|
|||||||
Reference in New Issue
Block a user