From 8f0c7a020c24d4497c704b352d3805aeff86dad7 Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Thu, 25 Dec 2025 13:46:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sa/zentao/enums/UserType.java    |  1 +
 .../java/com/sa/zentao/qo/ZtProjectQo.java    |  8 ++++++++
 .../service/impl/ZtTaskServiceImpl.java       |  6 ++++++
 src/main/resources/mapper/ZtStoryMapper.xml   | 20 ++++++++++++++++++-
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sa/zentao/enums/UserType.java b/src/main/java/com/sa/zentao/enums/UserType.java
index b6ea646..f0defeb 100644
--- a/src/main/java/com/sa/zentao/enums/UserType.java
+++ b/src/main/java/com/sa/zentao/enums/UserType.java
@@ -13,6 +13,7 @@ public enum UserType {
     UI(7, "UI工程师"),
     XMJL(8, "项目经理"),
     XMZL(9, "项目助理"),
+    CPJL(10, "产品经理"),
     ;
 
     @EnumValue
diff --git a/src/main/java/com/sa/zentao/qo/ZtProjectQo.java b/src/main/java/com/sa/zentao/qo/ZtProjectQo.java
index aefe172..959a5bc 100644
--- a/src/main/java/com/sa/zentao/qo/ZtProjectQo.java
+++ b/src/main/java/com/sa/zentao/qo/ZtProjectQo.java
@@ -105,6 +105,14 @@ public class ZtProjectQo extends BaseQo {
     private String   spec;
 
     private String bugType;
+    /**
+     * 测试人员
+     */
+    private String testUser;
+    /**
+     * 产品人员
+     */
+    private String productUser;
 
     private String account;
     //1 延期 2不延期
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 924bf65..3f191b3 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtTaskServiceImpl.java
@@ -996,6 +996,12 @@ public class ZtTaskServiceImpl extends ServiceImpl<ZtTaskMapper, ZtTask> impleme
             actionService.addAction(ActionType.RW, ActionStatus.TJJFW, dto.getId(), projectproduct == null ? null : projectproduct.getProduct().toString(), projectproduct == null ? null : projectproduct.getProject(), ztTask.getExecution(),
                     StringUtils.isEmpty(finishBy) ? RiskUserThreadLocal.get().getName() : finishBy, dto.getDeliverContent(), null);
             if(ztTask.getStory()!=null&&ztTask.getStory()!=0){
+                //更新需求交付物
+                ZtStory ztStory = this.storyService.getById(ztTask.getStory());
+                if(ztStory!=null){
+                    ztStory.setDeliverContent(ztTask.getDeliverContent());
+                    this.storyService.updateById(ztStory);
+                }
                 actionService.addAction(ActionType.XQ, ActionStatus.TJJFW, dto.getId(), projectproduct == null ? null : projectproduct.getProduct().toString(), projectproduct == null ? null : projectproduct.getProject(), ztTask.getExecution(),
                         StringUtils.isEmpty(finishBy) ? RiskUserThreadLocal.get().getName() : finishBy, dto.getDeliverContent(), null);
             }
diff --git a/src/main/resources/mapper/ZtStoryMapper.xml b/src/main/resources/mapper/ZtStoryMapper.xml
index 0954318..4cc6094 100644
--- a/src/main/resources/mapper/ZtStoryMapper.xml
+++ b/src/main/resources/mapper/ZtStoryMapper.xml
@@ -213,6 +213,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>
@@ -380,6 +387,12 @@
 <!--        <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.pri != null and qo.pri != '' ">
             and s.pri = #{qo.pri}
         </if>
@@ -879,7 +892,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}

From 0f1c7b02febddcf8ec58baa78ec5e2a816929c13 Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Thu, 25 Dec 2025 14:02:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/scope/产品经理考核.xlsx | Bin 0 -> 12629 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/main/resources/templates/scope/产品经理考核.xlsx

diff --git a/src/main/resources/templates/scope/产品经理考核.xlsx b/src/main/resources/templates/scope/产品经理考核.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..2d386fe9d4d80cd2c647667969c2b5d1d67d3e43
GIT binary patch
literal 12629
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
JcG_RK{|9ZBbKU>|

literal 0
HcmV?d00001