From 68d6ddbe1610b66e75ee05ad75998ce1a3caadba Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 29 一月 2026 16:30:35 +0800
Subject: [PATCH] 不合格管理：重新提交oa功能调整
---
inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml | 2 +-
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java | 10 ++--------
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java | 19 ++++++++++++++-----
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
index 5b1141a..722aee0 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
@@ -91,20 +91,17 @@
unqualifiedHandlerFileService.downloadOAFile(handlerFileId,response);
}
-
@ApiOperation(value = "鏂板涓嶅悎鏍煎鐞�")
@PostMapping("/addUnqualifiedHandler")
public Result addUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
return Result.success(unqualifiedHandlerService.addUnqualifiedHandler(unqualifiedHandlerDto));
}
-
- @ApiOperation(value = "缂栬緫涓嶅悎鏍煎鐞�")
- @PostMapping("/updateUnqualifiedHandler")
+ @ApiOperation(value = "缂栬緫涓嶅悎鏍煎鐞嗗苟涓旀帹閫丱A")
+ @PostMapping("/reSubmitPushOa")
public Result updateUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
return Result.success(unqualifiedHandlerService.updateUnqualifiedHandler(unqualifiedHandlerDto));
}
-
@ApiOperation(value = "鏌ョ湅oa娴佺▼")
@GetMapping("/getOaFlow")
@@ -112,14 +109,11 @@
return Result.success(unqualifiedHandlerService.getOaFlow(id));
}
-
-
@ApiOperation(value = "鏌ョ湅涓嶅悎鏍煎鐞嗙晫闈�")
@GetMapping("/getUnqualifiedHandler")
public Result getUnqualifiedHandler(Integer id){
return Result.success(unqualifiedHandlerService.getUnqualifiedHandler(id));
}
-
@ApiOperation(value = "鍒犻櫎涓嶅悎鏍煎鐞�")
@DeleteMapping("/deleteUnqualifiedHandler")
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
index bd46323..228903a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java
@@ -42,6 +42,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
@@ -137,9 +138,10 @@
//鑾峰彇涓嶅悎鏍煎鐞嗚褰�
UnqualifiedHandlerVO vo = baseMapper.findById(pushOADto.getHandlerId());
- if (vo.getRequestId() != null) {
- throw new ErrorException("璇ヤ笉鍚堟牸澶勭悊宸叉彁浜よ繃OA");
- }
+ System.out.println(vo);
+// if (vo.getRequestId() != null) {
+// throw new ErrorException("璇ヤ笉鍚堟牸澶勭悊宸叉彁浜よ繃OA");
+// }
//鎻愪氦oa鐩稿叧瀛楁璧嬪��
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -295,6 +297,7 @@
* @return
*/
@Override
+ @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
public boolean updateUnqualifiedHandler(UnqualifiedHandlerDto unqualifiedHandlerDto) {
// 鍒犻櫎闄勪欢, 閲嶆柊娣诲姞
insUnqualifiedHandlerFileService.remove(Wrappers.<InsUnqualifiedHandlerFile>lambdaQuery()
@@ -305,8 +308,14 @@
}
insUnqualifiedHandlerFileService.updateBatchById(unqualifiedHandlerDto.getUnqualifiedHandlerFiles());
}
-
- return this.updateById(unqualifiedHandlerDto);
+ boolean isUpdated = this.updateById(unqualifiedHandlerDto);
+ if(isUpdated){
+ //鎺ㄩ�丱A
+ PushOADto pushOADto = new PushOADto();
+ pushOADto.setHandlerId(unqualifiedHandlerDto.getId());
+ pushOA(pushOADto);
+ }
+ return true;
}
/**
diff --git a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
index 2b65479..b343984 100644
--- a/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsUnqualifiedHandlerMapper.xml
@@ -44,7 +44,7 @@
LEFT JOIN (
SELECT
*,
- ROW_NUMBER() OVER (PARTITION BY workflow_id ORDER BY approval_time DESC, id DESC) AS rn
+ ROW_NUMBER() OVER (PARTITION BY workflow_id ORDER BY approval_date DESC,approval_time DESC, id DESC) AS rn
FROM
common_oa
) AS coa ON iuh.request_id = coa.workflow_id AND coa.rn = 1
--
Gitblit v1.9.3