项目管理修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -101,6 +101,14 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
      */
     public CwProjectRecordsDTO queryById(String id) {
         CwProjectRecordsDTO cwProjectRecordsDTO = cwProjectRecordsMapper.queryById(id);
+        if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO)) {
+            if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO.getPlanStartDate()) && ObjectUtil.isNotEmpty(cwProjectRecordsDTO.getPlanEndDate())) {
+                Date[] planDate = new Date[2];
+                planDate[0] = cwProjectRecordsDTO.getPlanStartDate();
+                planDate[1] = cwProjectRecordsDTO.getPlanEndDate();
+                cwProjectRecordsDTO.setPlanDate(planDate);
+            }
+        }
         return cwProjectRecordsDTO;
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -62,15 +62,15 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 项目计划开始时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planStartDate;
 
     /**
      * 项目计划结束时间
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planEndDate;
 
     /**
@@ -182,4 +182,9 @@ public class CwProjectRecordsDTO extends BaseDTO {
      * 业务类型名称
      */
     private String businessTypeName;
+
+    /**
+     * 项目预计时间
+     */
+    private Date[] planDate;
 }