问答中心回答
This commit is contained in:
@@ -475,4 +475,8 @@ public interface workFlowFeignClient {
|
|||||||
String getEsByWk(@RequestParam("prcId")String prcId);
|
String getEsByWk(@RequestParam("prcId")String prcId);
|
||||||
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectBusProcessNew",method = RequestMethod.GET)
|
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectBusProcessNew",method = RequestMethod.GET)
|
||||||
String selectBusProcessNew(@RequestParam("taskId")String taskId);
|
String selectBusProcessNew(@RequestParam("taskId")String taskId);
|
||||||
|
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/deleteReplyToenNotice",method = RequestMethod.GET)
|
||||||
|
String deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer);
|
||||||
|
@RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectAskId",method = RequestMethod.GET)
|
||||||
|
String selectAskId(@RequestParam("taskId") String taskId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -422,4 +422,12 @@ public class workFlowFeignClientImpl {
|
|||||||
public String selectBusProcessNew(@RequestParam("taskId")String taskId) {
|
public String selectBusProcessNew(@RequestParam("taskId")String taskId) {
|
||||||
return workFlowFeignClient.selectBusProcessNew(taskId);
|
return workFlowFeignClient.selectBusProcessNew(taskId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) {
|
||||||
|
return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String selectAskId(@RequestParam("taskId") String taskId) {
|
||||||
|
return workFlowFeignClient.selectAskId(taskId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -973,4 +973,16 @@ public class WorkFlowController {
|
|||||||
public String selectBusProcessNew(@RequestParam("taskId") String taskId) {
|
public String selectBusProcessNew(@RequestParam("taskId") String taskId) {
|
||||||
return workFlowFeignClient.selectBusProcessNew(taskId);
|
return workFlowFeignClient.selectBusProcessNew(taskId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "问答中心(第一个人回答以后删除其他人的代办任务以及OA提醒)")
|
||||||
|
@GetMapping("/deleteReplyToenNotice")
|
||||||
|
public String deleteReplyToenNotice(@RequestParam("taskId") String taskId,@RequestParam("answerer") String answerer) {
|
||||||
|
return workFlowFeignClient.deleteReplyToenNotice(taskId,answerer);
|
||||||
|
}
|
||||||
|
|
||||||
|
@ApiOperation(value = "问答中心(通过taskId获取提问Id)")
|
||||||
|
@GetMapping("/selectAskId")
|
||||||
|
public String selectAskId(@RequestParam("taskId") String taskId) {
|
||||||
|
return workFlowFeignClient.selectAskId(taskId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+49
@@ -5,8 +5,11 @@ import com.adc.da.slrs.StandardQA.dao.AskQuestionsDao;
|
|||||||
import com.adc.da.slrs.StandardQA.entity.*;
|
import com.adc.da.slrs.StandardQA.entity.*;
|
||||||
import com.adc.da.slrs.StandardQA.service.Impl.AskQuestionsServiceImpl;
|
import com.adc.da.slrs.StandardQA.service.Impl.AskQuestionsServiceImpl;
|
||||||
import com.adc.da.slrs.StandardQA.service.Impl.AskUserServiceImpl;
|
import com.adc.da.slrs.StandardQA.service.Impl.AskUserServiceImpl;
|
||||||
|
import com.adc.da.slrs.StandardQA.service.Impl.ReplyServiceImpl;
|
||||||
import com.adc.da.slrs.StandardQA.service.Impl.SubscriptionServiceImpl;
|
import com.adc.da.slrs.StandardQA.service.Impl.SubscriptionServiceImpl;
|
||||||
import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl;
|
import com.adc.da.slrs.sarStandardsInfo.service.impl.SarStandardsInfoServiceImpl;
|
||||||
|
import com.adc.da.slrs.sarUser.dao.TsUserDao;
|
||||||
|
import com.adc.da.slrs.sarUser.entity.TsUser;
|
||||||
import com.adc.da.util.LoginUserUtil;
|
import com.adc.da.util.LoginUserUtil;
|
||||||
import com.adc.da.util.UUIDUtils;
|
import com.adc.da.util.UUIDUtils;
|
||||||
import com.adc.da.util.http.ResponseMessage;
|
import com.adc.da.util.http.ResponseMessage;
|
||||||
@@ -41,6 +44,12 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private AskUserServiceImpl askUserService;
|
private AskUserServiceImpl askUserService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ReplyServiceImpl replyService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private TsUserDao tsUserDao;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private SubscriptionServiceImpl subscriptionService;
|
private SubscriptionServiceImpl subscriptionService;
|
||||||
|
|
||||||
@@ -262,4 +271,44 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
|
|||||||
return Result.success(askQuestionsList);
|
return Result.success(askQuestionsList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/selectQuestionReplyInfo")
|
||||||
|
public ResponseMessage selectQuestionReplyInfo(String id){
|
||||||
|
List<Object> objects = new ArrayList<>();
|
||||||
|
if(StringUtils.isNotBlank(id)){
|
||||||
|
AskQuestions askQuestions = askQuestionsService.getById(id);
|
||||||
|
if(askQuestions!=null) {
|
||||||
|
TsUser tsUser = tsUserDao.selectById(askQuestions.getQuestioner());
|
||||||
|
if(tsUser!=null){
|
||||||
|
askQuestions.setQuestioner(tsUser.getUname());
|
||||||
|
}
|
||||||
|
if(askQuestions.getClassification().equals("BUSINESS_STAND")){
|
||||||
|
askQuestions.setClassification("企业标准");
|
||||||
|
}
|
||||||
|
if(askQuestions.getClassification().equals("FOREIGN")){
|
||||||
|
askQuestions.setClassification("海外标准");
|
||||||
|
}
|
||||||
|
if(askQuestions.getClassification().equals("INLAND")){
|
||||||
|
askQuestions.setClassification("国内标准");
|
||||||
|
}
|
||||||
|
if(askQuestions.getClassification().equals("OTHER")){
|
||||||
|
askQuestions.setClassification("公共标准");
|
||||||
|
}
|
||||||
|
QueryWrapper<Reply> replyQueryWrapper = new QueryWrapper<>();
|
||||||
|
replyQueryWrapper.eq("ASK_ID", id);
|
||||||
|
List<Reply> list = replyService.list(replyQueryWrapper);
|
||||||
|
if(!list.isEmpty()){
|
||||||
|
for (Reply reply : list){
|
||||||
|
TsUser ruser = tsUserDao.selectById(reply.getAnswerer());
|
||||||
|
if(ruser!=null){
|
||||||
|
reply.setAnswerer(ruser.getUname());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
objects.add(askQuestions);
|
||||||
|
objects.add(list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Result.success(objects);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-1
@@ -73,7 +73,6 @@ public class ReplyController extends BaseController<Reply> {
|
|||||||
return Result.success("200","归档成功",null);
|
return Result.success("200","归档成功",null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@PostMapping("/listByPage")
|
@PostMapping("/listByPage")
|
||||||
public ResponseMessage updateReply(@RequestBody ReplyPage reply){
|
public ResponseMessage updateReply(@RequestBody ReplyPage reply){
|
||||||
return Result.success(replyService.listByPage(reply));
|
return Result.success(replyService.listByPage(reply));
|
||||||
@@ -90,4 +89,16 @@ public class ReplyController extends BaseController<Reply> {
|
|||||||
replyService.updateBatchById(replyList);
|
replyService.updateBatchById(replyList);
|
||||||
return Result.success("200","编辑成功",null);
|
return Result.success("200","编辑成功",null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/selectListSize")
|
||||||
|
public ResponseMessage selectListSize(String askId){
|
||||||
|
//1:查询当前问题下是否有其他回答 如果是第一次回答则删除 其他人的代办任务,如果非第一次回答则跳过当前步骤
|
||||||
|
QueryWrapper<Reply> replyQueryWrapper = new QueryWrapper<>();
|
||||||
|
replyQueryWrapper.eq("ASK_ID",askId);
|
||||||
|
List<Reply> list = replyService.list(replyQueryWrapper);
|
||||||
|
if(list.isEmpty()){
|
||||||
|
return Result.success(null);
|
||||||
|
}
|
||||||
|
return Result.success(list);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,4 +68,7 @@ public class Reply extends BaseEntity {
|
|||||||
|
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private List<ConvertMqEO> fileList;
|
private List<ConvertMqEO> fileList;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String taskId;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user