diff --git a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java
index a483670d2..97bd0d259 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/controller/ProgressPanoramaNodePlanController.java
@@ -374,7 +374,7 @@ public class ProgressPanoramaNodePlanController {
 			Map<String, Object> stateMap = new HashMap();
 			stateMap.put("total", list.size());
 			stateMap.put("unStart", list.stream().filter(l -> l.getStatus() == 0).count());
-			stateMap.put("inProgress", list.stream().filter(l -> l.getStatus() == 1 && DateUtil.parseDate(l.getFinishDate()).compareTo(new Date()) >= 0).count());
+			stateMap.put("inProgress", list.stream().filter(l -> l.getStatus() == 1).count());
 			stateMap.put("delay", list.stream().filter(l -> l.getStatus() == 2).count());
 			stateMap.put("delayCompletion", list.stream().filter(l -> l.getStatus() == 3).count());
 			stateMap.put("completion", list.stream().filter(l -> l.getStatus() == 4).count());
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
index 7924045d7..214762363 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml
@@ -150,7 +150,10 @@
         LEFT JOIN system_cities d ON a.city_code = d.cityid
         LEFT JOIN system_areas e ON a.area_code = e.areaid
         Left JOIN company f ON b.parent_id = f.company_id
-        WHERE a.nature = #{param.nature}
+        WHERE 1 = 1
+        <if test="param.nature != null and param.nature != ''">
+            and a.nature = #{param.nature}
+        </if>
         <if test="param.headquartersSn != null and param.headquartersSn != ''">
             and b.headquarters_sn = #{param.headquartersSn}
         </if>
diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressPanoramaNodePlanServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressPanoramaNodePlanServiceImpl.java
index 68923dd31..e47526055 100644
--- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressPanoramaNodePlanServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProgressPanoramaNodePlanServiceImpl.java
@@ -37,9 +37,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ReflectionUtils;
 
-import javax.jnlp.IntegrationService;
 import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -418,7 +416,6 @@ public class ProgressPanoramaNodePlanServiceImpl extends ServiceImpl<ProgressPan
         wrapper.eq(ProgressPanoramaNodePlan::getApprovalStatue, 0);
         this.update(wrapper);
         updateProjectState(progressPanoramaNodePlan.getProjectSn(), 1);
-        sendPlan(progressPanoramaNodePlan.getProjectSn());
         return true;
     }
 
@@ -442,7 +439,7 @@ public class ProgressPanoramaNodePlanServiceImpl extends ServiceImpl<ProgressPan
         LambdaUpdateWrapper<ProgressPanoramaNodePlan> wrapper = Wrappers.<ProgressPanoramaNodePlan>lambdaUpdate();
         wrapper.set(ProgressPanoramaNodePlan::getApprovalStatue, 0);
         wrapper.ne(ProgressPanoramaNodePlan::getApprovalStatue, 0);
-        wrapper.eq(ProgressPanoramaNodePlan::getStatus, 1);
+        wrapper.eq(ProgressPanoramaNodePlan::getStatus, 0);
         wrapper.eq(ProgressPanoramaNodePlan::getProjectSn, projectSn);
         updateProjectState(projectSn, 0);
         this.update(wrapper);
@@ -464,9 +461,9 @@ public class ProgressPanoramaNodePlanServiceImpl extends ServiceImpl<ProgressPan
                 planDraft = progressPanoramaNodePlanDraftService.getOne(Wrappers.<ProgressPanoramaNodePlanDraft>lambdaQuery()
                         .eq(ProgressPanoramaNodePlanDraft::getId, nodePlan.getId()));
                 DictionaryItem planType1 = dictionaryItemService.getDict("plan_type", progressPanoramaNodePlan.getType(), null);
-                nodePlan.setTypeName(planType1.getName());
+                nodePlan.setTypeName(planType1 == null ? "" : planType1.getName());
                 DictionaryItem planType = dictionaryItemService.getDict("plan_type", planDraft.getType(), null);
-                planDraft.setTypeName(planType.getName());
+                planDraft.setTypeName(planType == null ? "" : planType.getName());
                 if (planDraft.getUpdateFlag() != null && planDraft.getUpdateFlag() == 1) {
                     BeanUtils.copyProperties(nodePlan, planDraft);
                 } else {