From 6f513913cc949f2b505176324f75f396a5d41e43 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 25 十二月 2022 20:14:42 +0800
Subject: [PATCH] 12.25.6
---
src/main/java/com/lf/server/controller/show/ApplyController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 506f622..b2017a1 100644
--- a/src/main/java/com/lf/server/controller/show/ApplyController.java
+++ b/src/main/java/com/lf/server/controller/show/ApplyController.java
@@ -147,7 +147,7 @@
@ApiImplicitParam(name = "applyid", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/updateForDiscard")
- public ResponseMsg<Object> updateForDiscard(Integer applyid) {
+ public ResponseMsg<Object> updateForDiscard(Integer applyid, HttpServletRequest req) {
try {
ApplyEntity applyEntity = applyService.selectById(applyid);
if (null == applyEntity) {
@@ -157,7 +157,8 @@
return fail("璇ユ暟鎹敵璇锋棤娉曞簾寮�");
}
- int rows = applyService.updateForDiscard(applyid);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ int rows = applyService.updateForDiscard(ue.getId(), applyid);
return success(rows);
} catch (Exception ex) {
@@ -171,7 +172,7 @@
@ApiImplicitParam(name = "applyid", value = "鏁版嵁鐢宠ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/updateForResubmit")
- public ResponseMsg<Object> updateForResubmit(Integer applyid) {
+ public ResponseMsg<Object> updateForResubmit(Integer applyid, HttpServletRequest req) {
try {
ApplyEntity applyEntity = applyService.selectById(applyid);
if (null == applyEntity) {
@@ -181,7 +182,8 @@
return fail("璇ユ暟鎹敵璇锋棤闇�閲嶆柊鎻愪氦");
}
- int rows = applyService.updateForResubmit(applyid);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ int rows = applyService.updateForResubmit(ue.getId(), applyid);
return success(rows);
} catch (Exception ex) {
@@ -213,11 +215,11 @@
return fail("璇ユ暟鎹敵璇锋棤闇�鎵撳洖");
}
- int rows = applyService.updateForSubmit(applyEntity.getId(), flowEntity.getId());
+ UserEntity ue = tokenService.getCurrentUser(req);
+ int rows = applyService.updateForSubmit(ue.getId(), applyEntity.getId(), flowEntity.getId());
applyEntity = applyService.selectById(applyEntity.getId());
if (StaticData.TEN == applyEntity.getStatus()) {
- UserEntity ue = tokenService.getCurrentUser(req);
applyService.zipDbData(ue, applyEntity);
}
@@ -233,7 +235,7 @@
@ApiImplicitParam(name = "flowId", value = "鐢宠娴佺▼ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/updateForReject")
- public ResponseMsg<Object> updateForReject(Integer flowId) {
+ public ResponseMsg<Object> updateForReject(Integer flowId, HttpServletRequest req) {
try {
FlowEntity flowEntity = flowService.selectById(flowId);
if (null == flowEntity) {
@@ -251,7 +253,8 @@
return fail("璇ユ暟鎹敵璇锋棤闇�鎵撳洖");
}
- Integer rows = applyService.updateForReject(applyEntity.getId(), flowEntity.getId());
+ UserEntity ue = tokenService.getCurrentUser(req);
+ Integer rows = applyService.updateForReject(ue.getId(), applyEntity.getId(), flowEntity.getId());
return success(rows);
} catch (Exception ex) {
--
Gitblit v1.9.3