From 2bbd50fb56275986e2a8658c373686d56804b99b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 29 八月 2025 14:14:52 +0800
Subject: [PATCH] yml配置
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsUnqualifiedHandlerServiceImpl.java | 68 ---------------------------------
1 files changed, 1 insertions(+), 67 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 d4c2a25..88b3b5b 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
@@ -10,9 +10,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.common.oa.OAProcess;
-import com.ruoyi.common.oa.OAProperty;
-import com.ruoyi.common.oa.OAResult;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
@@ -54,8 +51,7 @@
@Resource
private CommonOaService commonOaService;
- @Resource
- private OAProperty oaProperty;
+
@Resource
private InsUnqualifiedHandlerFileService insUnqualifiedHandlerFileService;
@Resource
@@ -69,68 +65,6 @@
@Override
public Result pushOA(PushOADto pushOADto) {
- //鑾峰彇涓嶅悎鏍煎鐞嗚褰�
- 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<>();
- mainFields.put("bh", vo.getNo());//缂栧彿
- mainFields.put("gysmc", vo.getSupplierName());//渚涘簲鍟嗗悕绉�
- mainFields.put("wlmc", vo.getMaterialName());//鐗╂枡鍚嶇О
- mainFields.put("scpc", vo.getProductionBatch());//鐢熶骇鎵规
- mainFields.put("dhsl", vo.getCargoQuantity());//鍒拌揣鏁伴噺
- mainFields.put("ggxh", vo.getSpecsModels());//瑙勬牸鍨嬪彿
- mainFields.put("bjrq", vo.getInspectTime().format(formatter));//鎶ユ鏃ユ湡
- mainFields.put("fkr", SecurityUtils.getUsername());//鍙嶉浜�
- mainFields.put("fkrq", vo.getFeedbackTime().format(formatter));//鍙嶉鏃ユ湡
- mainFields.put("fl", vo.getClassification());//鍒嗙被
- mainFields.put("bhggs", vo.getOffGradeAscription());//涓嶅悎鏍煎綊灞�
- mainFields.put("bhgqkms", vo.getUnqualifiedDesc());//涓嶅悎鏍兼儏鍐垫弿杩�
-
- //鏌ヨ闄勪欢
- List<InsUnqualifiedHandlerFile> handlerFiles = insUnqualifiedHandlerFileService.list(Wrappers.<InsUnqualifiedHandlerFile>lambdaQuery()
- .eq(InsUnqualifiedHandlerFile::getUnqualifiedId, vo.getHandlerId()));
- if (CollectionUtils.isNotEmpty(handlerFiles)) {
- StringBuilder fileUrl = new StringBuilder();
- for (int i = 0; i < handlerFiles.size(); i++) {
- String path = handlerFiles.get(i).getType().equals(1) ? "/lims/img/" : "/lims/word/";
- if (i == handlerFiles.size() - 1) {
- fileUrl.append("<a href='" + oaProperty.getProdIp()).append(path + handlerFiles.get(i).getFileUrl()
- + "'target='_blank'>" + handlerFiles.get(i).getFileName() + "</a>");
- } else {
- fileUrl.append("<a href='" + oaProperty.getProdIp()).append(path + handlerFiles.get(i).getFileUrl()
- + "'target='_blank'>" + handlerFiles.get(i).getFileName() + "</a>").append("<br/>");
- }
- }
- mainFields.put("xlimsfj", fileUrl.toString());
- }
- //娴佺▼鏍囬
- String requestName = vo.getHeadline();
- //鍙戣捣OA
- boolean oa = false;
- try {
- log.info("鍙戣捣涓嶅悎鏍煎鐞哋A瀹℃牳娴佺▼");
- String unqualifiedProcessId = oaProperty.getUnqualifiedProcessId();
- OAResult oaResult = OAProcess.start(mainFields, requestName, unqualifiedProcessId,SecurityUtils.getUsername());
- log.info("涓嶅悎鏍煎鐞哋A瀹℃牳娴佺▼缁撴潫锛岃繑鍥炵粨鏋�->{}" + oaResult);
- oa = oaResult.success();
- if (oa) {
- String addWorkflowResult = oaResult.getAddWorkflowResult();
- baseMapper.update(null, new LambdaUpdateWrapper<InsUnqualifiedHandler>()
- .set(InsUnqualifiedHandler::getRequestId, addWorkflowResult)
- .set(InsUnqualifiedHandler::getOaState, 2)
- .eq(InsUnqualifiedHandler::getId, pushOADto.getHandlerId()));
- } else {
- return Result.fail("鎻愪氦oa澶辫触: " + oaResult.getErrorMsg());
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
return Result.success();
}
--
Gitblit v1.9.3