4564

whywhyo

2023-07-25 0345d46de590a980d1d18e48f33ef42302cee0bb

4564

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,8 +6,8 @@
        druid:
            # 主库数据源
            master:
#                url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                url: jdbc:mysql://47.93.189.255:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#                url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                username: root
                password: ZhangApp123!
#                password: 123456

 zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java

@@ -143,5 +143,13 @@
    @Excel(name = "主人地址")
    private String masterAddress;

    @TableField(exist = false)
    @Excel(name = "出生日期", dateFormat = "yyyy-MM-dd")
    private Date birthStart;

    @TableField(exist = false)
    @Excel(name = "出生日期", dateFormat = "yyyy-MM-dd")
    private Date birthEnd;


}

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

@@ -58,6 +58,7 @@
        LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfClean::getCreateTime);
        lqw.eq(zfClean.getKind() != null, ZfClean::getKind, zfClean.getKind())
                .eq(zfClean.getId()!=null,ZfClean::getId,zfClean.getId())
                .like(StringUtils.isNotEmpty(zfClean.getSuitable()), ZfClean::getSuitable, zfClean.getSuitable())
                .like(StringUtils.isNotEmpty(zfClean.getType()), ZfClean::getType, zfClean.getType())
                .like(StringUtils.isNotEmpty(zfClean.getMethod()), ZfClean::getMethod, zfClean.getMethod())

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

@@ -300,11 +300,13 @@
        LambdaQueryWrapper<ZfPet> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfPet::getCreateTime);
        lqw.in(ZfPet::getFamilyId,familyIdList);
        lqw.eq(zfPet.getId()!=null,ZfPet::getId,zfPet.getId());
        lqw.like(StringUtils.isNotEmpty(zfPet.getIdNum()),ZfPet::getIdNum,zfPet.getIdNum());
        lqw.like(StringUtils.isNotEmpty(zfPet.getSecurityCode()),ZfPet::getSecurityCode,zfPet.getSecurityCode());
        lqw.like(StringUtils.isNotEmpty(zfPet.getType()),ZfPet::getType,zfPet.getType());
        lqw.like(StringUtils.isNotEmpty(zfPet.getName()),ZfPet::getName,zfPet.getName());
        lqw.like(zfPet.getBirth()!=null,ZfPet::getBirth,zfPet.getBirth());
//        lqw.like(zfPet.getBirth()!=null,ZfPet::getBirth,zfPet.getBirth());
        lqw.between(zfPet.getBirthStart()!=null && zfPet.getBirthEnd()!=null,ZfPet::getBirth,zfPet.getBirthStart(),zfPet.getBirthEnd());
        lqw.like(zfPet.getSex()!=null,ZfPet::getSex,zfPet.getSex());
        lqw.like(StringUtils.isNotEmpty(zfPet.getColor()),ZfPet::getColor,zfPet.getColor());
        lqw.like(StringUtils.isNotEmpty(zfPet.getProperties()),ZfPet::getProperties,zfPet.getProperties());