合并分支 'dev_20230216' 到 'master'

Dev 20230216

查看合并请求 laws-foton-slrs/foton-wkflow-rest!27

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.http.ResponseMessage;
-import com.ydw.bat.wkflow.util.WebUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.activiti.engine.task.Task;
@@ -84,5 +82,10 @@ public class BusProcessNewController extends BaseAction {
         return iBusProcessNewService.selectWenDan(taskId);
     }
 
+    @ApiOperation(value = "问答中心 个人中心 我的问答 回答无taskID问题")
+    @GetMapping("/questionsAndAnswers")
+    public ResponseMessage<BusProcessNew> questionsAndAnswers(@RequestParam("askId") String askId, @RequestParam("answerer") String answerer) {
+        return iBusProcessNewService.questionsAndAnswers(askId,answerer);
+    }
 }
 

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,4 +46,5 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
 
     Map<String,Object> selectWenDan(String taskId);
 
+    ResponseMessage<BusProcessNew> questionsAndAnswers(String askId, String answerer);
 }

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java

@@ -9,6 +9,9 @@ import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
 import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 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;
@@ -128,7 +131,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
             objectQueryWrapper.eq("TASK_ID",taskId);
             List<BusProcessNew> 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 = "";
@@ -154,4 +157,29 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
         }
         return null;
     }
+
+    @Override
+    public ResponseMessage<BusProcessNew> questionsAndAnswers(String askId, String answerer) {
+        QueryWrapper<BusProcessNew> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("USER_ID",answerer);
+        objectQueryWrapper.eq("TASK_INFO","问答中心回答");
+        objectQueryWrapper.groupBy("P_ID");
+        List<BusProcessNew> 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 Result.success(data);
+                        }
+                    }
+                }
+            }
+        }
+        return Result.error();
+    }
 }