From 05e840181dedccc85670675ce0f03ff499ccc4d7 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Thu, 13 Apr 2023 17:02:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../builder/ProjectDeclareStateMachineBuilder.java | 13 ++----------- .../com/ningdatech/pmapi/common/util/ExcelDownUtil.java | 5 ++++- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java index a0d5960..39ff3e3 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineBuilder.java @@ -97,7 +97,7 @@ public class ProjectDeclareStateMachineBuilder { .source(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE) .first(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS,projectDeclareGuardFactory.new PendingPreQualificationChoiceGuard(),projectDeclareAction.new ProjectDeclareChoiceAction()) .last(ProjectStatusEnum.PRE_APPLYING,projectDeclareAction.new ProjectDeclareChoiceAction()).and() - // 省级部门联审通过，从省级部门联审中到升级部门联审成功 + // 省级部门联审通过，从省级部门联审中到省级部门联审成功 .withExternal() .source(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS) .target(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS) @@ -117,16 +117,7 @@ public class ProjectDeclareStateMachineBuilder { .source(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS) .target(ProjectStatusEnum.PENDING_PREQUALIFICATION) .event(ProjectStatusChangeEvent.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW).and() - // 省级部门联审不通过重新申报，从省级部门联审不通过到待预审选择 - .withExternal() - .source(ProjectStatusEnum.PRE_APPLYING) - .target(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE) - .event(ProjectStatusChangeEvent.PRE_APPLYING_WITHDRAW).and() - // 省级部门联审不通过重新申报，从待预审选择->省级部门联审成功，待预审，完成其中一种状态 - .withChoice() - .source(ProjectStatusEnum.PRE_APPLYING) - .first(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_SUCCESS,projectDeclareGuardFactory.new PendingPreQualificationChoiceGuard(),new ProjectDeclareChoiceAction()) - .last(ProjectStatusEnum.PENDING_PREQUALIFICATION,projectDeclareAction.new ProjectDeclareChoiceAction()).and() + // 预审通过，从预审中到部门联审中 .withExternal() .source(ProjectStatusEnum.PRE_APPLYING) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java index d2d2d9c..6e75a44 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java @@ -205,7 +205,10 @@ public class ExcelDownUtil { List> rowList = Lists.newArrayList(); for (ExportOptionEnum column : columnList) { List columnValues = Lists.newArrayList(); - columnValues.add(column.getDesc()); + String desc = column.getDesc(); + if (Objects.nonNull(desc)){ + columnValues.add(desc); + } projects.forEach(project -> { String s = JSON.toJSONString(project); JSONObject jsonObject = JSON.parseObject(s);