From 9ed6f173ee5247a25458b461cf1cd0b3dacc4f86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=85=B6=E5=85=B5?=
 <guoqibing@sino-assistance.com>
Date: Thu, 15 May 2025 11:15:04 +0800
Subject: [PATCH] =?UTF-8?q?bug=E7=BB=91=E5=AE=9A=E5=A4=9A=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ZtBugBoundUserController.java  | 20 +++++++++++
 .../com/sa/zentao/entity/ZtBugBoundUser.java  | 35 +++++++++++++++++++
 .../java/com/sa/zentao/entity/ZtRelease.java  |  2 +-
 .../zentao/mapper/ZtBugBoundUserMapper.java   | 16 +++++++++
 .../service/IZtBugBoundUserService.java       | 19 ++++++++++
 .../impl/ZtBugBoundUserServiceImpl.java       | 27 ++++++++++++++
 .../service/impl/ZtProductServiceImpl.java    |  3 ++
 .../resources/mapper/ZtBugBoundUserMapper.xml | 10 ++++++
 .../mapper/ZtReleaseDetailsMapper.xml         |  9 ++---
 src/main/resources/mapper/ZtStoryMapper.xml   |  2 +-
 10 files changed, 135 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/sa/zentao/controller/ZtBugBoundUserController.java
 create mode 100644 src/main/java/com/sa/zentao/entity/ZtBugBoundUser.java
 create mode 100644 src/main/java/com/sa/zentao/mapper/ZtBugBoundUserMapper.java
 create mode 100644 src/main/java/com/sa/zentao/service/IZtBugBoundUserService.java
 create mode 100644 src/main/java/com/sa/zentao/service/impl/ZtBugBoundUserServiceImpl.java
 create mode 100644 src/main/resources/mapper/ZtBugBoundUserMapper.xml

diff --git a/src/main/java/com/sa/zentao/controller/ZtBugBoundUserController.java b/src/main/java/com/sa/zentao/controller/ZtBugBoundUserController.java
new file mode 100644
index 0000000..01d4416
--- /dev/null
+++ b/src/main/java/com/sa/zentao/controller/ZtBugBoundUserController.java
@@ -0,0 +1,20 @@
+package com.sa.zentao.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author gqb
+ * @since 2025-05-13
+ */
+@RestController
+@RequestMapping("/zt-bug-bound-user")
+public class ZtBugBoundUserController {
+
+}
diff --git a/src/main/java/com/sa/zentao/entity/ZtBugBoundUser.java b/src/main/java/com/sa/zentao/entity/ZtBugBoundUser.java
new file mode 100644
index 0000000..999c5b5
--- /dev/null
+++ b/src/main/java/com/sa/zentao/entity/ZtBugBoundUser.java
@@ -0,0 +1,35 @@
+package com.sa.zentao.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author gqb
+ * @since 2025-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class ZtBugBoundUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer bugId;
+
+    /**
+     * 责任人
+     */
+    private String assignedTo;
+
+
+}
diff --git a/src/main/java/com/sa/zentao/entity/ZtRelease.java b/src/main/java/com/sa/zentao/entity/ZtRelease.java
index 1a50cab..5161e29 100644
--- a/src/main/java/com/sa/zentao/entity/ZtRelease.java
+++ b/src/main/java/com/sa/zentao/entity/ZtRelease.java
@@ -81,7 +81,7 @@ public class ZtRelease implements Serializable {
     @TableField("`level`")
     private String level;
     //真实发布时间
-    @TableField(exist = false)
+//    @TableField(exist = false)
     private Date realReleaseDate;
     private String danger;
 
diff --git a/src/main/java/com/sa/zentao/mapper/ZtBugBoundUserMapper.java b/src/main/java/com/sa/zentao/mapper/ZtBugBoundUserMapper.java
new file mode 100644
index 0000000..7a1bb87
--- /dev/null
+++ b/src/main/java/com/sa/zentao/mapper/ZtBugBoundUserMapper.java
@@ -0,0 +1,16 @@
+package com.sa.zentao.mapper;
+
+import com.sa.zentao.entity.ZtBugBoundUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author gqb
+ * @since 2025-05-13
+ */
+public interface ZtBugBoundUserMapper extends BaseMapper<ZtBugBoundUser> {
+
+}
diff --git a/src/main/java/com/sa/zentao/service/IZtBugBoundUserService.java b/src/main/java/com/sa/zentao/service/IZtBugBoundUserService.java
new file mode 100644
index 0000000..1c121e4
--- /dev/null
+++ b/src/main/java/com/sa/zentao/service/IZtBugBoundUserService.java
@@ -0,0 +1,19 @@
+package com.sa.zentao.service;
+
+import com.sa.zentao.entity.ZtBugBoundUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author gqb
+ * @since 2025-05-13
+ */
+public interface IZtBugBoundUserService extends IService<ZtBugBoundUser> {
+
+    List<ZtBugBoundUser> listByBugId(Integer id);
+}
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtBugBoundUserServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtBugBoundUserServiceImpl.java
new file mode 100644
index 0000000..29a00c6
--- /dev/null
+++ b/src/main/java/com/sa/zentao/service/impl/ZtBugBoundUserServiceImpl.java
@@ -0,0 +1,27 @@
+package com.sa.zentao.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.sa.zentao.entity.ZtBugBoundUser;
+import com.sa.zentao.mapper.ZtBugBoundUserMapper;
+import com.sa.zentao.service.IZtBugBoundUserService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author gqb
+ * @since 2025-05-13
+ */
+@Service
+public class ZtBugBoundUserServiceImpl extends ServiceImpl<ZtBugBoundUserMapper, ZtBugBoundUser> implements IZtBugBoundUserService {
+
+    @Override
+    public List<ZtBugBoundUser> listByBugId(Integer id) {
+        return this.baseMapper.selectList(new QueryWrapper<ZtBugBoundUser>().lambda().eq(ZtBugBoundUser::getBugId, id));
+    }
+}
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtProductServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtProductServiceImpl.java
index c301c89..a4e6a5a 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtProductServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtProductServiceImpl.java
@@ -1,5 +1,6 @@
 package com.sa.zentao.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -578,6 +579,7 @@ public class ZtProductServiceImpl extends ServiceImpl<ZtProductMapper, ZtProduct
     @Override
     public Object searchObj(ZtAllBusinessDTO dto) {
         Object result =null;
+        JSONObject obj=new JSONObject();
         if("task".equals(dto.getSearchType())){
             result=this.taskService.getById(dto.getSearchId());
         }else   if("story".equals(dto.getSearchType())){
@@ -587,6 +589,7 @@ public class ZtProductServiceImpl extends ServiceImpl<ZtProductMapper, ZtProduct
         }else   if("bug".equals(dto.getSearchType())){
             result=this.bugService.getById(dto.getSearchId());
         }
+
         return result;
     }
 
diff --git a/src/main/resources/mapper/ZtBugBoundUserMapper.xml b/src/main/resources/mapper/ZtBugBoundUserMapper.xml
new file mode 100644
index 0000000..d733959
--- /dev/null
+++ b/src/main/resources/mapper/ZtBugBoundUserMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sa.zentao.mapper.ZtBugBoundUserMapper">
+    <resultMap id="BaseResultMap" type="com.sa.zentao.entity.ZtBugBoundUser">
+            <result column="id" property="id" />
+            <result column="bug_id" property="bugId" />
+            <result column="assigned_to" property="assignedTo" />
+    </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/ZtReleaseDetailsMapper.xml b/src/main/resources/mapper/ZtReleaseDetailsMapper.xml
index 66ac862..1597596 100644
--- a/src/main/resources/mapper/ZtReleaseDetailsMapper.xml
+++ b/src/main/resources/mapper/ZtReleaseDetailsMapper.xml
@@ -10,13 +10,10 @@
     <select id="releaseStoryPageList" resultType="com.sa.zentao.dao.ZtStoryDTO">
 
 
-        select s.* from (zt_story s,zt_projectstory ps,zt_release_details details ) left
-        join zt_storyspec sp on s.id = sp.story
-        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.execution =0
-        left join zt_project pj on pstory.project = pj.id
+        select s.* from (zt_story s,zt_release_details details )
 
-        WHERE s.id = ps.story
+
+        WHERE 1=1
         and s.id = details.object_id
         and details.object_type ='story'
         and details.release_id = #{qo.id}
diff --git a/src/main/resources/mapper/ZtStoryMapper.xml b/src/main/resources/mapper/ZtStoryMapper.xml
index 4c9e0a4..c54ee1e 100644
--- a/src/main/resources/mapper/ZtStoryMapper.xml
+++ b/src/main/resources/mapper/ZtStoryMapper.xml
@@ -358,7 +358,7 @@
            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.execution =0
+            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