From b11a8da9ce1006c15e5105400f55dce178328680 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 12 Apr 2023 09:48:28 +0800 Subject: [PATCH 1/2] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusProcessNewController.java | 5 +++ .../datas/service/IBusProcessNewService.java | 1 + .../impl/BusProcessNewServiceImpl.java | 33 +++++++++++++++++-- 3 files changed, 36 insertions(+), 3 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 6c89387f..171457db 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 @@ -84,5 +84,10 @@ public class BusProcessNewController extends BaseAction { return iBusProcessNewService.selectWenDan(taskId); } + @ApiOperation(value = "问答中心 个人中心 我的问答 回答无taskID问题") + @GetMapping("/questionsAndAnswers") + public 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 1e0f17f9..c6b564e9 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 @@ -45,4 +45,5 @@ public interface IBusProcessNewService extends IService { Map selectWenDan(String taskId); + 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 f89c2b9e..8d51b452 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 @@ -132,11 +132,13 @@ public class BusProcessNewServiceImpl extends ServiceImpl busProcessNews = baseMapper.selectList(objectQueryWrapper); if(!busProcessNews.isEmpty()){ - String mesg = busProcessNews.get(0).getMesg(); + String mesg = busProcessNews.get(0).getMesg(); JSONObject jsonObject = JSON.parseObject(mesg); JSONObject askQuestions = jsonObject.getJSONObject("askQuestions"); - String id = askQuestions.getString("id"); - return id; + if(askQuestions!=null) { + String id = askQuestions.getString("id"); + return id; + } } } return null; @@ -155,4 +157,29 @@ public class BusProcessNewServiceImpl extends ServiceImpl objectQueryWrapper = new QueryWrapper<>(); + objectQueryWrapper.eq("USER_ID",answerer); + objectQueryWrapper.eq("TASK_INFO","问答中心回答"); + objectQueryWrapper.groupBy("P_ID"); + List busProcessNews = baseMapper.selectList(objectQueryWrapper); + if(!busProcessNews.isEmpty()){ + for (BusProcessNew data: busProcessNews){ + JSONObject jsonObject = JSON.parseObject(data.getMesg()); + JSONObject askQuestions = jsonObject.getJSONObject("askQuestions"); + if(askQuestions!=null) { + String id = askQuestions.getString("id"); + if (StringUtils.isNotBlank(id)) { + if (id.equals(askId)) { + //返回当前数据 + return data; + } + } + } + } + } + return null; + } } From 836d70043aea2178a22d877fab409b5677d48253 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 12 Apr 2023 16:37:33 +0800 Subject: [PATCH 2/2] =?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 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 { Map selectWenDan(String taskId); - BusProcessNew questionsAndAnswers(String askId, String answerer); + ResponseMessage 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 questionsAndAnswers(String askId, String answerer) { QueryWrapper objectQueryWrapper = new QueryWrapper<>(); objectQueryWrapper.eq("USER_ID",answerer); objectQueryWrapper.eq("TASK_INFO","问答中心回答"); @@ -174,12 +176,12 @@ public class BusProcessNewServiceImpl extends ServiceImpl