From c80a342eacd6b639c486eb47afdf04984d54183e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 03 二月 2026 13:25:13 +0800
Subject: [PATCH] 不合格管理：重新提交oa功能调整3
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
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 42e9deb..79490a1 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
@@ -14,6 +14,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.enums.ContractType;
import com.ruoyi.common.oa.OAProcess;
import com.ruoyi.common.oa.OAProperty;
import com.ruoyi.common.oa.OAResult;
@@ -125,10 +126,6 @@
//鑾峰彇涓嶅悎鏍煎鐞嗚褰�
UnqualifiedHandlerVO vo = baseMapper.findById(pushOADto.getHandlerId());
-// if (vo.getRequestId() != null) {
-// throw new ErrorException("璇ヤ笉鍚堟牸澶勭悊宸叉彁浜よ繃OA");
-// }
-
//鎻愪氦oa鐩稿叧瀛楁璧嬪��
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
Map<String, String> mainFields = new HashMap<>();
@@ -168,9 +165,13 @@
boolean oa = false;
try {
log.info("鍙戣捣涓嶅悎鏍煎鐞哋A瀹℃牳娴佺▼");
- String unqualifiedProcessId = oaProperty.getUnqualifiedProcessId();
+ //鏍规嵁IFS鍩熻幏鍙栧搴旂殑娴佺▼id
+ if(StringUtils.isBlank(pushOADto.getContract())){
+ throw new RuntimeException("IFS鍩熴��"+pushOADto.getContract()+"銆戜笉瀛樺湪锛孫A娴佺▼鎻愪氦澶辫触");
+ }
+ String unqualifiedProcessId = StringUtils.equals(ContractType.ZTNS.getValue(),pushOADto.getContract())?oaProperty.getUnqualifiedProcessId():oaProperty.getUnqualifiedProcessIdByKJNS();
OAResult oaResult = OAProcess.start(mainFields, requestName, unqualifiedProcessId,SecurityUtils.getUsername());
- log.info("涓嶅悎鏍煎鐞哋A瀹℃牳娴佺▼缁撴潫锛岃繑鍥炵粨鏋�->{}" + oaResult);
+ log.info("{}涓嶅悎鏍煎鐞哋A瀹℃牳娴佺▼缁撴潫锛岃繑鍥炵粨鏋�->{}",unqualifiedProcessId,oaResult);
oa = oaResult.success();
if (oa) {
String addWorkflowResult = oaResult.getAddWorkflowResult();
@@ -299,6 +300,7 @@
//鎺ㄩ�丱A
PushOADto pushOADto = new PushOADto();
pushOADto.setHandlerId(unqualifiedHandlerDto.getId());
+ pushOADto.setContract(unqualifiedHandlerDto.getContract());
pushOA(pushOADto);
}
return true;
--
Gitblit v1.9.3