From 652c64907a10550e8e62bb4425cd466d642c4dba Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@qq.com> Date: Fri, 25 Dec 2020 12:52:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=97=B6=E6=9C=AA=E8=80=83=E8=99=91=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/service/PurchaseInboundService.java | 27 ++++++++++--------- .../jxc/doc/service/PurchaseOrderService.java | 27 ++++++++++--------- .../jxc/doc/service/SellOrderService.java | 27 ++++++++++--------- .../jxc/doc/service/SellOutboundService.java | 27 ++++++++++--------- .../doc/BizPurchaseInboundService.java | 27 ++++++++++--------- .../service/doc/BizPurchaseOrderService.java | 27 ++++++++++--------- .../jxc/service/doc/BizSellOrderService.java | 27 ++++++++++--------- .../service/doc/BizSellOutboundService.java | 27 ++++++++++--------- 8 files changed, 120 insertions(+), 96 deletions(-) diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java index 328b353..1627c38 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseInboundService.java @@ -104,19 +104,22 @@ public class PurchaseInboundService { boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); R result = isFirstCreate ? addMain(doc) : updateMain(doc); - historyMapper.insert( - BizDocHistory.builder() - .pid(doc.getId()) - .type(DocHistoryEnum.COMMIT.getCode()) - .uid(doc.getCid()) - .uname(doc.getCname()) - .statusBefore(DocStatusEnum.DRAFT.getCode()) - .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) - .time(System.currentTimeMillis()) - .build() - ); + if (result.isSuccess()) { + historyMapper.insert( + BizDocHistory.builder() + .pid(doc.getId()) + .type(DocHistoryEnum.COMMIT.getCode()) + .uid(doc.getCid()) + .uname(doc.getCname()) + .statusBefore(DocStatusEnum.DRAFT.getCode()) + .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) + .time(System.currentTimeMillis()) + .build() + ); + result.setMsg("提交成功"); + } + else result.setMsg("提交失败，" + result.getMsg()); - result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg()); return result; } diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java index 8162223..0104dc7 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/PurchaseOrderService.java @@ -96,19 +96,22 @@ public class PurchaseOrderService { boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); R result = isFirstCreate ? addMain(doc) : updateMain(doc); - historyMapper.insert( - BizDocHistory.builder() - .pid(doc.getId()) - .type(DocHistoryEnum.COMMIT.getCode()) - .uid(doc.getCid()) - .uname(doc.getCname()) - .statusBefore(DocStatusEnum.DRAFT.getCode()) - .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) - .time(System.currentTimeMillis()) - .build() - ); + if (result.isSuccess()) { + historyMapper.insert( + BizDocHistory.builder() + .pid(doc.getId()) + .type(DocHistoryEnum.COMMIT.getCode()) + .uid(doc.getCid()) + .uname(doc.getCname()) + .statusBefore(DocStatusEnum.DRAFT.getCode()) + .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) + .time(System.currentTimeMillis()) + .build() + ); + result.setMsg("提交成功"); + } + else result.setMsg("提交失败，" + result.getMsg()); - result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg()); return result; } diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java index a05c90a..e51b50f 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOrderService.java @@ -99,19 +99,22 @@ public class SellOrderService { boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); R result = isFirstCreate ? addMain(doc) : updateMain(doc); - historyMapper.insert( - BizDocHistory.builder() - .pid(doc.getId()) - .type(DocHistoryEnum.COMMIT.getCode()) - .uid(doc.getCid()) - .uname(doc.getCname()) - .statusBefore(DocStatusEnum.DRAFT.getCode()) - .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) - .time(System.currentTimeMillis()) - .build() - ); + if (result.isSuccess()) { + historyMapper.insert( + BizDocHistory.builder() + .pid(doc.getId()) + .type(DocHistoryEnum.COMMIT.getCode()) + .uid(doc.getCid()) + .uname(doc.getCname()) + .statusBefore(DocStatusEnum.DRAFT.getCode()) + .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) + .time(System.currentTimeMillis()) + .build() + ); + result.setMsg("提交成功"); + } + else result.setMsg("提交失败，" + result.getMsg()); - result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg()); return result; } diff --git a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java index bad33b3..f363951 100644 --- a/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java +++ b/java/cloud/web/web-modules/doc/src/main/java/cn/toesbieya/jxc/doc/service/SellOutboundService.java @@ -107,19 +107,22 @@ public class SellOutboundService { boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); R result = isFirstCreate ? addMain(doc) : updateMain(doc); - historyMapper.insert( - BizDocHistory.builder() - .pid(doc.getId()) - .type(DocHistoryEnum.COMMIT.getCode()) - .uid(doc.getCid()) - .uname(doc.getCname()) - .statusBefore(DocStatusEnum.DRAFT.getCode()) - .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) - .time(System.currentTimeMillis()) - .build() - ); + if (result.isSuccess()) { + historyMapper.insert( + BizDocHistory.builder() + .pid(doc.getId()) + .type(DocHistoryEnum.COMMIT.getCode()) + .uid(doc.getCid()) + .uname(doc.getCname()) + .statusBefore(DocStatusEnum.DRAFT.getCode()) + .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) + .time(System.currentTimeMillis()) + .build() + ); + result.setMsg("提交成功"); + } + else result.setMsg("提交失败，" + result.getMsg()); - result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg()); return result; } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java index 36d2b72..715cf70 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java @@ -104,19 +104,22 @@ public class BizPurchaseInboundService { boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); R result = isFirstCreate ? addMain(doc) : updateMain(doc); - historyMapper.insert( - BizDocHistory.builder() - .pid(doc.getId()) - .type(DocHistoryEnum.COMMIT.getCode()) - .uid(doc.getCid()) - .uname(doc.getCname()) - .statusBefore(DocStatusEnum.DRAFT.getCode()) - .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) - .time(System.currentTimeMillis()) - .build() - ); + if (result.isSuccess()) { + historyMapper.insert( + BizDocHistory.builder() + .pid(doc.getId()) + .type(DocHistoryEnum.COMMIT.getCode()) + .uid(doc.getCid()) + .uname(doc.getCname()) + .statusBefore(DocStatusEnum.DRAFT.getCode()) + .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) + .time(System.currentTimeMillis()) + .build() + ); + result.setMsg("提交成功"); + } + else result.setMsg("提交失败，" + result.getMsg()); - result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg()); return result; } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java index 0f88c5f..8e9b7b4 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java @@ -97,19 +97,22 @@ public class BizPurchaseOrderService { boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); R result = isFirstCreate ? addMain(doc) : updateMain(doc); - historyMapper.insert( - BizDocHistory.builder() - .pid(doc.getId()) - .type(DocHistoryEnum.COMMIT.getCode()) - .uid(doc.getCid()) - .uname(doc.getCname()) - .statusBefore(DocStatusEnum.DRAFT.getCode()) - .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) - .time(System.currentTimeMillis()) - .build() - ); + if (result.isSuccess()) { + historyMapper.insert( + BizDocHistory.builder() + .pid(doc.getId()) + .type(DocHistoryEnum.COMMIT.getCode()) + .uid(doc.getCid()) + .uname(doc.getCname()) + .statusBefore(DocStatusEnum.DRAFT.getCode()) + .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) + .time(System.currentTimeMillis()) + .build() + ); + result.setMsg("提交成功"); + } + else result.setMsg("提交失败，" + result.getMsg()); - result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg()); return result; } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java index ed5c642..3ce719a 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java @@ -101,19 +101,22 @@ public class BizSellOrderService { boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); R result = isFirstCreate ? addMain(doc) : updateMain(doc); - historyMapper.insert( - BizDocHistory.builder() - .pid(doc.getId()) - .type(DocHistoryEnum.COMMIT.getCode()) - .uid(doc.getCid()) - .uname(doc.getCname()) - .statusBefore(DocStatusEnum.DRAFT.getCode()) - .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) - .time(System.currentTimeMillis()) - .build() - ); + if (result.isSuccess()) { + historyMapper.insert( + BizDocHistory.builder() + .pid(doc.getId()) + .type(DocHistoryEnum.COMMIT.getCode()) + .uid(doc.getCid()) + .uname(doc.getCname()) + .statusBefore(DocStatusEnum.DRAFT.getCode()) + .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) + .time(System.currentTimeMillis()) + .build() + ); + result.setMsg("提交成功"); + } + else result.setMsg("提交失败，" + result.getMsg()); - result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg()); return result; } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java index 8c64ac5..9efc0c1 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java @@ -109,19 +109,22 @@ public class BizSellOutboundService { boolean isFirstCreate = StringUtils.isEmpty(doc.getId()); R result = isFirstCreate ? addMain(doc) : updateMain(doc); - historyMapper.insert( - BizDocHistory.builder() - .pid(doc.getId()) - .type(DocHistoryEnum.COMMIT.getCode()) - .uid(doc.getCid()) - .uname(doc.getCname()) - .statusBefore(DocStatusEnum.DRAFT.getCode()) - .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) - .time(System.currentTimeMillis()) - .build() - ); + if (result.isSuccess()) { + historyMapper.insert( + BizDocHistory.builder() + .pid(doc.getId()) + .type(DocHistoryEnum.COMMIT.getCode()) + .uid(doc.getCid()) + .uname(doc.getCname()) + .statusBefore(DocStatusEnum.DRAFT.getCode()) + .statusAfter(DocStatusEnum.WAIT_VERIFY.getCode()) + .time(System.currentTimeMillis()) + .build() + ); + result.setMsg("提交成功"); + } + else result.setMsg("提交失败，" + result.getMsg()); - result.setMsg(result.isSuccess() ? "提交成功" : "提交失败，" + result.getMsg()); return result; }