From a54c74218e1d76c4fbc6fea905f417693b39f140 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 10 Oct 2024 14:57:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=93=E4=B8=9A=E6=8A=80=E6=9C=AF?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86=E6=8A=A5=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9F=BA=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProcessSpecialEsApproval.java      | 46 +------------------
 .../impl/SpecialEsApprovalServiceImpl.java    |  2 -
 2 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/entity/ProcessSpecialEsApproval.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/entity/ProcessSpecialEsApproval.java
index 70397a66..0625112b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/entity/ProcessSpecialEsApproval.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/entity/ProcessSpecialEsApproval.java
@@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,7 +14,7 @@ import java.util.Date;
  * 
  * @TableName process_es_revision
  */
-@TableName(value ="process_es_revision")
+@TableName(value ="process_special_es_approval")
 @Data
 public class ProcessSpecialEsApproval implements Serializable {
     /**
@@ -62,33 +60,12 @@ public class ProcessSpecialEsApproval implements Serializable {
     @ApiModelProperty(value = "0表示未删除,1表示删除")
     private Integer delFlag;
 
-    /**
-     * 企标计划Id
-     */
-    @ApiModelProperty(value = "企标计划Id")
-    private String espId;
-
     /**
      * 流程实例Id
      */
     @ApiModelProperty(value = "流程实例Id")
     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
      */
@@ -101,27 +78,6 @@ public class ProcessSpecialEsApproval implements Serializable {
     @ApiModelProperty(value = "业务JSON数据")
     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)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/service/impl/SpecialEsApprovalServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/service/impl/SpecialEsApprovalServiceImpl.java
index 5b3ec773..57c5c5d8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/service/impl/SpecialEsApprovalServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/service/impl/SpecialEsApprovalServiceImpl.java
@@ -136,8 +136,6 @@ public class SpecialEsApprovalServiceImpl extends ServiceImpl<ProcessSpecialEsAp
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
         result.setBasicProcessInfoDTO(actFlowCommonService.getProcessInfo(processInstanceId));
-        // 获取流程通用数据
-        ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
         // 获取当前流程数据
         LambdaQueryWrapper<ProcessSpecialEsApproval> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ProcessSpecialEsApproval::getProcessInstanceId, processInstanceId);