Merge remote-tracking branch 'origin/dev-2025' into dev-2025

# Conflicts:
#	src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
#	src/main/resources/mapper/ZtStoryMapper.xml

src/main/java/com/sa/zentao/qo/ZtProjectQo.java

@@ -111,6 +111,14 @@ public class ZtProjectQo extends BaseQo {
     private String   spec;
 
     private String bugType;
+    /**
+     * 测试人员
+     */
+    private String testUser;
+    /**
+     * 产品人员
+     */
+    private String productUser;
 
     private String account;
     //1 延期 2不延期

src/main/resources/mapper/ZtStoryMapper.xml

@@ -219,6 +219,13 @@
             and s.title like concat('%', #{qo.title}, '%')
         </if>
 
+        <if test="qo.testUser != null and qo.testUser != '' ">
+            and s.test_user  like concat('%', #{qo.testUser}, '%')
+        </if>
+        <if test="qo.productUser != null and qo.productUser != '' ">
+            and s.product_user like concat('%', #{qo.productUser}, '%')
+        </if>
+
             <if test="qo.id != null ">
                     and s.id = #{qo.id}
             </if>
@@ -276,6 +283,8 @@
         </if>
 
             group by s.id
+
+
         <choose>
             <when test="qo.orderName != '' and qo.orderName != null  ">
                 <choose>
@@ -380,6 +389,24 @@
             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>-->
+<!--        <if test="qo.endDate !=null">-->
+<!--            and  s.openedDate    <![CDATA[<=]]>  #{qo.endDate}-->
+<!--        </if>-->
+        <if test="qo.testUser != null and qo.testUser != '' ">
+            and s.test_user  like concat('%', #{qo.testUser}, '%')
+        </if>
+        <if test="qo.productUser != null and qo.productUser != '' ">
+            and s.product_user like concat('%', #{qo.productUser}, '%')
+        </if>
         <!--        <if test="qo.startDate !=null">-->
         <!--            and  s.openedDate   <![CDATA[>=]]>    #{qo.startDate}-->
         <!--        </if>-->
@@ -520,11 +547,11 @@
 
         <if test="qo.searchCode != null and qo.searchCode != '' ">
 
-            -- //项目名称
+--             //项目名称
             <if test="qo.searchCode=='xmmc' and qo.searchValue != null and qo.searchValue != '' ">
                and  pj.name  like concat('%', #{qo.searchValue}, '%')
             </if>
-            -- 项目id
+--             项目id
             <if test="qo.searchCode=='xmid' and qo.searchValue != null and qo.searchValue != '' ">
                 and  pj.id =#{qo.searchValue}
             </if>
@@ -538,15 +565,15 @@
                 and  s.id =#{qo.searchValue}
             </if>
 
-            -- 状态
+--             状态
             <if test="qo.searchCode=='zt' and qo.searchValue != null and qo.searchValue != '' ">
                 and  s.stage =#{qo.searchValue}
             </if>
-            -- 项目描述
+--             项目描述
             <if test="qo.searchCode=='xmms' and qo.searchValue != null and qo.searchValue != '' ">
                 and  sp.`spec` =#{qo.searchValue}
             </if>
-            -- 负责人
+--             负责人
 
             <if test="qo.searchCode=='fzr' and qo.searchValue != null and qo.searchValue != '' ">
                 and  s.assignedTo =#{qo.searchValue}
@@ -588,6 +615,7 @@
 
         </if>
 
+
         group by s.id
 
         <choose>
@@ -901,7 +929,12 @@
         WHERE 1=1
 
 
-
+        <if test="qo.testUser != null and qo.testUser != '' ">
+            and s.test_user  like concat('%', #{qo.testUser}, '%')
+        </if>
+        <if test="qo.productUser != null and qo.productUser != '' ">
+            and s.product_user like concat('%', #{qo.productUser}, '%')
+        </if>
 
         <if test="qo.pri != null and qo.pri != '' ">
             and s.pri = #{qo.pri}