56486

whywhyo

2023-08-01 627a31505ddd81c542a9a2c4b8ed114eee176a54

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

@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZPropertyMapper;
import com.ruoyi.service.ZPropertyService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +59,8 @@
        lqw.eq(userId != null, ZProperty::getUserId, userId)
                .like(StringUtils.isNotEmpty(zProperty.getType()), ZProperty::getType, zProperty.getType())
                .like(StringUtils.isNotEmpty(zProperty.getIncomeName()), ZProperty::getIncomeName, zProperty.getIncomeName())
                .eq(zProperty.getIsChange()!=null,ZProperty::getIsChange,zProperty.getIsChange())
                .like(StringUtils.isNotEmpty(zProperty.getTimeLimit()),ZProperty::getTimeLimit,zProperty.getTimeLimit())
                .between(zProperty.getHappenStartTime() != null && zProperty.getHappenEndTime() != null, ZProperty::getHappenTime, zProperty.getHappenStartTime(), zProperty.getHappenEndTime())
                .orderByDesc(ZProperty::getCreateTime);
        return lqw;
@@ -115,6 +118,15 @@
    }

    @Override
    public List<ZProperty> selectByCondition() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        ZProperty zProperty = new ZProperty();
        LambdaQueryWrapper<ZProperty> lqw = buildCondition(zProperty, userId);
        return list(lqw);
    }

    @Override
    @Transactional
    public AjaxResult importExcel(MultipartFile file) {