diff --git a/src/main/java/com/sa/zentao/qo/ZtProjectQo.java b/src/main/java/com/sa/zentao/qo/ZtProjectQo.java
index 959a5bc..1df72ac 100644
--- a/src/main/java/com/sa/zentao/qo/ZtProjectQo.java
+++ b/src/main/java/com/sa/zentao/qo/ZtProjectQo.java
@@ -64,6 +64,8 @@ public class ZtProjectQo extends BaseQo {
 
     private String status;
 
+    private List<String> stageList;
+
     private String title;
 
     private Integer module;
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtStoryUserServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtStoryUserServiceImpl.java
index 35e05eb..69f04ca 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtStoryUserServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtStoryUserServiceImpl.java
@@ -305,6 +305,11 @@ public class ZtStoryUserServiceImpl extends ServiceImpl<ZtStoryUserMapper, ZtSto
             qo.setProductIds(pIds);
         }
 
+        if(!CollectionUtils.isEmpty(qo.getStatusList())&&qo.getStatusList().contains("unconfirmed")) {
+            qo.getStatusList().addAll(Arrays.asList("unconfirmed",
+                    "waitcommunicate","waitdesign","designdoing","designdone","storyunconfirmed"));
+        }
+
         Page<ZtStoryUserDTO> page = PageHelper.startPage(qo.getCurrentPage(), qo.getPageSize());
         List<ZtStoryUserDTO> list = this.baseMapper.pageList(qo);
         if (!CollectionUtils.isEmpty(list)) {
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
index 3f191b3..73e9738 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
@@ -179,8 +179,8 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
         if (CollectionUtils.isEmpty(taskList)) {
             return new ArrayList<>();
         }
-        taskList=taskList.stream().peek(e->{
-            if(e.getDeadline()!=null){
+        taskList = taskList.stream().peek(e -> {
+            if (e.getDeadline() != null) {
                 e.setDeadline(DateUtils.getDayLast(e.getDeadline()));
             }
         }).collect(Collectors.toList());
@@ -341,7 +341,7 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
 //                        .and(e->e.or().)
 //                );
 
-        return this.baseMapper.taskListByPIdsAndDate(pids,firstDayOfMonth,lastDayOfMonth);
+        return this.baseMapper.taskListByPIdsAndDate(pids, firstDayOfMonth, lastDayOfMonth);
 //        return taskList;
     }
 
@@ -386,8 +386,8 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
         }
         List<ZtTask> taskList = this.list(new QueryWrapper<ZtTask>().lambda()
                 .select(SFunctionColums.taskColumes())
-                .in(ZtTask::getProduct,pids)
-                .in(ZtTask::getAssignedTo,uids)
+                .in(ZtTask::getProduct, pids)
+                .in(ZtTask::getAssignedTo, uids)
                 .ge(ZtTask::getFinishedDate, firstDayOfMonth).le(ZtTask::getFinishedDate, lastDayOfMonth));
 
         return taskList;
@@ -786,6 +786,44 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
             }
 
         }
+        if (ztTask.getDeadline() != null && ztTask.getStory() != null && ztTask.getStory() != 0) {
+            ZtStory ztStory = this.storyService.getById(ztTask.getStory());
+            ztStory.setDevelPlanEndTime(null);
+            if (ztTask.getType().equals("devel") && (ztStory.getDevelPlanEndTime() == null || ztTask.getDeadline().after(ztStory.getDevelPlanEndTime()))) {
+                ztStory.setDevelPlanEndTime(ztTask.getDeadline());
+            } else {
+                //查找最大时间那个
+                List<ZtTask> ztTasks = this.baseMapper.selectList(new QueryWrapper<ZtTask>().lambda()
+                        .select(ZtTask::getDeadline)
+                        .isNotNull(ZtTask::getDeadline)
+                        .eq(ZtTask::getType, "devel")
+                        .ne(ZtTask::getId, ztTask.getId())
+                        .in(ZtTask::getStatus, "pause", "done", "wait", "reviewing", "doing", "draft")
+                        .eq(ZtTask::getStory, ztTask.getStory()).orderByDesc(ZtTask::getDeadline));
+                this.storyService.update(new UpdateWrapper<ZtStory>().lambda()
+                        .eq(ZtStory::getId, ztTask.getStory())
+                        .set(ZtStory::getDevelPlanEndTime, CollectionUtils.isEmpty(ztTasks) ? null : DateUtils.getDayLast(ztTasks.get(0).getDeadline())));
+            }
+            if (ztTask.getType().equals("test") && (ztStory.getTestPlanEndTime() == null || ztTask.getDeadline().after(ztStory.getTestPlanEndTime()))) {
+                ztStory.setTestPlanEndTime(ztTask.getDeadline());
+            } else {
+                if (ztTask.getType().equals("test") && ztStory.getTestPlanEndTime() != null) {
+                    //查找最大时间那个
+                    ztStory.setDevelPlanEndTime(ztTask.getDeadline());
+                    List<ZtTask> ztTasks = this.baseMapper.selectList(new QueryWrapper<ZtTask>().lambda()
+                            .select(ZtTask::getDeadline)
+                            .isNotNull(ZtTask::getDeadline)
+                            .eq(ZtTask::getType, "test")
+                            .ne(ZtTask::getId, ztTask.getId())
+                            .in(ZtTask::getStatus, "pause", "done", "wait", "reviewing", "doing", "draft")
+                            .eq(ZtTask::getStory, ztTask.getStory()).orderByDesc(ZtTask::getDeadline));
+                    this.storyService.update(new UpdateWrapper<ZtStory>().lambda()
+                            .eq(ZtStory::getId, ztTask.getStory())
+                            .set(ZtStory::getTestPlanEndTime, CollectionUtils.isEmpty(ztTasks) ? null : DateUtils.getDayLast(ztTasks.get(0).getDeadline())));
+                }
+            }
+            this.storyService.updateById(ztStory);
+        }
 
 
         fileService.updateFile(dto.getFiles(), ztTask.getId(), FileTypes.task);
diff --git a/src/main/resources/mapper/ZtStoryMapper.xml b/src/main/resources/mapper/ZtStoryMapper.xml
index 4cc6094..8a25740 100644
--- a/src/main/resources/mapper/ZtStoryMapper.xml
+++ b/src/main/resources/mapper/ZtStoryMapper.xml
@@ -264,11 +264,16 @@
             and closedBy =#{qo.userName}
         </if>
 
+        <if test="qo.stageList != null and qo.stageList.size() > 0">
+            and s.stage in
+            <foreach collection="qo.stageList" item="id" index="index"
+                     open="(" close=")" separator=",">
+                #{id}
+            </foreach>
 
+        </if>
 
             group by s.id
-
-
         <choose>
             <when test="qo.orderName != '' and qo.orderName != null  ">
                 <choose>
@@ -284,21 +289,10 @@
                 order by s.id desc
             </otherwise>
         </choose>
-
-
-
-
 --             order by id desc
-
-
     </select>
     <select id="projectStoryPageList" resultType="com.sa.zentao.dao.ZtStoryDTO">
-
-
-
-
-
-          select     s.id,
+        select s.id,
         s.vision,
         s.parent,
         s.product,
@@ -370,17 +364,23 @@
         s.ys_date,
         s.devel_plan_end_time,
         s.test_plan_end_time,
-          pt.name productName
-           from zt_story s
+        pt.name productName
+        from zt_story s
 
-            left join zt_storyreview v on s.id  = v.story and s.version = v.version
-            left join zt_projectstory pstory on  s.id = pstory.story and pstory.`type` = 'project'
-            left join zt_project pj on pstory.project = pj.id
-            left join zt_product pt on s.product = pt.id
+        left join zt_storyreview v on s.id = v.story and s.version = v.version
+        left join zt_projectstory pstory on s.id = pstory.story and pstory.`type` = 'project'
+        left join zt_project pj on pstory.project = pj.id
+        left join zt_product pt on s.product = pt.id
         left join zt_projectstory ps on s.id = ps.story
-            WHERE 1=1
+        WHERE 1=1
 
 
+        <!--        <if test="qo.startDate !=null">-->
+        <!--            and  s.openedDate   <![CDATA[>=]]>    #{qo.startDate}-->
+        <!--        </if>-->
+        <!--        <if test="qo.endDate !=null">-->
+        <!--            and  s.openedDate    <![CDATA[<=]]>  #{qo.endDate}-->
+        <!--        </if>-->
 <!--        <if test="qo.startDate !=null">-->
 <!--            and  s.openedDate   <![CDATA[>=]]>    #{qo.startDate}-->
 <!--        </if>-->
@@ -434,47 +434,46 @@
             and pt.name   like concat('%', #{qo.productName}, '%')
         </if>
 
-            <if test="qo.project != null ">
-                    and ps.project =#{qo.project}
-                    and ps.type= 'project'
-            </if>
-            <if test="qo.execution != null ">
-                    and ps.project =#{qo.execution}
-                and ps.type= 'execution'
-            </if>
-            <if test="qo.moduleId != null ">
-                    and s.module =#{qo.moduleId}
-            </if>
-            <if test="qo.searchVal != null and qo.searchVal == 'ALL' ">
+        <if test="qo.project != null ">
+            and ps.project =#{qo.project}
+            and ps.type= 'project'
+        </if>
+        <if test="qo.execution != null ">
+            and ps.project =#{qo.execution}
+            and ps.type= 'execution'
+        </if>
+        <if test="qo.moduleId != null ">
+            and s.module =#{qo.moduleId}
+        </if>
+        <if test="qo.searchVal != null and qo.searchVal == 'ALL' ">
 
-            </if>
-            <if test="qo.searchVal != null and qo.searchVal == 'WGB' ">
-                and s.status !='closed'
-            </if>
-            <if test="qo.searchVal != null and qo.searchVal == 'ZGW' ">
-                    and s.assignedTo = #{qo.userName}
+        </if>
+        <if test="qo.searchVal != null and qo.searchVal == 'WGB' ">
+            and s.status !='closed'
+        </if>
+        <if test="qo.searchVal != null and qo.searchVal == 'ZGW' ">
+            and s.assignedTo = #{qo.userName}
+        </if>
+
+        <if test="qo.kfz == 1 ">
+            <if test="qo.userName != null and qo.userName != '' ">
+
+                and
+                (s.assignedTo = #{qo.userName}
+                or s.openedBy = #{qo.userName}
+                )
             </if>
 
-            <if test="qo.kfz == 1 ">
-                <if test="qo.userName != null and qo.userName != '' ">
-
-                    and
-                     (s.assignedTo = #{qo.userName}
-                    or s.openedBy =  #{qo.userName}
-                    )
-                </if>
-
-            </if>
-
-            <if test="qo.searchVal != null and qo.searchVal == 'WCJ' ">
-                    and s.openedBy = #{qo.userName}
-            </if>
-            <if test="qo.searchVal != null and qo.searchVal == 'YWPS' ">
-                    and v.reviewer = #{qo.userName}
-                    and s.status ='reviewing'
-                    and  v.result = ''
-            </if>
+        </if>
 
+        <if test="qo.searchVal != null and qo.searchVal == 'WCJ' ">
+            and s.openedBy = #{qo.userName}
+        </if>
+        <if test="qo.searchVal != null and qo.searchVal == 'YWPS' ">
+            and v.reviewer = #{qo.userName}
+            and s.status ='reviewing'
+            and v.result = ''
+        </if>
 
 
         <if test="qo.searchVal == 'JH' ">
@@ -576,6 +575,14 @@
                 #{id}
             </foreach>
 
+        </if>
+        <if test="qo.stageList != null and qo.stageList.size() > 0">
+            and s.stage in
+            <foreach collection="qo.stageList" item="id" index="index"
+                     open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+
         </if>
 
 
@@ -1046,6 +1053,14 @@
 
         </if>
 
+        <if test="qo.stageList != null and qo.stageList.size() > 0">
+            and s.stage in
+            <foreach collection="qo.stageList" item="id" index="index"
+                     open="(" close=")" separator=",">
+                #{id}
+            </foreach>
+
+        </if>
         group by s.id
 
         <choose>
diff --git a/src/main/resources/mapper/ZtStoryUserMapper.xml b/src/main/resources/mapper/ZtStoryUserMapper.xml
index 659fbea..de8f051 100644
--- a/src/main/resources/mapper/ZtStoryUserMapper.xml
+++ b/src/main/resources/mapper/ZtStoryUserMapper.xml
@@ -162,6 +162,16 @@
                     and s.openedBy = #{qo.openedby}
             </if>
 
+            <if test="qo.statusList != null and qo.statusList.size() > 0">
+                    and s.status in
+                    <foreach collection="qo.statusList" item="id" index="index"
+                             open="(" close=")" separator=",">
+                            #{id}
+                    </foreach>
+
+            </if>
+
+
 
             <if test="qo.status != null and qo.status != '' ">
 --                     需求明确中、详细设计、详细设计中、产品已设计、需求待确认 这些查询状态合并成 “需求明确中”