搜索条件添加

src/main/resources/mapper/ZtStoryUserMapper.xml

@@ -161,8 +161,18 @@
             <if test="qo.openedby != null and qo.openedby != '' ">
                     and s.openedBy = #{qo.openedby}
             </if>
+
+
             <if test="qo.status != null and qo.status != '' ">
-                    and s.status = #{qo.status}
+--                     需求明确中、详细设计、详细设计中、产品已设计、需求待确认 这些查询状态合并成 “需求明确中”
+                    <if test="qo.status != null and qo.status == 'unconfirmed' ">
+                            and s.status in ('unconfirmed'
+                            ,'waitcommunicate'
+                            ,'waitdesign','designdoing','designdone','storyunconfirmed')
+                    </if>
+                    <if test="qo.status != null and qo.status != 'unconfirmed' ">
+                            and s.status = #{qo.status}
+                    </if>
             </if>
 
             <if test="qo.productName != null and qo.productName != '' ">