Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management into 20230913_project_declared_new

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";
 
 }

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 = "月";
     }
 
 }

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(String.valueOf(apply.getBaseProjDuration()));
+        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()));