From 09df33ab83aad9edfd18b6f79b6f3833e5107052 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 13 Jun 2023 14:08:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=A1=E6=89=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../showInventory/showInventoryForLocation.html | 1 - .../dreamchaser/depository_manage/SomeTest.java | 16 ++++++++-------- .../showInventory/showInventoryForLocation.html | 1 - 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html index 2e12e995..9d47a92f 100644 --- a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html +++ b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html @@ -328,7 +328,6 @@ } $("#chooseBusinessType").show(); } - } }) diff --git a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java index 3336eab0..1bf6cea7 100644 --- a/src/test/java/com/dreamchaser/depository_manage/SomeTest.java +++ b/src/test/java/com/dreamchaser/depository_manage/SomeTest.java @@ -249,7 +249,7 @@ public class SomeTest { ApprovalInfo approvalInfo = new ApprovalInfo(); approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF"); - approvalInfo.setSpNo("202306120006"); + approvalInfo.setSpNo("202306130010"); // 模拟第一个节点（部门负责人） @@ -259,7 +259,7 @@ public class SomeTest { List approvalInfo_Details1 = new ArrayList<>(); ApprovalInfo_Details ad1 = new ApprovalInfo_Details(); ad1.setSpStatus("2"); - ad1.setSpTime("1686530528000"); + ad1.setSpTime("1686628267000"); ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver(); approver1.setUserId("PangFuZhen"); ad1.setApprover(approver1); @@ -268,11 +268,11 @@ public class SomeTest { // 模拟第二个节点(宋倩倩，平衡岗) ApprovalInfo_SpRecord asr2 = new ApprovalInfo_SpRecord(); - asr2.setSpStatus("1"); + asr2.setSpStatus("2"); List approvalInfo_Details2 = new ArrayList<>(); ApprovalInfo_Details ad2 = new ApprovalInfo_Details(); - ad2.setSpStatus("1"); - ad2.setSpTime("0"); + ad2.setSpStatus("2"); + ad2.setSpTime("1686628277000"); ApprovalInfo_Details_Approver approver2 = new ApprovalInfo_Details_Approver(); approver2.setUserId("YangYangBaoBei"); ad2.setApprover(approver2); @@ -285,9 +285,9 @@ public class SomeTest { List approvalInfo_Details3 = new ArrayList<>(); ApprovalInfo_Details ad3 = new ApprovalInfo_Details(); ad3.setSpStatus("2"); - ad3.setSpTime("1686530628000"); + ad3.setSpTime("1686628377000"); ApprovalInfo_Details_Approver approver3 = new ApprovalInfo_Details_Approver(); - approver3.setUserId("KaiXinGuo"); + approver3.setUserId("SiKai"); ad3.setApprover(approver3); approvalInfo_Details3.add(ad3); asr3.setDetails(approvalInfo_Details3); @@ -307,7 +307,7 @@ public class SomeTest { spRecord_list.add(asr1); -// spRecord_list.add(asr2); + spRecord_list.add(asr2); spRecord_list.add(asr3); spRecord_list.add(asr4); approvalInfo.setSpRecord(spRecord_list); diff --git a/target/classes/templates/pages/showInventory/showInventoryForLocation.html b/target/classes/templates/pages/showInventory/showInventoryForLocation.html index 2e12e995..9d47a92f 100644 --- a/target/classes/templates/pages/showInventory/showInventoryForLocation.html +++ b/target/classes/templates/pages/showInventory/showInventoryForLocation.html @@ -328,7 +328,6 @@ } $("#chooseBusinessType").show(); } - } })