合并分支 'dev_20230216' 到 'master'

问答中心 先回答 没有msg

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

src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -77,5 +78,11 @@ public class BusProcessNewController extends BaseAction {
         return iBusProcessNewService.selectAskId(taskId);
     }
 
+    @ApiOperation(value = "问答中心（第一个人回答以后返回所有的信息 json）")
+    @GetMapping("/selectWenDan")
+    public Map<String,Object> selectWenDan(@RequestParam("taskId") String taskId){
+        return iBusProcessNewService.selectWenDan(taskId);
+    }
+
 }
 

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

@@ -6,6 +6,7 @@ import org.activiti.engine.task.Task;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -41,4 +42,7 @@ public interface IBusProcessNewService extends IService<BusProcessNew> {
     List<BusProcessNew> deleteReplyToenNotice(String taskId, String answerer);
 
     String selectAskId(String taskId);
+
+    Map<String,Object> selectWenDan(String taskId);
+
 }

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

@@ -4,8 +4,10 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydw.bat.wkflow.business_activiti.task.TodoTaskController;
+import com.ydw.bat.wkflow.business_auth.LawsUserInfoService;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusMes;
 import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.entity.Reply;
 import com.ydw.bat.wkflow.business_main.datas.mapper.BusProcessNewMapper;
 import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -36,6 +38,8 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
 
     @Autowired
     private WebServiceOAServiceImpl webServiceOAService;
+    @Autowired
+    private LawsUserInfoService lawsUserInfoService;
 
     /*
      * @Author yuzhong
@@ -137,4 +141,18 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
         }
         return null;
     }
+
+    @Override
+    public  Map<String,Object> selectWenDan(String taskId) {
+        QueryWrapper<BusProcessNew> objectQueryWrapper = new QueryWrapper<>();
+        objectQueryWrapper.eq("TASK_ID",taskId);
+        List<BusProcessNew> busProcessNews = baseMapper.selectList(objectQueryWrapper);
+        if(!busProcessNews.isEmpty()){
+            String mesg = busProcessNews.get(0).getMesg();
+            JSONObject jsonObject = JSON.parseObject(mesg);
+            // 用 问题id搜所有的回答 返回回来存储起来 给前端传过来
+            return jsonObject;
+        }
+        return null;
+    }
 }