Merge remote-tracking branch 'origin/master'
# Conflicts:
# zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
| | |
| | | import com.ruoyi.common.annotation.Excel; |
| | | import lombok.Data; |
| | | import lombok.ToString; |
| | | import org.apache.ibatis.type.JdbcType; |
| | | |
| | | import java.io.Serializable; |
| | | import java.sql.Timestamp; |
| | | import java.time.LocalDate; |
| | | import java.util.Date; |
| | | import java.util.List; |
| | |
| | | @TableField(exist = false) |
| | | private List<ZInfoUser> childList; |
| | | |
| | | /** |
| | | * 开始时间 生日 |
| | | */ |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP) |
| | | private Date happenStartTime; |
| | | |
| | | /** |
| | | * 结束时间 |
| | | */ |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP) |
| | | private Date happenEndTime; |
| | | |
| | | |
| | | |
| | | } |
| | |
| | | */ |
| | | private String url; |
| | | |
| | | /** |
| | | * 时间 |
| | | */ |
| | | @TableField(exist = false) |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | private Date happenStartTime; |
| | |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | private Date happenEndTime; |
| | | |
| | | |
| | | /** |
| | | * 期限 |
| | | */ |
| | | @TableField(exist = false) |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | private Date vHappenStartTime; |
| | | |
| | | @TableField(exist = false) |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | private Date vHappenEndTime; |
| | | |
| | | /** |
| | | * 分享人 |
| | | */ |
| | |
| | | package com.ruoyi.domain.dto; |
| | | |
| | | import com.baomidou.mybatisplus.annotation.TableField; |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import com.ruoyi.common.annotation.Excel; |
| | | import lombok.Data; |
| | | import org.apache.ibatis.type.JdbcType; |
| | | |
| | | import java.io.Serializable; |
| | | import java.util.Date; |
| | |
| | | |
| | | private Genealogy spouse; |
| | | |
| | | /** |
| | | * 开始时间 生日 |
| | | */ |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP) |
| | | private Date happenStartTime; |
| | | |
| | | /** |
| | | * 结束时间 |
| | | */ |
| | | @JsonFormat(pattern = "yyyy-MM-dd") |
| | | @TableField(exist = false, jdbcType = JdbcType.TIMESTAMP) |
| | | private Date happenEndTime; |
| | | |
| | | |
| | | } |
| | |
| | | lqw.like(StringUtils.isNotEmpty(zInfoUser.getUnit()), ZInfoUser::getUnit, zInfoUser.getUnit()); |
| | | lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex()); |
| | | lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus()); |
| | | lqw.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth()); |
| | | lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth()); |
| | | lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId()); |
| | | return lqw; |
| | | |
| | |
| | | } |
| | | } |
| | | |
| | | if(genealogy.getBirth()!=null&&data.getBirth()!=null){ |
| | | if(genealogy.getBirth()!=null){ |
| | | if(data.getBirth().compareTo(genealogy.getBirth())!=0){ |
| | | it.remove(); |
| | | continue; |
| | |
| | | .le(zSecret.getValidityDate()!=null, ZSecret::getValidityDate, zSecret.getValidityDate()) |
| | | .eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace()) |
| | | .between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime()) |
| | | .between(zSecret.getVHappenStartTime() != null && zSecret.getVHappenEndTime() != null, ZSecret::getValidityDate, zSecret.getVHappenStartTime(), zSecret.getVHappenEndTime()) |
| | | .orderByDesc(ZSecret::getCreateTime); |
| | | return lqw; |
| | | } |