Merge remote-tracking branch 'origin/master'

This commit is contained in:
Flow 2025-07-21 15:23:14 +08:00
commit 96db73ade9

View File

@ -30,12 +30,16 @@ public interface ecgdataMapper extends BaseMapperX<ecgdataDO> {
.eqIfPresent(ecgdataDO::getDurationseconds, reqVO.getDurationseconds())
.eqIfPresent(ecgdataDO::getReportgenerated, reqVO.getReportgenerated())
.eqIfPresent(ecgdataDO::getSuperiorrequest, reqVO.getSuperiorrequest())
.eqIfPresent(ecgdataDO::getOrgid, reqVO.getOrgid())
// .eqIfPresent(ecgdataDO::getOrgid, reqVO.getOrgid())
.likeIfPresent(ecgdataDO::getOrgname, reqVO.getOrgname())
.eqIfPresent(ecgdataDO::getManagerorg, reqVO.getManagerorg())
// .eqIfPresent(ecgdataDO::getManagerorg, reqVO.getManagerorg())
.eqIfPresent(ecgdataDO::getStatus, reqVO.getStatus())
.betweenIfPresent(ecgdataDO::getCreatetime, reqVO.getCreatetime())
.betweenIfPresent(ecgdataDO::getUpdatetime, reqVO.getUpdatetime())
.and(wrapper -> wrapper
.eq(ecgdataDO::getOrgid, reqVO.getOrgid())
.or()
.eq(ecgdataDO::getManagerorg, reqVO.getOrgid()))
.orderByDesc(ecgdataDO::getId));
}