45386

whywhyo

2023-09-05 3f50e9e810b478dbbd3225d9e5cedf47f586b69b

 zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java

@@ -49,6 +49,9 @@
    @Resource
    ZAuthorityService zAuthorityService;

    @Resource
    ZfPropertyMapper zfPropertyMapper;


//    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
//        LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
@@ -77,7 +80,6 @@
                .in(ZfProperty::getFamilyId,familyIdList)
                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
                .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());

        lqw.orderByDesc(ZfProperty::getCreateTime);
        return lqw;

@@ -275,7 +277,7 @@
                        bean.setOwnData(0);
                    }
                }
        ).collect(Collectors.toList());
        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
    }

    @Override
@@ -499,6 +501,12 @@

    }

    @Override
    public AjaxResult listType() {
        List<String> result = zfPropertyMapper.listType();
        return AjaxResult.success(result);
    }

}