From 6b2094c03fc32d87b640fbe5f3cbedebe75c9576 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 7 Apr 2022 11:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=99=9A=E6=8B=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=8A=E6=94=BE=E5=BC=80=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/busmaindeposit/BusMainDeposit.java    | 31 ++++++++++---------
 .../busmaindeposit/BusMainDepositService.java | 10 +++---
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java
index 062415834a..f6369613bf 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java
@@ -53,29 +53,29 @@ import java.util.Date;
 public class BusMainDeposit extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    
-	@ApiModelProperty("单据编号（制定编号规则:单据类型编号+部门编码+yyyyMMDD+0000）")
+
+    @ApiModelProperty("单据编号（制定编号规则:单据类型编号+部门编码+yyyyMMDD+0000）")
     private String billNo;
-    
-	@ApiModelProperty("业务员Sid（是不是应该是二级？）")
+
+    @ApiModelProperty("业务员Sid（是不是应该是二级？）")
     private String staffSid;
-    
-	@ApiModelProperty("业务员姓名")
+
+    @ApiModelProperty("业务员姓名")
     private String staffName;
-    
-	@ApiModelProperty("组织机构sid")
+
+    @ApiModelProperty("组织机构sid")
     private String orgSid;
-    
-	@ApiModelProperty("部门名称")
+
+    @ApiModelProperty("部门名称")
     private String orgName;
-    
-	@ApiModelProperty("制单日期")
+
+    @ApiModelProperty("制单日期")
     private String createDate;
 
     @ApiModelProperty("单据类型key")
     private String depositBillTypeKey;
-    
-	@ApiModelProperty("单据类型")
+
+    @ApiModelProperty("单据类型")
     private String depositBillType;
 
     @ApiModelProperty("流程定义的id")
@@ -84,4 +84,7 @@ public class BusMainDeposit extends BaseEntity {
     private String nodeSid;
     @ApiModelProperty("流程实例的sid")
     private String procInstSid;
+
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index c11773a85a..c91e79f3ff 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -341,11 +341,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      * @return
      */
     private boolean checkCouldChange(String sid) {
-//        BusMainDeposit busMainDeposit = fetchBySid(sid);
-//        // 判断是否可以更改（是否走了流程，更改了状态）
-//        if (StringUtils.isNotBlank(busMainDeposit.getNodeState())) {
-//            return true;
-//        }
+        BusMainDeposit busMainDeposit = fetchBySid(sid);
+        // 判断是否可以更改（是否走了流程，更改了状态）
+        if (StringUtils.isNotBlank(busMainDeposit.getNodeState())) {
+            return true;
+        }
         return false;
     }