From fd2ec597a17873f6e185836ee2d21c47e692fd5c Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 20 Oct 2023 17:28:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=20=E7=A1=AE=E5=AE=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ningdatech/pmapi/gov/contants/BizProjectContant.java     | 4 ++++
 .../java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java    | 9 +++++++--
 .../ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java  | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java
index e0629cb..3707fea 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java
@@ -25,6 +25,10 @@ public interface BizProjectContant {
         public static final String OP_DELETE = "delete";
         public static final String PDF_SUFFIX = ".pdf";
         public static final String MONTH = "月";
+
+        public static final String MISSING_HIS_PROJ_ID = "000000";
+
+        public static final String MISSING_HIS_PROJ_NAME = "历年项目数据缺失";
     }
 
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
index dcffffd..8825200 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java
@@ -382,8 +382,13 @@ public class ProjectConvert {
         req.setBaseBrainName(apply.getBaseBrainName());
         req.setBaseDevelopCode(apply.getBaseDevelopCode());
         req.setBaseLowestLevel(apply.getBaseLowestLevel());
-        req.setBaseHistorProjId(apply.getBaseHistorProjId());
-        req.setBaseHistorProjName(apply.getBaseHistorProjName());
+        if(Objects.isNull(apply.getMissing()) || apply.getMissing()){
+            req.setBaseHistorProjId(BizProjectContant.ProjectCollection.MISSING_HIS_PROJ_ID);
+            req.setBaseHistorProjName(BizProjectContant.ProjectCollection.MISSING_HIS_PROJ_NAME);
+        }else{
+            req.setBaseHistorProjId(apply.getBaseHistorProjId());
+            req.setBaseHistorProjName(apply.getBaseHistorProjName());
+        }
         req.setBaseOperatMaintenFile(StringUtils.isNotBlank(apply.getBaseOperatMaintenFilePdf()) ? apply.getBaseOperatMaintenFilePdf() :
                 apply.getBaseOperatMaintenFile());
         req.setBaseProjApplyFile(StringUtils.isNotBlank(apply.getBaseProjApplyFilePdf()) ? apply.getBaseProjApplyFilePdf() :
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 17cc2f7..99e7555 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -1172,7 +1172,7 @@ public class GovProjectCollectionManage {
         Long draftId = saveDTO.getDraftId();
         String baseAreaCode = user.getRegionCode() + BizConst.NINE_AREA_CODE_LAST;
         if(Objects.nonNull(draftId)){
-            GovBizProjectDraft oldDraft = draftService.getById(draftId);
+            GovOperationProjectDraft oldDraft = operationProjectDraftService.getById(draftId);
             VUtils.isTrue(Objects.isNull(oldDraft)).throwMessage("该草稿不存在!");
             draft.setId(draftId);
         }else{