From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
index b50b9da..3fa79fc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
@@ -5,7 +5,6 @@
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.HistoryService;
-import org.flowable.engine.RuntimeService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.history.HistoricProcessInstanceQuery;
import org.springblade.core.oss.OssTemplate;
@@ -18,7 +17,8 @@
import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.commons.contants.DictBizConstants;
import org.springblade.mdm.commons.service.ParamService;
-import org.springblade.mdm.flow.constants.FlowContants;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.service.ApproveInfoQueryService;
@@ -27,8 +27,8 @@
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.vo.ApproveTableInfo;
import org.springblade.mdm.flow.vo.FlowVO;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.program.entity.NcNodeHis;
+import org.springblade.mdm.program.service.NcNodeHisService;
import org.springblade.mdm.statreport.utils.WordReplaceUtil;
import org.springblade.system.feign.IDictBizClient;
import org.springframework.stereotype.Service;
@@ -47,13 +47,13 @@
@Service
@AllArgsConstructor
public class ConfirmTablePrintService {
- private final RuntimeService runtimeService;
+
private final IDictBizClient dictBizClient;
private final HistoryService historyService;
private final FlowProgramFileService flowProgramFileService;
private ApproveInfoQueryService approveInfoQueryService;
private final MachineService machineService;
- private final NcNodeService nodeService;
+ private final NcNodeHisService nodeHisService;
private final ParamService paramService;
private final TaskDispatchService taskDispatchService;
private final OssTemplate ossTemplate;
@@ -61,7 +61,6 @@
private static final String DATE_PATTERN = "yyyy-M-d";
/**
* 瀵煎嚭word宀告湰
- * @param dispatch 浠诲姟鍒嗘淳
* @param props 娴佺▼灞炴��
*/
public ByteArrayOutputStream exportConfirmTableDoc(FlowProgramProperties props) throws IOException {
@@ -84,10 +83,16 @@
machine = machineService.getByCode(machineCode);
Map<String, String> dataMap = new HashMap<>();
- NcNode node = this.nodeService.getById(props.getNodeId());
+ //NcNode node = this.nodeService.getById(props.getNodeId());
+ NcNodeHis node = nodeHisService.getById(props.getNodeId());
TaskDispatch dispatch = taskDispatchService.getByProgramNo(node.getProgramNo());
- dataMap.put("bh",node.getProgramNo());//缂栧彿锛屽氨鏄暟鎺х▼搴忕紪鍙�
+ if(dispatch == null){
+ //闃叉鑰佹暟鎹姤閿�
+ dispatch = new TaskDispatch();
+ }
+ String bianhao = props.getDrawingNo()+"-"+props.getProcessNo()+"-"+props.getProcessEdition();
+ dataMap.put("bh",bianhao);//缂栧彿锛屽氨鏄暟鎺х▼搴忕紪鍙�
dataMap.put("drawingNo", props.getDrawingNo());
dataMap.put("processNo", props.getProcessNo());
@@ -121,7 +126,7 @@
}else{
dataMap.put("czz", "");
}
- dataMap.put("programNo",dispatch.getProgramNo());
+ dataMap.put("programNo",bianhao);
if(StringUtils.isNotBlank(dispatch.getInspector())) {
dataMap.put("jyy",dispatch.getInspector()+"/"+formatTimeForTable(dispatch.getCheckTime()));//瀹為檯妫�楠屽憳鍜屾楠屾椂闂�
@@ -143,8 +148,8 @@
dataMap.put("bianzhi",approveInfo.getProgrammerName()+"/"+formatTimeForTable(approveInfo.getProgrammingDate()));//缂栫▼浜哄憳
//approveInfo.getDispatchDate()
- dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/"+formatTimeForTable(approveInfo.getCheckDate()));//鏍″锛氫笓涓氱粍闀�
- dataMap.put("shenhe",approveInfo.getSeniorName()+"/"+formatTimeForTable(approveInfo.getApproveDate()));
+ dataMap.put("jiaodui",(approveInfo.getTeamLeaderName()!=null?approveInfo.getTeamLeaderName():"")+"/"+formatTimeForTable(approveInfo.getCheckDate()));//鏍″锛氫笓涓氱粍闀�
+ dataMap.put("shenhe",(approveInfo.getSeniorName()!=null?approveInfo.getSeniorName():"")+"/"+formatTimeForTable(approveInfo.getApproveDate()));
dataMap.put("sendPath",machine.getProgSendDir()!=null?machine.getProgSendDir():"");
@@ -161,9 +166,9 @@
*/
public IPage<FlowVO> confirmTablePage(IPage<FlowVO> page, String drawingNo, String keyword,LocalDateTime createTimeBegin, LocalDateTime createTimeEnd) {
//鍥哄寲閲岃矾鏉戝畼
- HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowContants.CURE_PROCESS_KEY).includeProcessVariables();
+ HistoricProcessInstanceQuery query = this.historyService.createHistoricProcessInstanceQuery().finished().processDefinitionKey(FlowConstant.CURE_PROCESS_KEY).includeProcessVariables();
//.finished() // 鍙煡璇㈠凡瀹屾垚鐨勬祦绋�.unfinished() // 鏌ヨ鏈畬鎴愮殑娴佺▼
- query.variableNotExists(FlowContants.EXCEPTION);//闈炲紓甯告祦绋�
+ query.variableNotExists(FlowVariableConstant.EXCEPTION);//闈炲紓甯告祦绋�
if(createTimeBegin!=null) {
query.startedAfter(DateUtil.toDate(createTimeBegin));
}
@@ -172,7 +177,7 @@
}
if(Func.isNotEmpty(drawingNo)) {
String likeVal = "%" + drawingNo + "%";
- query.variableValueLike(FlowContants.DRAWING_NO,likeVal);
+ query.variableValueLike(FlowVariableConstant.DRAWING_NO,likeVal);
}
--
Gitblit v1.9.3