From 79412c21de9b4562267699631e8d6546b64b0689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Wed, 26 Nov 2025 17:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=8F=8D=E9=A6=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bmw/controller/QuestionRecordController.java      | 11 ++++-------
 .../com/bonus/bmw/domain/dto/QuestionRecordDto.java   |  2 +-
 .../resources/mapper/bmw/QuestionRecordMapper.xml     |  4 +++-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/QuestionRecordController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/QuestionRecordController.java
index 7a34057..f237362 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/QuestionRecordController.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/QuestionRecordController.java
@@ -9,9 +9,6 @@ import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.common.log.annotation.SysLog;
 import com.bonus.common.log.enums.OperaType;
-import com.bonus.common.security.annotation.InnerAuth;
-import com.bonus.common.security.annotation.RequiresPermissions;
-import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -40,7 +37,7 @@ public class QuestionRecordController extends BaseController {
      * @return
      *
      */
-    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:question:list"))
+//    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth(isUser = false), requiresPermissions = @RequiresPermissions("worker:question:list"))
     @GetMapping("/list")
     @SysLog(title = "问题记录列表", businessType = OperaType.QUERY, logType = 0, module = "问题记录列表", details = "问题记录列表")
     public TableDataInfo list(QuestionRecordDto o) {
@@ -54,7 +51,7 @@ public class QuestionRecordController extends BaseController {
         return getDataTableError(new ArrayList<>());
     }
 
-    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:insert"))
+//    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:insert"))
     @PostMapping("/insert")
     @SysLog(title = "新增问题记录", businessType = OperaType.UPDATE, logType = 0, module = "新增问题记录", details = "新增问题记录")
     public AjaxResult exit(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "params")String params) {
@@ -73,7 +70,7 @@ public class QuestionRecordController extends BaseController {
     /**
      * 删除分包商
      */
-    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:del"))
+//    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:del"))
     @PostMapping("/del")
     @SysLog(title = "删除问题记录", businessType = OperaType.UPDATE, logType = 0, module = "删除问题记录")
     public AjaxResult del(@Validated @RequestBody QuestionRecordDto o) {
@@ -94,7 +91,7 @@ public class QuestionRecordController extends BaseController {
     /**
      * 删除分包商
      */
-    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:deal"))
+//    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("worker:question:deal"))
     @PostMapping("/deal")
     @SysLog(title = "处理问题", businessType = OperaType.UPDATE, logType = 0, module = "处理问题")
     public AjaxResult deal(@Validated @RequestBody QuestionRecordDto o) {
diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/QuestionRecordDto.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/QuestionRecordDto.java
index f953647..2b822bb 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/QuestionRecordDto.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/dto/QuestionRecordDto.java
@@ -42,7 +42,7 @@ public class QuestionRecordDto {
     private String handler;
 
     /**
-     * 详情
+     * 解决回复
      */
     private String remark;
     /**
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/QuestionRecordMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/QuestionRecordMapper.xml
index bf083b1..f93e3d7 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/QuestionRecordMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/QuestionRecordMapper.xml
@@ -7,12 +7,14 @@
         qr.id,
         qr.module,
         qr.content,
+        qr.status,
         qr.submitter,
         qr.handler,
         qr.create_time,
         qr.update_time
         from question_record qr
         <where>
+            qr.is_active = 1
             <if test="module != null and module != ''">
                 and qr.module = #{module}
             </if>
@@ -33,7 +35,7 @@
 
     </select>
 
-    <insert id="insert">
+    <insert id="insert" keyProperty="id" keyColumn="id" useGeneratedKeys="true">
         insert into question_record( module, content, submitter,create_id)
         values( #{module}, #{content}, #{submitter}, #{createId})
     </insert>