From 8d497c65f041b4ea2ad436bc089bfe0e6cd20be9 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Mon, 15 Jun 2026 11:24:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(eightwork):=20=E6=B7=BB=E5=8A=A0=E5=AF=B9s?= =?UTF-8?q?tep=5F17=E5=85=B6=E4=BB=96=E5=8F=82=E6=95=B0=E7=9A=84=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/query/EightworkInfoQueryExe.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java index 8f362d8..1951ff6 100644 --- a/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/eightwork/command/query/EightworkInfoQueryExe.java @@ -130,6 +130,26 @@ public class EightworkInfoQueryExe { if (chooseLimitedSpaceJson == null) { chooseLimitedSpaceJson = new JSONObject(); } + JSONObject step17Json = infoJson.getJSONObject("step_17"); + if (step17Json == null) { + step17Json = new JSONObject(); + } + JSONObject step17OtherParamsJson = step17Json.getJSONObject("otherParams"); + if (step17OtherParamsJson == null && StringUtils.isNotBlank(step17Json.getString("otherParams"))) { + try { + step17OtherParamsJson = JSONObject.parseObject(step17Json.getString("otherParams")); + } catch (Exception e) { + log.warn("解析 step_17.otherParams 失败，使用空对象: workId={}", eightworkInfoDO.getWorkId(), e); + step17OtherParamsJson = new JSONObject(); + } + } + if (step17OtherParamsJson == null) { + step17OtherParamsJson = new JSONObject(); + } + String workPersonCount = step17OtherParamsJson.getString("limitSpaceWorkNum"); + if (StringUtils.isBlank(workPersonCount)) { + workPersonCount = infoJson.getString("limitSpaceWorkNum"); + } EightworkConfinedspaceExcelExportEntity userExcelExportEntity = new EightworkConfinedspaceExcelExportEntity(); userExcelExportEntity.setWorkTime(infoJson.getString("applyTime")); @@ -138,7 +158,7 @@ public class EightworkInfoQueryExe { userExcelExportEntity.setSpaceNameAndCode(infoJson.getString("limitedSpaceNameAndCode")); userExcelExportEntity.setLocationAndRange(chooseLimitedSpaceJson.getString("positionAndRange")); userExcelExportEntity.setRiskLevel(chooseLimitedSpaceJson.getString("riskLevelName")); - userExcelExportEntity.setWorkPersonCount(infoJson.getString("limitSpaceWorkNum")); + userExcelExportEntity.setWorkPersonCount(workPersonCount); //获取 EightworkSupplementaryInfoDO eightworkSupplementaryInfoDO = eightworkSupplementaryInfoDOMap.get(eightworkInfoDO.getWorkId());