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; + } }