住户查询修改

zhongrj

2023-11-05 6174f8c153f5b02436d1f05dec709dea86e51e1a

住户查询修改

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml

@@ -102,7 +102,7 @@
            jh.name as realName,jh.role_type as roleType,1 as addressType
            from jczz_doorplate_address jda
            left join
                (select house_code,name,role_type from jczz_household where role_type = '业主') jh
                (select house_code,name,role_type from jczz_household where role_type = 1) jh
            on jda.address_code = jh.house_code
            where 1=1
            and floor != ''

 src/main/java/org/springblade/modules/house/entity/HouseholdEntity.java

@@ -77,15 +77,15 @@
    @ApiModelProperty(value = "绑定用户名称")
    private String associatedUserName;
    /**
     * 角色  0: 业主 1：出租户  2：空挂户 3：其他
     * 角色
     */
    @ApiModelProperty(value = "角色  0: 业主 1：出租户  2：空挂户 3：其他")
    @ApiModelProperty(value = "角色")
    private Integer roleType;
    /**
     * 与角色关系
     */
    @ApiModelProperty(value = "与角色关系")
    private String relationship;
    private Integer relationship;

    /**
     * 是否主要联系人 1：是  0：否
@@ -128,35 +128,35 @@
    @ApiModelProperty(value = "护照")
    private String passport;
    /**
     * 民族（WGCCP_ETHNICITY）
     * 民族
     */
    @ApiModelProperty(value = "民族（WGCCP_ETHNICITY）")
    private String ethnicity;
    @ApiModelProperty(value = "民族")
    private Integer ethnicity;
    /**
     * 学历（WGCCP_EDUCATION）
     * 学历
     */
    @ApiModelProperty(value = "学历（WGCCP_EDUCATION）")
    private String education;
    @ApiModelProperty(value = "学历")
    private Integer education;
    /**
     * 户籍登记地
     */
    @ApiModelProperty(value = "户籍登记地")
    private String hukouRegistration;
    /**
     * 工作状态（WGCCP_WORK_STATUS）
     * 工作状态
     */
    @ApiModelProperty(value = "工作状态（WGCCP_WORK_STATUS）")
    private String workStatus;
    @ApiModelProperty(value = "工作状态")
    private Integer workStatus;
    /**
     * 工作单位
     */
    @ApiModelProperty(value = "工作单位")
    private String employer;
    /**
     * 婚姻状态（WGCCP_MARITAL_STATUS）
     * 婚姻状态
     */
    @ApiModelProperty(value = "婚姻状态（WGCCP_MARITAL_STATUS）")
    private String maritalStatus;
    @ApiModelProperty(value = "婚姻状态")
    private Integer maritalStatus;
    /**
     * 车牌号
     */

 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java

@@ -24,6 +24,9 @@
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.service.IDictBizService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;

@@ -38,6 +41,9 @@
 */
@Service
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {

    @Autowired
    private IDictBizService dictBizService;

    @Override
    public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
@@ -61,7 +67,35 @@
     */
    @Override
    public List<HouseholdVO> getHouseholdListByCode(String code) {
        return baseMapper.getHouseholdListByCode(code);
        // 查询
        List<HouseholdVO> householdList = baseMapper.getHouseholdListByCode(code);
        // 处理字典
        handleDictBiz(householdList);
        // 返回
        return householdList;
    }

    /**
     * 处理字典
     * @param householdList
     */
    private void handleDictBiz(List<HouseholdVO> householdList) {
        if (householdList.size()>0){
            // 查询角色关系字典
            List<DictBiz> dictBizList = dictBizService.getList("roleRelation");
            if (dictBizList.size()>0) {
                // 遍历
                for (HouseholdVO householdVO : householdList) {
                    if (null != householdVO.getRelationship()) {
                        for (DictBiz dictBiz : dictBizList) {
                            if (householdVO.getRelationship().toString().equals(dictBiz.getDictKey())) {
                                householdVO.setRoleRelationName(dictBiz.getDictValue());
                            }
                        }
                    }
                }
            }
        }
    }

    /**

 src/main/java/org/springblade/modules/house/vo/HouseholdVO.java

@@ -36,6 +36,11 @@
    private static final long serialVersionUID = 1L;

    /**
     * 角色类型名称
     */
    private String roleRelationName;

    /**
     * 标签
     */
    private List<HouseholdLabelVO> householdLabelList = new ArrayList<>();