项目编辑支持清空开始和结束日期

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java

@@ -228,4 +228,11 @@ public interface ProjectMapper extends BaseMapper<Project> {
     List<Map<String, Object>> selectGroupEestimatedWorkTimeList(@Param("map") Map<String, Object> map);
 
     Integer selectGroupEestimatedWorkTimeCount(@Param("map")Map<String, Object> map);
+
+    @Update("update project set plan_start_date=null where id=#{id}")
+    void updateProjectStartDateToNull(@Param("id") Integer id);
+
+    @Update("update project set plan_end_date=null where id=#{id}")
+    void updateProjectEndDateToNull(@Param("id") Integer id);
+
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -2006,9 +2006,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 }
                 if (!StringUtils.isEmpty(planStartDate)) {
                     p.setPlanStartDate(LocalDate.parse(planStartDate));
+                } else if (oldProject.getPlanStartDate() != null){
+                    //置空项目开始日期
+                    projectMapper.updateProjectStartDateToNull(id);
                 }
                 if (!StringUtils.isEmpty(planEndDate)) {
                     p.setPlanEndDate(LocalDate.parse(planEndDate));
+                } else if (oldProject.getPlanEndDate() != null){
+                    //置空项目结束日期
+                    projectMapper.updateProjectEndDateToNull(id);
                 }
                 if (customerId != null && customerId != 0) {
                     p.setCustomerName(customerInfoMapper.selectById(customerId).getCustomerName());

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -601,7 +601,7 @@
                         :editable="false" style="width:32%;" 
                         format="yyyy-MM-dd" 
                         value-format="yyyy-MM-dd"
-                        :clearable="false" type="date" 
+                        :clearable="false" type="date" clearable
                         :placeholder="$t('optiondate')"></el-date-picker>
 
                         <span style="margin-left:63px;margin-right:10px;" >{{ $t('ji-hua-jie-shu-ri-qi') }}</span>
@@ -609,7 +609,7 @@
                         :editable="false" :disabled="canOnlyModParticipator"
                         format="yyyy-MM-dd" 
                         value-format="yyyy-MM-dd"
-                        :clearable="false" type="date" 
+                        :clearable="false" type="date" clearable
                         :placeholder="$t('optiondate')"></el-date-picker>
                     </el-form-item>