From 836d70043aea2178a22d877fab409b5677d48253 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Wed, 12 Apr 2023 16:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83=20?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E5=9B=9E=E7=AD=94=20=E8=BF=94=E5=9B=9EtaskId?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datas/controller/BusProcessNewController.java         | 6 ++----
 .../datas/service/IBusProcessNewService.java              | 3 ++-
 .../datas/service/impl/BusProcessNewServiceImpl.java      | 8 +++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java
index 171457db..b6595722 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java
@@ -1,12 +1,10 @@
 package com.ydw.bat.wkflow.business_main.datas.controller;
 
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.tmsps.fk.common.base.action.BaseAction;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
-import com.ydw.bat.wkflow.business_main.datas.service.impl.BusProcessNewServiceImpl;
-import com.ydw.bat.wkflow.util.WebUtil;
+import com.ydw.bat.wkflow.util.http.ResponseMessage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.activiti.engine.task.Task;
@@ -86,7 +84,7 @@ public class BusProcessNewController extends BaseAction {
 
     @ApiOperation(value = "问答中心 个人中心 我的问答 回答无taskID问题")
     @GetMapping("/questionsAndAnswers")
-    public BusProcessNew questionsAndAnswers(@RequestParam("askId") String askId,@RequestParam("answerer") String answerer) {
+    public ResponseMessage<BusProcessNew> questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer) {
         return iBusProcessNewService.questionsAndAnswers(askId,answerer);
     }
 }
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
index c6b564e9..b6be23c1 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java
@@ -2,6 +2,7 @@ package com.ydw.bat.wkflow.business_main.datas.service;
 
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydw.bat.wkflow.util.http.ResponseMessage;
 import org.activiti.engine.task.Task;
 import org.apache.ibatis.annotations.Param;
 
@@ -45,5 +46,5 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
 
     Map<String,Object> selectWenDan(String taskId);
 
-    BusProcessNew questionsAndAnswers(String askId, String answerer);
+    ResponseMessage<BusProcessNew> questionsAndAnswers(String askId, String answerer);
 }
diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
index 8d51b452..408f5d5f 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java
@@ -13,6 +13,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydw.bat.wkflow.business_oa.webService.service.impl.WebServiceOAServiceImpl;
 import com.ydw.bat.wkflow.config.ScheduledJobEsPlan;
+import com.ydw.bat.wkflow.util.http.ResponseMessage;
+import com.ydw.bat.wkflow.util.http.Result;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang.StringUtils;
@@ -159,7 +161,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
     }
 
     @Override
-    public BusProcessNew questionsAndAnswers(String askId, String answerer) {
+    public ResponseMessage<BusProcessNew> questionsAndAnswers(String askId, String answerer) {
         QueryWrapper<BusProcessNew> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("USER_ID",answerer);
         objectQueryWrapper.eq("TASK_INFO","问答中心回答");
@@ -174,12 +176,12 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                     if (StringUtils.isNotBlank(id)) {
                         if (id.equals(askId)) {
                             //返回当前数据
-                            return data;
+                            return Result.success(data);
                         }
                     }
                 }
             }
         }
-        return null;
+        return Result.error();
     }
 }