diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java index a14c38629e..41ee82265b 100644 --- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java +++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java @@ -69,4 +69,9 @@ public class CertifiedDetailResultDTO implements Serializable { */ private String contactMobile; + /** + * 居住地址 + */ + private String address; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index ba4bde9b07..21c535f730 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -77,4 +77,12 @@ public interface CustomerAgencyDao extends BaseDao { * @Description 查询当前组织的所有下级组织列表 **/ List selectFindList(CustomerAgencyDTO customerAgencyDTO); + + /** + * @Description 根据agencyId查询地区编码 + * @param agencyId 所属机关id + * @author zxc + * @date 2020/4/28 15:50 + */ + String selectAreaCodeByAgencyId(@Param("agencyId") String agencyId); } \ No newline at end of file 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 59ee2c4bfe..38a3c8691e 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 @@ -29,6 +29,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerGridConstant; +import com.epmet.dao.CustomerAgencyDao; import com.epmet.dao.CustomerGridDao; import com.epmet.dao.CustomerStaffGridDao; import com.epmet.dto.*; @@ -71,6 +72,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl page(Map params) { @@ -197,21 +200,22 @@ public class CustomerGridServiceImpl extends BaseServiceImpl addGrid(TokenDto tokenDto, AddGridFormDTO addGridFormDTO) { + //查询是否重名 String checkGridName = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null); if (checkGridName!=null){ return new Result().error(EpmetErrorCode.NOT_ADD_GRID.getCode()); } + //查询地区编码 + String areaCode = customerAgencyDao.selectAreaCodeByAgencyId(addGridFormDTO.getAgencyId()); CustomerGridEntity customerGridEntity = new CustomerGridEntity(); - customerGridEntity.setCustomerId(baseDao.selectCustomerIdByUserId(tokenDto.getUserId())); + customerGridEntity.setAreaCode(areaCode); + customerGridEntity.setCustomerId(baseDao.selectCustomerIdByUserId(tokenDto.getUserId()));//查询customerId customerGridEntity.setGridName(addGridFormDTO.getGridName()); - customerGridEntity.setDelFlag("0"); - customerGridEntity.setCreatedBy(tokenDto.getUserId()); - customerGridEntity.setUpdatedBy(tokenDto.getUserId()); - customerGridEntity.setTotalUser(0); customerGridEntity.setManageDistrict(addGridFormDTO.getManageDistrict()); customerGridEntity.setPid(addGridFormDTO.getAgencyId()); - customerGridEntity.setPids(baseDao.selectPidsByPid(addGridFormDTO.getAgencyId())); + customerGridEntity.setPids(baseDao.selectPidsByPid(addGridFormDTO.getAgencyId()));//查询所有上级组织id baseDao.insert(customerGridEntity); + //查询刚刚添加的gridId String gridId = baseDao.selectGridIdByGridName(addGridFormDTO.getGridName(),addGridFormDTO.getAgencyId(),null); AddGridResultDTO addGridResultDTO = new AddGridResultDTO(); addGridResultDTO.setGridId(gridId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 017ae50451..12c8339919 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -84,4 +84,15 @@ AND ca.pids LIKE concat('%', #{pids}, '%') + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java index 19681fbbd5..e94ec46f07 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java @@ -74,4 +74,9 @@ public class CertifiedDetailResultDTO implements Serializable { */ private String contactMobile; + /** + * 居住地址 + */ + private String address; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index 04bdbb07c6..3f716c5210 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -93,7 +93,8 @@ UNIX_TIMESTAMP(pi.created_time) AS applyTime, organization_type AS extraOrganization, extra_certifier_name AS contactPeople, - extra_certifier_mobile AS contactMobile + extra_certifier_mobile AS contactMobile, + CONCAT(street,estate,building) AS address FROM partymember_info pi WHERE