diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml index da394151..889ae6ed 100644 --- a/adc-da-slrs/pom.xml +++ b/adc-da-slrs/pom.xml @@ -133,6 +133,10 @@ 19.0 compile + + com.google.code.gson + gson + 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 2b66f3be..7452a6ff 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 @@ -113,14 +113,25 @@ public class AskQuestionsController extends BaseController { return Result.success(askQuestionsList); } + /** + * 根据标准编号,等查询条件 查询我的回答 + * @param askQuestions + * @return + */ + @GetMapping("/getAskQuestionsNew") + public ResponseMessage getAskQuestionsNew(AskQuestions askQuestions){ + List askQuestionsList = askQuestionsService.getAskQuestionsNew(askQuestions); + return Result.success(askQuestionsList); + } + /** * 根据问题ID查询回答*** * @param id * @return */ @GetMapping("/getAskQuestionsByakId") - public ResponseMessage getAskQuestionsByakId(String id){ - List askQuestionsList = askQuestionsService.getAskQuestionsByakId(id); + public ResponseMessage getAskQuestionsByakId(String id,String state){ + List askQuestionsList = askQuestionsService.getAskQuestionsByakId(id,state); return Result.success(askQuestionsList); } 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 2573d3ea..0acbaaf4 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 @@ -1,6 +1,7 @@ package com.adc.da.slrs.StandardQA.controller; import com.adc.da.base.web.BaseController; +import com.adc.da.common.ConvertMqEO; import com.adc.da.slrs.StandardQA.entity.AskQuestions; import com.adc.da.slrs.StandardQA.entity.Reply; import com.adc.da.slrs.StandardQA.service.Impl.ReplyServiceImpl; @@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Author: qk @@ -41,9 +43,11 @@ public class ReplyController extends BaseController { if(StringUtils.isEmpty(reply.getReply())){ return Result.error("-1","请输入回答内容"); } - if(reply.getFileList().size() >0) { - reply.setAppendixId(reply.getFileList().get(0).getAttId()); - reply.setAppendixName(reply.getFileList().get(0).getName()); + if(!reply.getFileList().isEmpty()) { + String appendixIds = reply.getFileList().stream().map(ConvertMqEO::getId).collect(Collectors.joining(","));; + String appendixNames = reply.getFileList().stream().map(ConvertMqEO::getName).collect(Collectors.joining(","));; + reply.setAppendixId(appendixIds); + reply.setAppendixName(appendixNames); } reply.setReplyTime(new Date()); reply.setId(UUIDUtils.randomUUID20()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java index d0c0d413..6607aa07 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/dao/AskQuestionsDao.java @@ -18,6 +18,8 @@ public interface AskQuestionsDao extends BaseMapper { List getAskQuestions (@Param("askQuestions") AskQuestions askQuestions); + List getAskQuestionsNew (@Param("ask") AskQuestions askQuestions); + List getReplyDetails (@Param("askQuestions") AskQuestions askQuestions); List getReplyDetailsByStandId (@Param("askQuestions") AskQuestions askQuestions); @@ -34,7 +36,7 @@ public interface AskQuestionsDao extends BaseMapper { List getArchiveAskQuestions (String id); - List getAskQuestionsByakId (String id); + List getAskQuestionsByakId (String id,String state); List getUId(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java index 1506a461..6b56667e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/AskQuestionsService.java @@ -15,6 +15,7 @@ import java.util.List; public interface AskQuestionsService extends IService { List getAskQuestions(AskQuestions askQuestions); + List getAskQuestionsNew(AskQuestions askQuestions); List getReplyDetails(AskQuestions askQuestions); List getReplyDetailsByStandId(AskQuestions askQuestions); @@ -25,7 +26,7 @@ public interface AskQuestionsService extends IService { List getAskQuestionsByStandardId(String standardId); List getArchiveAskQuestions(String id); - List getAskQuestionsByakId(String id); + List getAskQuestionsByakId(String id,String state); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java similarity index 82% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java index 6faa3749..3c18aeb2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/AskQuestionsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java @@ -6,6 +6,7 @@ import com.adc.da.slrs.StandardQA.entity.AskQuestions; import com.adc.da.slrs.StandardQA.entity.Reply; import com.adc.da.slrs.StandardQA.service.AskQuestionsService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -47,6 +48,9 @@ public class AskQuestionsServiceImpl extends ServiceImpl retrieve(AskQuestions askQuestions) { + if (StringUtils.isNotBlank(askQuestions.getStandardEncdoing())) { + askQuestions.setStandardEncdoing(askQuestions.getStandardEncdoing().replace(" ", " ")); + } return askQuestionsDao.retrieve(askQuestions); } @@ -65,14 +69,19 @@ public class AskQuestionsServiceImpl extends ServiceImpl getAskQuestionsNew(AskQuestions askQuestions) { + return askQuestionsDao.getAskQuestionsNew(askQuestions); + } + @Override public List getArchiveAskQuestions(String id) { return askQuestionsDao.getArchiveAskQuestions(id); } @Override - public List getAskQuestionsByakId(String id) { - return askQuestionsDao.getAskQuestionsByakId(id); + public List getAskQuestionsByakId(String id,String state) { + return askQuestionsDao.getAskQuestionsByakId(id,state); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/ReplyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/ReplyServiceImpl.java similarity index 100% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/Impl/ReplyServiceImpl.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/ReplyServiceImpl.java diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml index cfa96b18..ea2a0ca4 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml @@ -49,6 +49,7 @@ AND aq.STANDARD_ID = #{standardId} + order by QUESTION_TIME desc + diff --git a/pom.xml b/pom.xml index 4cec972f..7a336145 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,18 @@ + + maven-ali + http://maven.aliyun.com/nexus/content/groups/public// + + true + + + true + always + fail + + adc http://60.247.58.121:8182/nexus/content/groups/public @@ -54,18 +66,6 @@ true - - maven-ali - http://maven.aliyun.com/nexus/content/groups/public// - - true - - - true - always - fail - -