From 9f1f762bee67e2604f33ac54e6e4d14161c47c36 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 21 Dec 2021 16:43:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=83=A8=E9=97=A8=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=85=A5=E5=8F=82=E8=BF=94=E5=8F=82=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddAgencyV2FormDTO.java | 12 ++++++++++++ .../epmet/dto/form/AddDepartmentFormDTO.java | 13 +++++++++++++ .../java/com/epmet/dto/form/AddGridFormDTO.java | 16 ++++++++++++++++ .../com/epmet/dto/form/EditAgencyFormDTO.java | 13 +++++++++++++ .../epmet/dto/form/EditDepartmentFormDTO.java | 13 +++++++++++++ .../com/epmet/dto/form/EditGridFormDTO.java | 16 ++++++++++++++++ .../epmet/dto/result/AgencyListResultDTO.java | 8 ++++++++ .../com/epmet/dto/result/AgencysResultDTO.java | 12 ++++++++++++ .../dto/result/DepartmentDetailResultDTO.java | 13 +++++++++++++ .../dto/result/DepartmentListResultDTO.java | 10 +++++++++- .../epmet/dto/result/GridBaseInfoResultDTO.java | 9 +++++++++ .../epmet/dto/result/GridDetailResultDTO.java | 17 +++++++++++++++++ .../epmet/service/impl/AgencyServiceImpl.java | 6 ++++++ .../service/impl/CustomerGridServiceImpl.java | 8 ++++++++ .../service/impl/DepartmentServiceImpl.java | 4 +--- .../main/resources/mapper/CustomerAgencyDao.xml | 4 +++- .../resources/mapper/CustomerDepartmentDao.xml | 4 +++- .../main/resources/mapper/CustomerGridDao.xml | 14 ++++++++++---- 18 files changed, 182 insertions(+), 10 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java index 21867756d5..50ee7a010c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java @@ -87,4 +87,16 @@ public class AddAgencyV2FormDTO implements Serializable { //区域编码名称 @NotBlank(message = "", groups = AreaCodeGroup.class) private String areaName; + /** + * 组织编码[手动输入的] + */ + private String code; + /** + * 负责人 + */ + private String contacts; + /** + * 联系电话 + */ + private String mobile; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java index 5a582535c6..911efdcb12 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java @@ -54,5 +54,18 @@ public class AddDepartmentFormDTO implements Serializable { @Length(max=250,message = "部门职责不能超过250个字") private String departmentDuty; + /** + * 组织编码 + */ + private String code; + /** + * 负责人 + */ + private String contacts; + /** + * 联系电话 + */ + private String mobile; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java index a9473e218e..965f8b5fc6 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java @@ -34,5 +34,21 @@ public class AddGridFormDTO implements Serializable { * 管辖区域 */ private String manageDistrict; + /** + * 网格编码[手动输入的] + */ + private String code; + /** + * 网格类型【字典表sys_dict_data,key:grid_type】 + */ + private String gridType; + /** + * 负责人 + */ + private String contacts; + /** + * 联系电话 + */ + private String mobile; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java index f279164095..1c047dd32a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java @@ -59,4 +59,17 @@ public class EditAgencyFormDTO implements Serializable { @NotBlank(message = "tokenDto获取userId为空", groups = AddUserInternalGroup.class) private String userId; + /** + * 组织编码[手动输入的] + */ + private String code; + /** + * 负责人 + */ + private String contacts; + /** + * 联系电话 + */ + private String mobile; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java index 5d59b289f0..2f40bfa6e1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java @@ -56,4 +56,17 @@ public class EditDepartmentFormDTO implements Serializable { @Length(max=250,message = "部门职责不能超过250个字") private String departmentDuty; + /** + * 组织编码[手动输入的] + */ + private String code; + /** + * 负责人 + */ + private String contacts; + /** + * 联系电话 + */ + private String mobile; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java index ff48cd1972..1c42608fd8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java @@ -42,5 +42,21 @@ public class EditGridFormDTO implements Serializable { //客户Id private String customerId; + /** + * 网格编码[手动输入的] + */ + private String code; + /** + * 网格类型【字典表sys_dict_data,key:grid_type】 + */ + private String gridType; + /** + * 负责人 + */ + private String contacts; + /** + * 联系电话 + */ + private String mobile; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java index b1261e2761..edfe5e60d5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyListResultDTO.java @@ -46,6 +46,14 @@ public class AgencyListResultDTO implements Serializable { * 总人数 */ private Integer totalUser; + /** + * 负责人 + */ + private String contacts; + /** + * 联系电话 + */ + private String mobile; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java index 933bdbb492..cace2a4c84 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java @@ -106,4 +106,16 @@ public class AgencysResultDTO implements Serializable { * 当前agencyId所属的客户id */ private String customerId; + /** + * 组织编码[手动输入的] + */ + private String code; + /** + * 负责人 + */ + private String contacts; + /** + * 联系电话 + */ + private String mobile; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java index 11271d8009..2cec409cf9 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java @@ -60,4 +60,17 @@ public class DepartmentDetailResultDTO implements Serializable { private String areaCode; + /** + * 组织编码[手动输入的] + */ + private String code = ""; + /** + * 负责人 + */ + private String contacts = ""; + /** + * 联系电话 + */ + private String mobile = ""; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java index 3d7a87ec9d..8dde952e1c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentListResultDTO.java @@ -45,5 +45,13 @@ public class DepartmentListResultDTO implements Serializable { /** * 部门下总人数 */ - private Integer totalUser; + private Integer totalUser = 0; + /** + * 负责人 + */ + private String contacts = ""; + /** + * 联系电话 + */ + private String mobile = ""; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java index df2bc63f60..4adaf8b70f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridBaseInfoResultDTO.java @@ -29,4 +29,13 @@ public class GridBaseInfoResultDTO implements Serializable { * 网格人数 * */ private Integer totalUser; + + /** + * 负责人 + */ + private String contacts = ""; + /** + * 联系电话 + */ + private String mobile = ""; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java index f822ea7773..bfb95d5c23 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java @@ -65,4 +65,21 @@ public class GridDetailResultDTO implements Serializable { */ private List staffGridList; + /** + * 网格编码 + */ + private String code = ""; + /** + * 网格类型 + */ + private String gridType = ""; + /** + * 负责人 + */ + private String contacts = ""; + /** + * 联系电话 + */ + private String mobile = ""; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index b15e6f17c3..a74b246aeb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -151,6 +151,9 @@ public class AgencyServiceImpl implements AgencyService { //当前客户下，同级组织中，组织名称不允许重复 customerAgencyService.checkAgencyName(formDTO.getAgencyName(),originalEntity.getCustomerId(),originalEntity.getId(),originalEntity.getPid()); originalEntity.setOrganizationName(formDTO.getAgencyName()); + originalEntity.setCode(formDTO.getCode()); + originalEntity.setContacts(formDTO.getContacts()); + originalEntity.setMobile(formDTO.getMobile()); //1:更新当前组织信息 if (customerAgencyDao.updateById(originalEntity) < NumConstant.ONE) { log.error(CustomerAgencyConstant.UPDATE_EXCEPTION); @@ -254,6 +257,9 @@ public class AgencyServiceImpl implements AgencyService { agencysResultDTO = ConvertUtils.sourceToTarget(entity, AgencysResultDTO.class); agencysResultDTO.setAgencyId(entity.getId()); agencysResultDTO.setAgencyName(entity.getOrganizationName()); + agencysResultDTO.setCode(entity.getCode()); + agencysResultDTO.setContacts(entity.getContacts()); + agencysResultDTO.setMobile(entity.getMobile()); //2021.5.26 sun 添加当前组织对应客户的根组织级别返参 start if (null != entity) { if (null == entity.getPids() || "".equals(entity.getPids())) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 5c48305577..bd83c240df 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -258,6 +258,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl