Merge branch 'dev_question_naire' into develop

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java

@@ -62,5 +62,7 @@ public class AnalysisReportResDTO implements Serializable {
      */
     @JsonIgnore
     private String expand;
+
+    private String moduleType;
 }
 

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

@@ -174,9 +174,9 @@ public class GovOrgController {
      * @Date 2021/9/17 14:02
      */
     @PostMapping("agencytree")
-    public Result<OrgTreeResultDTO> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
+    public Result<List<OrgTreeResultDTO>> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return new Result<OrgTreeResultDTO>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
+        return new Result<List<OrgTreeResultDTO>>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
     }
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java

@@ -127,7 +127,7 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity{
 	 */
 	private String moduleType;
 	/**
-	 * 与type一致，手机号：mobile；邮箱：email；身份证号：id_card
+	 * 与type一致，手机号：phone；邮箱：email；身份证号：idCard。。。。详见数据库
 	 */
 	private String itemKey;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -144,5 +144,5 @@ public interface GovOrgService {
      * @Author zhaoqifeng
      * @Date 2021/9/17 14:03
      */
-    OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO);
+    List<OrgTreeResultDTO> getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -508,11 +508,14 @@ public class GovOrgServiceImpl implements GovOrgService {
      * @Date 2021/9/17 14:03
      */
     @Override
-    public OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) {
+    public List<OrgTreeResultDTO> getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) {
+        List<OrgTreeResultDTO> list = new ArrayList<>();
         if ("resi".equals(formDTO.getClient())) {
-            return customerAgencyDao.getResiOrgTree(formDTO.getAgencyId());
+            list.add(customerAgencyDao.getResiOrgTree(formDTO.getAgencyId()));
+            return list;
         }
-        return customerAgencyDao.getOrgTree(formDTO.getAgencyId());
+        list.add(customerAgencyDao.getOrgTree(formDTO.getAgencyId()));
+        return list;
     }
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml

@@ -27,7 +27,8 @@
             i.show_label,
             i.required,
             i.sort,
-            i.expand
+            i.expand,
+            i.module_type
         from pr_user_project_item  i
         where i.del_flag='0'
           and i.project_key=#{projectKey}