修改任务文件相关接口

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/TaskController.java

@@ -327,6 +327,15 @@ public class TaskController {
                 needRecalculateProgress = true;
             }
         } else {
+            task.setChargeOneId(null);
+            task.setChargeStage(null);
+            task.setChargeOneStatus(null);
+            task.setChargeOneTime(null);
+            task.setChargeTwoId(null);
+            task.setChargeTwoStatus(null);
+            task.setChargeTwoTime(null);
+            task.setFinalChargeStatus(null);
+            task.setFileRejectReason(null);
             //更新的情况，需要对比是否修改了任务标题，更新子任务的parentTname
             Task oldTask = taskService.getById(task.getId());
             if (!oldTask.getName().equals(task.getName())) {
@@ -1312,10 +1321,16 @@ public class TaskController {
         if(dateType!=null){
             switch (dateType){
                 case 0:
-                    queryWrapper.ge("start_date",startDate).le("start_date",endDate);
+                    if(null != startDate && null != endDate){
+                        queryWrapper.ge("start_date",startDate).le("start_date",endDate);
+                    }
+
                     break;
                 case 1:
-                    queryWrapper.ge("task.end_date",startDate).le("task.end_date",endDate);
+                    if(null != startDate && null != endDate){
+                        queryWrapper.ge("task.end_date",startDate).le("task.end_date",endDate);
+                    }
+
                     break;
             }
         }