1、优化采购批次相关内容2、优化访客停车白名单下发3、新增权限组排序4、优化设备相关5、优化页面相关展示bug

xiaogang

2023-03-20 6e13e0fa577df5511157a7841617106bd2f5c0b2

 service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java

@@ -4,10 +4,12 @@
import com.java110.intf.community.IComplaintV1InnerServiceSMO;
import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
import com.java110.intf.store.IContractInnerServiceSMO;
import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelV1InnerServiceSMO;
import com.java110.intf.user.IOwnerV1InnerServiceSMO;
import com.java110.user.bmo.owner.IQueryOwnerStatisticsBMO;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -38,6 +40,9 @@

    @Autowired
    private IReportOweFeeInnerServiceSMO reportOweFeeInnerServiceSMOImpl;

    @Autowired
    private IContractInnerServiceSMO contractInnerServiceSMOImpl;

    @Override
    public List<OwnerDto> query(List<OwnerDto> ownerDtos) {
@@ -76,7 +81,25 @@
        // 查询业主欠费
        queryOwnerOweFee(ownerIds,ownerDtos);

        // 查询业主合同
        queryOwnerContractCount(ownerIds,ownerDtos);

        return ownerDtos;
    }

    private void queryOwnerContractCount(List<String> ownerIds, List<OwnerDto> ownerDtos) {
        Map info = new HashMap();
        info.put("communityId",ownerDtos.get(0).getCommunityId());
        info.put("ownerIds",ownerIds.toArray(new String[ownerIds.size()]));
        List<Map> contractsCount = contractInnerServiceSMOImpl.queryContractsByOwnerIds(info);

        for(OwnerDto ownerDto : ownerDtos) {
            for (Map count : contractsCount) {
                if(ownerDto.getOwnerId().equals(count.get("ownerId"))){
                    ownerDto.setContractCount(count.get("contractCount").toString());
                }
            }
        }
    }

    /**
@@ -192,7 +215,8 @@

        for(OwnerDto ownerDto : ownerDtos) {
            for (Map count : ownerRoomCounts) {
                if(ownerDto.getOwnerId().equals(count.get("ownerId"))){
                if(!StringUtil.isEmpty(ownerDto.getOwnerId()) && !StringUtil.isEmpty(count.get("ownerId").toString()))
                if(ownerDto.getOwnerId().equals(count.get("ownerId").toString())){
                    ownerDto.setRoomCount(count.get("roomCount").toString());
                }
            }