项目登记调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/domain/CwProjectRecords.java

@@ -1,6 +1,7 @@
 package com.jeeplus.finance.projectRecords.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.domain.BaseEntity;
 import com.jeeplus.core.query.Query;
 import com.jeeplus.core.query.QueryType;
@@ -19,6 +20,18 @@ public class CwProjectRecords extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 项目开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date projectStartTime;
+
+    /**
+     * 项目结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date projectEndTime;
+
+    /**
      * 工程类型
      */
     private String engineeringType;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -39,11 +39,13 @@ public class CwProjectRecordsDTO extends BaseDTO {
     /**
      * 项目开始时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date projectStartTime;
 
     /**
      * 项目结束时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date projectEndTime;
 
     //项目等级

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -81,6 +81,11 @@ public class CwProjectReportData extends BaseDTO {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date planEndDate;
 
+    // 项目开始时间
+    private String projectStartTime;
+    // 项目结束时间
+    private String projectEndTime;
+
     //委托方
     private String clientName;
     //项目金额

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -99,6 +99,8 @@
         b.project_money,
         b.plan_start_date as planStartDate,
         b.plan_end_date as planEndDate,
+        b.project_start_time as projectStartTime,
+        b.project_end_time as projectEndTime,
         b.create_time as createDate,
         su3.NAME AS projectManager,
         su3.id AS projectManagerId,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -856,6 +856,13 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
 
         CwProjectReportData reportData = reportMapper.queryByIdNew(id);
         if (null != reportData) {
+            if (StringUtils.isBlank(reportData.getWorkStartDate())) {
+                reportData.setWorkStartDate(reportData.getProjectStartTime());
+            }
+            if (StringUtils.isBlank(reportData.getWorkEndDate())) {
+                reportData.setWorkEndDate(reportData.getProjectEndTime());
+            }
+
             List<CwProjectReviewNewTeam> detailInfos = newTeamMapper.selectByReportId(reportData.getId());
             reportData.setDetailInfos(detailInfos);
         } else {
@@ -864,6 +871,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 reportData = reportMapper.queryByIdNew(reviewNew.getReportId());
                 List<CwProjectReviewNewTeam> detailInfos = newTeamMapper.selectByReportId(reportData.getId());
                 reportData.setDetailInfos(detailInfos);
+                if (StringUtils.isBlank(reportData.getWorkStartDate())) {
+                    reportData.setWorkStartDate(reportData.getProjectStartTime());
+                }
+                if (StringUtils.isBlank(reportData.getWorkEndDate())) {
+                    reportData.setWorkEndDate(reportData.getProjectEndTime());
+                }
             }
         }