From 3a4889deeb383d6d4661f9c0a4608610dc4cef97 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 28 Sep 2023 15:28:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ningdatech/pmapi/common/constant/CommonConst.java | 2 +-
 .../main/java/com/ningdatech/pmapi/gov/contants/BizProjectContant.java  | 1 +
 .../src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConst.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConst.java
index 1e997e8..e0b10df 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConst.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/constant/CommonConst.java
@@ -64,6 +64,6 @@ public interface CommonConst {
     Integer VERIFY_TYPE = 2;
     String REPEAT = " 已在其他当前评价计划其他分组中，请勿重复添加!";
 
-    String NORMAL_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    String NORMAL_TIME_PATTERN = "yyyy-MM-dd";
 
 }
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 90b1b25..e0629cb 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
@@ -24,6 +24,7 @@ public interface BizProjectContant {
         public static final String OP_UPDATE = "update";
         public static final String OP_DELETE = "delete";
         public static final String PDF_SUFFIX = ".pdf";
+        public static final String MONTH = "月";
     }
 
 }
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 61f7e42..ed47b27 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
@@ -395,7 +395,7 @@ public class ProjectConvert {
         req.setBaseResearchReportFile(StringUtils.isNotBlank(apply.getBaseResearchReportFilePdf()) ? apply.getBaseResearchReportFilePdf() :
                 apply.getBaseResearchReportFile());
         req.setBaseProjConsClass(apply.getBaseProjConsClass());
-        req.setBaseProjDuration(String.valueOf(apply.getBaseProjDuration()));
+        req.setBaseProjDuration(apply.getBaseProjDuration() + BizProjectContant.ProjectCollection.MONTH);
         req.setBaseProjIntro(apply.getBaseProjIntro());
         req.setBaseProjStartTime(ProjectCollectionUtil.convertLocalDateTime(apply.getBaseProjStartTime()));
         req.setBaseProjEndTime(ProjectCollectionUtil.convertLocalDateTime(apply.getBaseProjEndTime()));

From c125af7a78ff967847e6eb3aecda90f2bea4c65e Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 28 Sep 2023 15:46:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ningdatech/pmapi/gov/convert/ProjectConvert.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ed47b27..dcffffd 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
@@ -395,7 +395,8 @@ public class ProjectConvert {
         req.setBaseResearchReportFile(StringUtils.isNotBlank(apply.getBaseResearchReportFilePdf()) ? apply.getBaseResearchReportFilePdf() :
                 apply.getBaseResearchReportFile());
         req.setBaseProjConsClass(apply.getBaseProjConsClass());
-        req.setBaseProjDuration(apply.getBaseProjDuration() + BizProjectContant.ProjectCollection.MONTH);
+        req.setBaseProjDuration((StringUtils.isNotBlank(apply.getBaseProjDuration()) ? apply.getBaseProjDuration() : "0")
+                + BizProjectContant.ProjectCollection.MONTH);
         req.setBaseProjIntro(apply.getBaseProjIntro());
         req.setBaseProjStartTime(ProjectCollectionUtil.convertLocalDateTime(apply.getBaseProjStartTime()));
         req.setBaseProjEndTime(ProjectCollectionUtil.convertLocalDateTime(apply.getBaseProjEndTime()));