From fd523aa5694b7f9350f87b30cab6bb3ae34e1c77 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 08 十月 2024 11:01:46 +0800
Subject: [PATCH] log4j2.yml配置文件中增加删除过期日志文件配置
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index 56e24e4..860b7d3 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -246,6 +246,9 @@
} else {
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
record.nodeContent = node.content;
+ PrProductionNode nextNode = nodeDao.selectNodeBySort(node.getProcessId() , (node.getSort() + 1));
+ record.nextNodeContent = nextNode.content;
+ record.nextNode = nextNode.id;
if (node.isRecord) {
record.deviceCycleContent = node.deviceCycleContent;
}
@@ -477,7 +480,7 @@
return;
}
FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
- doc.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + doc.fileId;
+ doc.webUrl = fileRestVo.fileWebDownloadPath + doc.fileId;
doc.orgName = file.orgName;
doc.extName = file.extName;
});
@@ -519,7 +522,7 @@
return;
}
FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
- ins.webUrl = fileRestVo.fileSysRestUrl + fileRestVo.fileWebDownloadPath + ins.fileId;
+ ins.webUrl = fileRestVo.fileWebDownloadPath + ins.fileId;
ins.orgName = file.orgName;
ins.extName = file.extName;
}
--
Gitblit v1.8.0