From 0e232ec00c776bc6803116837c5eabee43f2f69a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 25 十二月 2022 16:29:13 +0800
Subject: [PATCH] 12.25.4
---
src/main/java/com/lf/server/controller/show/ApplyController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/show/ApplyController.java b/src/main/java/com/lf/server/controller/show/ApplyController.java
index 808f711..5f73bc5 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -202,7 +202,7 @@
return fail("鎵句笉鍒扮敵璇锋祦绋�");
}
if (flowEntity.getStatus() != 0) {
- return fail("璇ョ敵璇锋祦绋嬫棤闇�瑕佹墦鍥�");
+ return fail("璇ョ敵璇锋祦绋嬫棤闇�鎻愪氦");
}
ApplyEntity applyEntity = applyService.selectById(flowEntity.getApplyid());
@@ -210,12 +210,16 @@
return fail("鎵句笉鍒版暟鎹敵璇�");
}
if (!(applyEntity.getStatus() >= 0 && applyEntity.getStatus() <= StaticData.NINE)) {
- return fail("璇ユ暟鎹敵璇锋棤闇�瑕佹墦鍥�");
+ return fail("璇ユ暟鎹敵璇锋棤闇�鎵撳洖");
}
- //
+ int rows = applyService.updateForSubmit(applyEntity.getId(), flowEntity.getId());
+ applyEntity = applyService.selectById(applyEntity.getId());
+ if (StaticData.TEN == applyEntity.getStatus()) {
+ // 鎵撳寘
+ }
- return success(null);
+ return success(rows);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -234,7 +238,7 @@
return fail("鎵句笉鍒扮敵璇锋祦绋�");
}
if (flowEntity.getStatus() != 0) {
- return fail("璇ョ敵璇锋祦绋嬫棤闇�瑕佹墦鍥�");
+ return fail("璇ョ敵璇锋祦绋嬫棤闇�鎵撳洖");
}
ApplyEntity applyEntity = applyService.selectById(flowEntity.getApplyid());
@@ -242,7 +246,7 @@
return fail("鎵句笉鍒版暟鎹敵璇�");
}
if (!(applyEntity.getStatus() >= 0 && applyEntity.getStatus() <= StaticData.NINE)) {
- return fail("璇ユ暟鎹敵璇锋棤闇�瑕佹墦鍥�");
+ return fail("璇ユ暟鎹敵璇锋棤闇�鎵撳洖");
}
Integer rows = applyService.updateForReject(applyEntity.getId(), flowEntity.getId());
--
Gitblit v1.9.3