From 064edafb567a6f7fc181535b48cf70341a5854ce Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Sep 2021 16:28:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0moduleT?= =?UTF-8?q?ype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java | 2 ++ .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java index 8c2b7b4ebe..e532068afa 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/AnalysisReportResDTO.java +++ b/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; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml index dde753c53f..cfcd370980 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml +++ b/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, + module_type from pr_user_project_item i where i.del_flag='0' and i.project_key=#{projectKey} From bda946b5af0c688e7569edc68b0b69383334f066 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Sep 2021 16:57:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0moduleT?= =?UTF-8?q?ype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/epmettduck/PrUserProjectDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml index cfcd370980..c3eba867a2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml @@ -28,7 +28,7 @@ i.required, i.sort, i.expand, - module_type + i.module_type from pr_user_project_item i where i.del_flag='0' and i.project_key=#{projectKey} From 0f976f92c51d1898f066c6747912e3b3b63eb521 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Sep 2021 18:08:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/entity/epmettduck/PrUserProjectItemEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java index 3138b101ab..e3ce844e69 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java +++ b/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; } From 0f45ccba6bbf9102b2767ee93e17d2d0cfbd3899 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 23 Sep 2021 09:46:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=BA=A7=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/GovOrgController.java | 4 ++-- .../epmet/dataaggre/service/govorg/GovOrgService.java | 2 +- .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 824fab2fae..2f4c4af69d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/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 getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) { + public Result> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return new Result().ok(govOrgService.getAgencyTree(tokenDto, formDTO)); + return new Result>().ok(govOrgService.getAgencyTree(tokenDto, formDTO)); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 2e2b7c6e88..1bd061569e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/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 getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 45ee6810fe..d6191a0537 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -502,11 +502,14 @@ public class GovOrgServiceImpl implements GovOrgService { * @Date 2021/9/17 14:03 */ @Override - public OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) { + public List getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) { + List 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; } }