Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -116,6 +116,9 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         page.getRecords().forEach(p -> {
             boolean isComplete = this.getIsComplete(p.getId());
             p.setIsComplete(isComplete);
+       /*     if (p.getPlanStatus()==1||isComplete==false){
+                p.setIsEdit(true);
+            }*/
         });
         return TableDataInfo.build(page);
     }
@@ -154,7 +157,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         //  status.add("3");
         List<CoreMonitoringRetrievalTask> coreMonitoringRetrievalTasks = iCoreMonitoringRetrievalTaskService.selectAllTaskByPlanId(collect, status);
 
-        if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks)) {
+        if (CollectionUtils.isNotEmpty(coreMonitoringRetrievalTasks)&&plan.getPlanStatus()!=1) {
             isComplete = false;
         }
         if (plan.getPlanStatus()==0){