From 733c7c14f5a0a3f615d11ac4ba2430c7c070c512 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 31 Mar 2023 15:40:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E7=AD=94=E4=B8=AD=E5=BF=83=E5=9B=9E?= =?UTF-8?q?=E7=AD=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/FeignClient/workFlowFeignClient.java | 4 ++ .../workFlowFeignClientImpl.java | 8 +++ .../controller/WorkFlowController.java | 12 +++++ .../controller/AskQuestionsController.java | 49 +++++++++++++++++++ .../controller/ReplyController.java | 13 ++++- .../adc/da/slrs/StandardQA/entity/Reply.java | 3 ++ 6 files changed, 88 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 4b3f42c7..22ecb09c 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -475,4 +475,8 @@ public interface workFlowFeignClient { String getEsByWk(@RequestParam("prcId")String prcId); @RequestMapping(value = "/bat-wkflow/datas/bus-process-new/selectBusProcessNew",method = RequestMethod.GET) 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); } diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index 25847dd9..80f847a6 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -422,4 +422,12 @@ public class workFlowFeignClientImpl { public String selectBusProcessNew(@RequestParam("taskId")String 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); + } } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 659095e0..d2a26126 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -973,4 +973,16 @@ public class WorkFlowController { public String selectBusProcessNew(@RequestParam("taskId") String 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); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index de6da2a6..7693ce2c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -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.service.Impl.AskQuestionsServiceImpl; 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.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.UUIDUtils; import com.adc.da.util.http.ResponseMessage; @@ -41,6 +44,12 @@ public class AskQuestionsController extends BaseController { @Autowired private AskUserServiceImpl askUserService; + @Autowired + private ReplyServiceImpl replyService; + + @Autowired + private TsUserDao tsUserDao; + @Autowired private SubscriptionServiceImpl subscriptionService; @@ -262,4 +271,44 @@ public class AskQuestionsController extends BaseController { return Result.success(askQuestionsList); } + @PostMapping("/selectQuestionReplyInfo") + public ResponseMessage selectQuestionReplyInfo(String id){ + List 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 replyQueryWrapper = new QueryWrapper<>(); + replyQueryWrapper.eq("ASK_ID", id); + List 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); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java index 9da0099c..0b5e2100 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/ReplyController.java @@ -73,7 +73,6 @@ public class ReplyController extends BaseController { return Result.success("200","归档成功",null); } - @PostMapping("/listByPage") public ResponseMessage updateReply(@RequestBody ReplyPage reply){ return Result.success(replyService.listByPage(reply)); @@ -90,4 +89,16 @@ public class ReplyController extends BaseController { replyService.updateBatchById(replyList); return Result.success("200","编辑成功",null); } + + @PostMapping("/selectListSize") + public ResponseMessage selectListSize(String askId){ + //1:查询当前问题下是否有其他回答 如果是第一次回答则删除 其他人的代办任务，如果非第一次回答则跳过当前步骤 + QueryWrapper replyQueryWrapper = new QueryWrapper<>(); + replyQueryWrapper.eq("ASK_ID",askId); + List list = replyService.list(replyQueryWrapper); + if(list.isEmpty()){ + return Result.success(null); + } + return Result.success(list); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java index ddab429d..d89d86f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Reply.java @@ -68,4 +68,7 @@ public class Reply extends BaseEntity { @TableField(exist = false) private List fileList; + + @TableField(exist = false) + private String taskId; }