历史项目 是否 确实

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 = "历年项目数据缺失";
     }
 
 }

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() :

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{