Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java

@@ -311,4 +311,9 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
         return Result.success(objects);
     }
 
+    @PostMapping("/selectAskReply")
+    public ResponseMessage selectAskReply(String id){
+
+        return askQuestionsService.selectAskReply(id);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestionsReplyVO.java

@@ -0,0 +1,13 @@
+package com.adc.da.slrs.StandardQA.entity;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AskQuestionsReplyVO {
+
+    private AskQuestions askQuestions;
+
+    private List<Reply> replyList;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/service/impl/AskQuestionsServiceImpl.java

@@ -2,10 +2,14 @@ package com.adc.da.slrs.StandardQA.service.Impl;
 
 
 import com.adc.da.slrs.StandardQA.dao.AskQuestionsDao;
+import com.adc.da.slrs.StandardQA.dao.ReplyDao;
 import com.adc.da.slrs.StandardQA.entity.AskQuestions;
 import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage;
+import com.adc.da.slrs.StandardQA.entity.AskQuestionsReplyVO;
 import com.adc.da.slrs.StandardQA.entity.Reply;
 import com.adc.da.slrs.StandardQA.service.AskQuestionsService;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,6 +36,9 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
     @Autowired
     private AskQuestionsDao askQuestionsDao;
 
+    @Autowired
+    private ReplyDao replyDao;
+
     @Override
     public List<AskQuestions> getAskQuestions(AskQuestions askQuestions) {
         return askQuestionsDao.getAskQuestions(askQuestions);
@@ -110,4 +118,25 @@ public class AskQuestionsServiceImpl extends ServiceImpl<AskQuestionsDao, AskQue
     }
 
 
+    public ResponseMessage selectAskReply(String id) {
+         ArrayList<AskQuestionsReplyVO> objects = new ArrayList<>();
+         QueryWrapper<AskQuestions> objectQueryWrapper = new QueryWrapper<>();
+         objectQueryWrapper.eq("STANDARD_ID",id);
+         List<AskQuestions> askQuestions = askQuestionsDao.selectList(objectQueryWrapper);
+         if(!askQuestions.isEmpty()){
+             for (AskQuestions data:askQuestions){
+                 AskQuestionsReplyVO askQuestionsReplyVO = new AskQuestionsReplyVO();
+                 QueryWrapper<Reply> replyQueryWrapper = new QueryWrapper<>();
+                  replyQueryWrapper.eq("ASK_ID",data.getId());
+                  List<Reply> replies = replyDao.selectList(replyQueryWrapper);
+                 askQuestionsReplyVO.setAskQuestions(data);
+                 if(!replies.isEmpty()){
+                     askQuestionsReplyVO.setReplyList(replies);
+                 }
+                 objects.add(askQuestionsReplyVO);
+             }
+
+         }
+        return Result.success(objects);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java

@@ -530,5 +530,11 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
     public ResponseMessage selectMaxStandnSn (){
         return sarBussionessStandEOService.selectMaxStandnSn();
     }
+
+    @ApiOperation(value = "通过id数据")
+    @GetMapping("/selectById")
+    public ResponseMessage selectById (String id,String type){
+        return sarBussionessStandEOService.selectById(id,type);
+    }
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java

@@ -62,5 +62,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
     ResponseMessage newRpetitionFile();
 
     ResponseMessage selectMaxStandnSn();
+
+    ResponseMessage selectById(String id,String type);
 }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -72,6 +72,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
+import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
 import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
 import com.adc.da.slrs.sarUser.dao.TsUserDao;
 import com.adc.da.slrs.sarUser.entity.TsUser;
@@ -4357,6 +4358,21 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
         return Result.success(s);
     }
 
+    @Override
+    public ResponseMessage selectById(String id, String type) {
+        if(StringUtils.isNotBlank(id) && StringUtils.isNotBlank(type)){
+            if(type.equals("国内标准") || type.equals("海外标准")){
+                 SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectById(id);
+                return  Result.success(sarStandardsInfo);
+            }
+            if(type.equals("企业标准")){
+                 SarBussionessStand sarBussionessStand = sarBussionessStandEODao.selectById(id);
+                return  Result.success(sarBussionessStand);
+            }
+        }
+        return null;
+    }
+
     public String updateInfo(List<String> asList,String standId,String attfId) {
         //重复的集合
         List<AttFileEO> chongfu = new ArrayList<>();