888

Jinquan_Ou

2023-04-21 923af8f8eb0d849b92afa8b567036aae2837f202

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

@@ -22,6 +22,9 @@
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,14 +41,26 @@
@Service
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {



    @Resource
    IZfPropertyService zfPropertyService;

    @Resource
    ZInfoUserService zInfoUserService;


//    private Date getHappenTime(ZfProperty zfProperty) {
//        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
//        String happenTimeStr = format.format(zfProperty.getHappenTime());
//
//        Date happenTime = null;
//        try {
//            happenTime = format.parse(happenTimeStr);
//            System.out.println("方法里的:" + happenTime);
//        } catch (ParseException e) {
//            throw new RuntimeException("时间格式转换有误");
//        }
//        return happenTime;
//    }


    private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
@@ -57,7 +72,8 @@
                .like(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
                .like(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
                .like(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
                .like(zfProperty.getCreateTime() != null, ZfProperty::getCreateTime, zfProperty.getCreateTime());
                .eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
                .between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
        return lqw;
    }

@@ -140,7 +156,7 @@

        }

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

@@ -283,7 +299,6 @@
            return AjaxResult.error();
        }
    }



    @Override