luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud

dev
wangxianzhang 3 years ago
parent
1f83f07a81 5c5f0904f7
commit
efd782aecb
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

12
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
View File

@ -932,9 +932,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
public Integer countVaccinePoint(String customerId, String agencyId, String staffOrgIds, String search) { public Integer countVaccinePoint(String customerId, String agencyId, String staffOrgIds, String search) {
LambdaQueryWrapper<IcPointVaccinesInoculationEntity> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IcPointVaccinesInoculationEntity> query = new LambdaQueryWrapper<>();
query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId); query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId);
query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds) //query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds)
.or() // .or()
.eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId)); // .eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId));
query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search); query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search);
return pointVaccinesInoculationDao.selectCount(query); return pointVaccinesInoculationDao.selectCount(query);
} }
@ -954,9 +954,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
public List<IcPointVaccinesInoculationEntity> listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search) { public List<IcPointVaccinesInoculationEntity> listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search) {
LambdaQueryWrapper<IcPointVaccinesInoculationEntity> query = new LambdaQueryWrapper<>(); LambdaQueryWrapper<IcPointVaccinesInoculationEntity> query = new LambdaQueryWrapper<>();
query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId); query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId);
query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds) //query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds)
.or() // .or()
.eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId)); // .eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId));
query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search); query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search);
return pointVaccinesInoculationDao.selectList(query); return pointVaccinesInoculationDao.selectList(query);
} }

Write Preview
Loading…
Cancel
Save