From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveInfoQueryService.java | 61 ++++++++++++++----------------
1 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveInfoQueryService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveInfoQueryService.java
index e6ca386..563b0ec 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveInfoQueryService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveInfoQueryService.java
@@ -1,25 +1,21 @@
package org.springblade.mdm.flow.service;
-import com.itextpdf.text.Chunk;
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.Font;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.HistoryService;
+import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.task.api.history.HistoricTaskInstance;
-import org.springblade.core.oss.OssTemplate;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.commons.service.ParamService;
-import org.springblade.mdm.commons.support.TemplatedPdfWriter;
-import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
+import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.vo.ApproveTableInfo;
import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.entity.NcProgramApproved;
+import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramApprovedService;
import org.springblade.system.feign.IUserClient;
@@ -27,9 +23,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.util.*;
/**
@@ -41,14 +34,17 @@
@Service
public class ApproveInfoQueryService {
@Autowired
- private NcNodeService ncNodeService;
+ private NcNodeHisService ncNodeHisService;
@Autowired
private HistoryService historyService;
@Autowired
private IUserClient useClient;
@Autowired
private NcProgramApprovedService programApprovedService;
-
+ @Autowired
+ private ProduceDivisionService produceDivisionService;
+ @Autowired
+ private UserCommonService userCommonService;
/**
* 鑾峰彇瀹為檯瀹℃壒浜哄鍚嶏紝鍜屾椂闂�
* @param props 娴佺▼灞炴��
@@ -86,31 +82,32 @@
seniorId = Func.toLong(task.getAssignee());
}
}
-
- appInfo.setTeamLeaderName(getNameByUserid(teamLeaderId));
- appInfo.setProgrammerName(getNameByUserid(programmerId));
- appInfo.setCheckerName(getNameByUserid(checkerId));
- appInfo.setSeniorName(getNameByUserid(seniorId));
+ if(teamLeaderId != 0) {
+ appInfo.setTeamLeaderName(userCommonService.getUserNameById(teamLeaderId));
+ }else{
+ //娌℃壘鍒扮粍闀匡紙涓嶆槸璇曞垏浠诲姟锛夛紝鐩存帴鏌ユ壘闆朵欢鍙峰搴斿緱鏁版嵁
+ try {
+ ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(props.getDrawingNo());
+ appInfo.setTeamLeaderName(userCommonService.getUserNameById(div.getTeamLeaderId()));
+ }catch(Exception e){
+ log.error("鏍规嵁闆朵欢鍙�:{}鎵句笉鍒颁汉鍛樿亴璐ｈ〃鏁版嵁",props.getDrawingNo(),e);
+ appInfo.setTeamLeaderName("");
+ }
+ }
+ appInfo.setProgrammerName(userCommonService.getUserNameById(programmerId));
+ appInfo.setCheckerName(userCommonService.getUserNameById(checkerId));
+ appInfo.setSeniorName(userCommonService.getUserNameById(seniorId));
//鏌ヨ鏁版帶绋嬪簭缂栧彿
Optional<NcProgramApproved> appOpt = programApprovedService.lambdaQuery().eq(NcProgramApproved::getProcessInstanceId, props.getProcessInstanceId()).oneOpt();
if(appOpt.isEmpty()){
- appInfo.setProgramNo("锛堟湭鐢熸垚锛�");
+ appInfo.setProgramName("锛堟湭鐢熸垚锛�");
}else{
- NcNode programPkgNameNode = this.ncNodeService.getById(appOpt.get().getNcNodeId());
- appInfo.setProgramNo(programPkgNameNode.getProgramNo());
+ NcNodeHis programPkgNameNode = this.ncNodeHisService.getById(appOpt.get().getNcNodeId());
+ appInfo.setProgramName(programPkgNameNode.programName());
}
return appInfo;
}
- String getNameByUserid(Long userid){
- String name = StringUtils.EMPTY;
- //瀹℃牳
- R<User> userR = useClient.userInfoById(userid);
- if (userR.isSuccess()) {
- name = userR.getData().getName();
- }
- return name;
- }
}
--
Gitblit v1.9.3