Merge remote-tracking branch 'origin/dev_question_naire' into develop

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java

@@ -133,7 +133,7 @@ public class EpmetTDuckController {
      * @date 2021/9/22 2:57 下午
      */
     @PostMapping("itemresdetail-concat")
-    public Result<ItemResDetailConcatResultDTO> queryItemResDetailConcat(@RequestBody ItemResDetailFormDTO formDTO){
+    public Result<ItemResDetailConcatResultDTO> queryItemResDetailConcat(@RequestBody ProjectKeyCommonDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,ProjectKeyCommonDTO.AddUserInternalGroup.class);
         return new Result<ItemResDetailConcatResultDTO>().ok(prUserProjectService.queryItemResDetailConcat(formDTO));
     }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.*;
@@ -162,5 +163,5 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      * @author yinzuomei
      * @date 2021/9/22 2:57 下午
      */
-    ItemResDetailConcatResultDTO queryItemResDetailConcat(ItemResDetailFormDTO formDTO);
+    ItemResDetailConcatResultDTO queryItemResDetailConcat(ProjectKeyCommonDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@@ -35,6 +35,7 @@ import com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.form.ItemResDetailFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckHeaderInfoFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.*;
@@ -584,7 +585,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
      * @date 2021/9/22 2:57 下午
      */
     @Override
-    public ItemResDetailConcatResultDTO queryItemResDetailConcat(ItemResDetailFormDTO formDTO) {
+    public ItemResDetailConcatResultDTO queryItemResDetailConcat(ProjectKeyCommonDTO formDTO) {
         // 联系人题目
         List<AnalysisReportResDTO> itemList=baseDao.selectCocatItems(formDTO.getProjectKey());
         if(CollectionUtils.isEmpty(itemList)){