Browse Source

Merge branch 'lingshan_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

master
wxz 2 years ago
parent
commit
209d4fadc5
  1. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java
  2. 13
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java
  3. 28
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuDetailDTO.java
  4. 12
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java
  5. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
  6. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
  7. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
  8. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
  9. 34
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
  10. 4
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java
  11. 4
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml

2
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java

@ -729,7 +729,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl<IcPartyUnitDao, IcPa
String orgIdPath = PidUtils.convertPid2OrgIdPath(agencyInfo.getId(), agencyInfo.getPids());
LambdaQueryWrapper<IcPartyUnitEntity> q = new LambdaQueryWrapper<>();
q.and(q1 -> q1.eq(IcPartyUnitEntity::getAgencyId, agencyId).or(q2 -> q2.eq(IcPartyUnitEntity::getPids, orgIdPath)));
q.and(q1 -> q1.eq(IcPartyUnitEntity::getAgencyId, agencyId).or(q2 -> q2.likeRight(IcPartyUnitEntity::getPids, orgIdPath)));
return baseDao.selectCount(q);
}

13
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/lingshan/PartyCenterHousePageFormDTO.java

@ -19,9 +19,22 @@ public class PartyCenterHousePageFormDTO extends PageFormDTO {
*/
private String buildingName;
/**
* pc端默认传1
* 灵山项目是否党员中心户1是0不是
*/
private String partyCenterHouseFlag;
/**
* 所属楼栋id
* 大屏用
*/
private String buildingId;
//tokenDto.
private String customerId;
//tokenDto.
private String staffId;
}

28
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseBindLianHuDetailDTO.java

@ -0,0 +1,28 @@
package com.epmet.dto.result.lingshan;
import lombok.Data;
/**
* @Description 绑定联户入参明细
* @Author yzm
* @Date 2023/5/16 20:16
*/
@Data
public class PartyCenterHouseBindLianHuDetailDTO {
/**
* 小区id
* 楼栋id
* 单元id
* 房屋id
*/
private String id;
/**
* 小区
* 楼栋
* 单元
* 房屋
*/
private String type;
}

12
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/PartyCenterHouseResultDTO.java

@ -13,6 +13,7 @@ public class PartyCenterHouseResultDTO {
private String houseName;
/**
* 门牌号
* 房号
*/
private String doorName;
@ -26,6 +27,9 @@ public class PartyCenterHouseResultDTO {
* 所属单元id
*/
private String buildingUnitId;
/**
*单元号
*/
private String unitName;
/**
@ -71,10 +75,18 @@ public class PartyCenterHouseResultDTO {
* 房主电话
*/
private String ownerPhone;
/**
* 加密房主电话
*/
private String showOwnerPhone;
/**
* 房主身份证
*/
private String ownerIdCard;
/**
* 加密房主身份证
*/
private String showOwnerIdCard;
private String remark;
/**

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java

@ -173,6 +173,7 @@ public class IcHouseController {
* @param formDTO
* @return
*/
@MaskResponse(fieldNames = { "showOwnerPhone", "showOwnerIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
@PostMapping("party-center-house-list")
public Result<PageData<PartyCenterHouseResultDTO>> queryPartyCenterHouseList(@LoginUser TokenDto tokenDto, @RequestBody PartyCenterHousePageFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId());

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java

@ -228,5 +228,7 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
List<PartyCenterHouseResultDTO> selectListPartyCenterHouse(@Param("customerId") String customerId,
@Param("agencyId") String agencyId,
@Param("neighborHoodName") String neighborHoodName,
@Param("buildingName") String buildingName);
@Param("buildingName") String buildingName,
@Param("buildingId") String buildingId,
@Param("partyCenterHouseFlag") String partyCenterHouseFlag);
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@ -422,7 +422,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize());
List<PartyCenterHouseResultDTO> list=baseDao.selectListPartyCenterHouse(formDTO.getCustomerId(),staffInfoCacheResult.getAgencyId(),
formDTO.getNeighborHoodName(),formDTO.getBuildingName());
formDTO.getNeighborHoodName(),formDTO.getBuildingName(),formDTO.getBuildingId(),formDTO.getPartyCenterHouseFlag());
list.forEach(item -> {
item.setHouseTypeName(HouseTypeEnums.getTypeValue(item.getHouseType()));
item.setPurposeName(HousePurposeEnums.getTypeValue(item.getPurpose()));

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@ -767,7 +767,7 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
LambdaQueryWrapper<IcPartyServiceCenterEntity> q = new QueryWrapper<IcPartyServiceCenterEntity>().select(" org_type, count(*) qtyOfType")
.lambda()
.and(c1 -> c1.eq(IcPartyServiceCenterEntity::getOrgId, orgId).or(c2 -> c2.eq(IcPartyServiceCenterEntity::getPids, orgIdPath)))
.and(c1 -> c1.eq(IcPartyServiceCenterEntity::getOrgId, orgId).or(c2 -> c2.likeRight(IcPartyServiceCenterEntity::getPids, orgIdPath)))
.groupBy(IcPartyServiceCenterEntity::getOrgType);
List<IcPartyServiceCenterEntity> l = icPartyServiceCenterDao.selectList(q);

34
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml

@ -721,35 +721,51 @@
ih.HOUSE_TYPE houseType,
ih.PURPOSE,
ih.RENT_FLAG,
(case when ih.RENT_FLAG = '0' then '自住'
when ih.RENT_FLAG = '1' then '出租'
when ih.RENT_FLAG = '2' then '闲置'
when ih.RENT_FLAG = '3' then '未出售'
else '' end) as houseStatusName,
ih.OWNER_NAME,
ih.OWNER_PHONE,
ih.OWNER_PHONE as showOwnerPhone,
ih.OWNER_ID_CARD,
ih.OWNER_ID_CARD as showOwnerIdCard,
ih.REMARK,
(select count(r.ID)
from lingshan_lianhu_house_rel r
from lingshan_party_center_house_lianhu r
where r.PARTY_CENTER_HOUSE_ID=ih.ID
and r.DEL_FLAG='0'
)as totalLianHu
FROM
ic_house ih
inner join ic_building_unit u
on(ih.BUILDING_UNIT_ID=u.ID)
INNER JOIN ic_building b ON ( ih.BUILDING_ID = b.ID )
INNER JOIN ic_neighbor_hood h ON ( b.NEIGHBOR_HOOD_ID = h.ID )
left join customer_grid cg on(h.GRID_ID=cg.ID)
left join customer_agency ca on(h.AGENCY_ID=ca.ID)
inner join ic_building_unit u
on(ih.BUILDING_UNIT_ID=u.ID)
INNER JOIN ic_building b ON ( ih.BUILDING_ID = b.ID )
INNER JOIN ic_neighbor_hood h ON ( b.NEIGHBOR_HOOD_ID = h.ID )
left join customer_grid cg on(h.GRID_ID=cg.ID)
left join customer_agency ca on(h.AGENCY_ID=ca.ID)
WHERE
ih.DEL_FLAG = '0'
AND b.DEL_FLAG = '0'
AND h.DEL_FLAG = '0'
AND ih.PARTY_CENTER_HOUSE_FLAG='1'
AND (h.AGENCY_ID=#{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
<if test="partyCenterHouseFlag != null and partyCenterHouseFlag.trim() != ''">
AND ih.PARTY_CENTER_HOUSE_FLAG='1'
</if>
<if test="neighborHoodName != null and neighborHoodName.trim() != ''">
and h.NEIGHBOR_HOOD_NAME like concat('%',#{neighborHoodName},'%')
</if>
<if test="buildingName != null and buildingName.trim() != ''">
and b.BUILDING_NAME like concat('%',#{buildingName},'%')
</if>
<if test="buildingId != null and buildingId.trim() != ''">
and b.id = #{buildingId}
</if>
<if test="null == buildingId or '' == buildingId ">
<if test="agencyId != null and agencyId.trim() != ''">
AND (h.AGENCY_ID=#{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') )
</if>
</if>
order by ca.CREATED_TIME asc,cg.CREATED_TIME asc,h.CREATED_TIME asc
</select>
</mapper>

4
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/LingShanPartyOrgServiceImpl.java

@ -66,7 +66,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
// 街道及以上级别,用pids,因为要从社区开始查,本级及下级
q = new QueryWrapper<IcPartyOrgEntity>().select(" party_org_type, count(*) childrenQty").lambda()
// 本组织下级的所有子级,不含本级
.like(IcPartyOrgEntity::getAgencyPids, orgIdPath)
.likeRight(IcPartyOrgEntity::getAgencyPids, orgIdPath)
.groupBy(IcPartyOrgEntity::getPartyOrgType);
}
@ -168,7 +168,7 @@ public class LingShanPartyOrgServiceImpl implements LingShanPartyOrgService, Res
}
/**
* @Description: 查询支部支部是直属的
* @Description: 查询支部支部是直属的!!!!!!!!!!!!!!!!!!!!!!!!!!!
* @param orgId:
* @param orgType:
* @Return java.util.List<com.epmet.resi.partymember.dto.partyOrg.result.LingShanScreenPartyObjectByTypeRstDTO>

4
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml

@ -314,9 +314,9 @@
from ic_party_org o
left join ic_party_member m on (o.ID = m.SSZB and m.DEL_FLAG = 0)
where o.DEL_FLAG = 0
and o.AGENCY_ID = #{orgId}
and o.AGENCY_PIDS like #{orgId}
and o.PARTY_ORG_TYPE = 5
group by o.ID, o.PARTY_ORG_NAME, o.LATITUDE, o.LONGITUDE
</select>
</mapper>
</mapper>
Loading…
Cancel
Save